Commit Graph

2325 Commits

Author SHA1 Message Date
Rudi Grinberg faa04a2f5c Refactored RecallByX 2012-09-11 18:22:46 -04:00
Rudi Grinberg 975830ff90 Removed wrong comments 2012-09-11 18:22:24 -04:00
Rudi Grinberg e2d69df4a6 Removed unused code 2012-09-11 17:51:39 -04:00
Rudi Grinberg dc91db1f46 formatting 2012-09-11 17:48:08 -04:00
Rudi Grinberg bc5718ec09 logging removed 2012-09-11 17:39:28 -04:00
Rudi Grinberg cc3ba90ec3 added debugging 2012-09-11 17:32:26 -04:00
Rudi Grinberg 32297111f5 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-11 17:23:19 -04:00
Rudi Grinberg b8db419717 All hands for America. Added robust debugging 2012-09-11 17:23:07 -04:00
Rudi Grinberg fc8b2096af Added debugging for Clifford 2012-09-11 17:21:20 -04:00
denise c6ab540120 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-11 17:19:12 -04:00
denise 58d39d74d4 CC-4355: Smart block criteria do not match library columns or metadata editor
-fixed
2012-09-11 17:18:17 -04:00
Rudi Grinberg 72a424bb7e Added todo to fix crust 2012-09-11 16:25:45 -04:00
Rudi Grinberg 728a0dd736 Added todo documenting slight inefficiency 2012-09-11 16:24:59 -04:00
Rudi Grinberg 0dd38920a3 Cosmetic changes. 2012-09-11 16:20:59 -04:00
Rudi Grinberg 51d4f35c55 Removed unused global variable 2012-09-11 16:15:15 -04:00
Rudi Grinberg d95731f2f3 Reformatted sql to use heredoc 2012-09-11 16:13:39 -04:00
Rudi Grinberg e664707076 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-11 16:03:01 -04:00
Rudi Grinberg 355b0ad35d cc-4292: Initial fix of the MD5 issue. Now MD5's are only collected not really used for anything. Moves are handled completely
through paths.
2012-09-11 16:02:39 -04:00
denise bc355fe7a7 - webstream controller wasn't assigning webstream object properly 2012-09-11 15:10:30 -04:00
denise c56d3e47ef Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-11 15:02:23 -04:00
denise 8af91f3901 -webstream controller wasn't setting webstream object properly 2012-09-11 15:02:12 -04:00
Rudi Grinberg 6c1d7fedc1 Made Loggging::warn proper. 2012-09-11 14:34:03 -04:00
Rudi Grinberg 57b59a3290 Cleaned up preference.php 2012-09-11 14:33:50 -04:00
Rudi Grinberg 1304111682 Shortened code with if -> ? 2012-09-11 14:10:13 -04:00
Rudi Grinberg 751ed8276d Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-11 14:05:54 -04:00
Rudi Grinberg 1afdcb8c2d Shortened an if statement to p ? x : y 2012-09-11 14:05:40 -04:00
Martin Konecny c61f5d1972 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-11 14:04:53 -04:00
Martin Konecny 0fec175681 CC-1710: FLAC, BWF, AAC support
-context menu for mp4's having a problem
2012-09-11 14:04:45 -04:00
Rudi Grinberg 63b1ead363 Undefined index error fixed by returning a default error if none is set in the database. 2012-09-11 13:56:48 -04:00
Rudi Grinberg 1e1b5919a2 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-11 11:57:13 -04:00
Rudi Grinberg 9b0e5a6b2f removing unused file. 2012-09-11 11:53:36 -04:00
Martin Konecny a06eeaa76a -fix silly mistake after refactoring
again
2012-09-11 11:20:42 -04:00
Martin Konecny 41d9b2490a -fix silly mistake after refactoring 2012-09-11 11:14:47 -04:00
Martin Konecny 245d9a95d0 CC-4389: Convert all PHP errors to throw exceptions instead
-don't throw exception for suppressed errors.
2012-09-11 11:12:58 -04:00
Martin Konecny 1635842b81 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-11 00:51:08 -04:00
Martin Konecny 8db4c94af1 CC-4389: Convert all PHP errors to throw exceptions instead
-echo to stdout as well
2012-09-11 00:50:56 -04:00
James 585ee579d6 CC-4005: Tag files with Last Played date and number of times played
- fixed CRLF
2012-09-10 18:07:12 -04:00
James 645593f954 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
Conflicts:
	airtime_mvc/application/controllers/ApiController.php
	airtime_mvc/application/models/Webstream.php
2012-09-10 18:04:35 -04:00
James ba37bb4327 CC-4005: Tag files with Last Played date and number of times played
- done for files and webstreams
2012-09-10 18:01:36 -04:00
denise 80bdc95cd5 -redoing a commit undo 2012-09-10 17:24:18 -04:00
Martin Konecny d8b0de4ffa CC-4387: NULL is set to default Station Name
-fixed
2012-09-10 17:17:52 -04:00
Martin Konecny 87ac1744f7 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-10 16:54:51 -04:00
Martin Konecny 5292137430 -return json as data type for schedule action 2012-09-10 16:54:42 -04:00
Rudi Grinberg 43bef4939e Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-10 16:30:38 -04:00
Rudi Grinberg 4fe8407659 Adde configurable value for list_all_files 2012-09-10 16:29:17 -04:00
Rudi Grinberg af225418c4 Removed empty constructor. 2012-09-10 16:08:21 -04:00
Rudi Grinberg c90ead9ef2 cc-4359: fixed at the cost of other issues that will be fixed later (restarting media monitor). 2012-09-10 16:08:08 -04:00
James dfb1ffed79 CC-4319: Calendar: Remove all contents doesn't work
- fixed
2012-09-10 15:42:05 -04:00
James db0a34b35c Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-10 15:37:36 -04:00
James 67b295a553 CC-4367: Media Library -> Search: Please enable searching Bit Rate by Kbps
- done
2012-09-10 15:37:22 -04:00