Commit Graph

9152 Commits

Author SHA1 Message Date
denise ba89982b17 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-10 18:09:19 -04:00
denise 4239a49d58 - advanced search validation UI cleanup 2012-09-10 18:09:13 -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 c536169fb3 -original dataTables.columnFilter.js 2012-09-10 17:58:31 -04:00
denise fb7de88a30 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-10 17:54:45 -04:00
denise 2474d50e9f CC-4379: Playlist Builder: Click Save will cause playlist disappear from right side
-fixed
2012-09-10 17:53:55 -04:00
Martin Konecny e275e286cb Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-10 17:43:40 -04:00
Martin Konecny 8bbc0bff94 CC-4389: Convert all PHP errors to throw exceptions instead
-echo to stdout as well
2012-09-10 17:43:29 -04:00
Rudi Grinberg 332e8fef76 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-10 17:43:10 -04:00
Rudi Grinberg 160b28af5d Added flag for two different list_all_db_files requests. 2012-09-10 17:42:59 -04:00
denise bba001c0db -diff between original dataTables.columnFilter.js and our modified version 2012-09-10 17:41:54 -04:00
Martin Konecny 726cadf5ce Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-10 17:40:19 -04:00
Rudi Grinberg 0dab4fa231 cc-4388: Fixed. 2012-09-10 17:40:03 -04:00
Rudi Grinberg 3fc60c741d MM2: Normalize directory paths received from airtime once and for all. 2012-09-10 17:39:43 -04:00
denise def513d200 -fixed commit problem 2012-09-10 17:38:05 -04:00
Martin Konecny ade4bcf958 CC-4389: Convert all PHP errors to throw exceptions instead
-fixed
2012-09-10 17:36:55 -04:00
denise fe0b6cd32b -changed windows line endings to unix 2012-09-10 17:36:51 -04:00
denise 4d15dd2900 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-10 17:24:29 -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
denise bca7fbf50e Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-10 17:17:19 -04:00
denise 8520141240 CC-4282: Library ->"Uploaded From" -> Submitting data in wrong format causes "Processing ..." message pop up for a while
-implemented advanced search validation
-data only gets sent to server if all fields are valid
2012-09-10 17:17:09 -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 fdc7245a15 Removed translation of dashes to slashes. 2012-09-10 16:30:18 -04:00
Rudi Grinberg 4fe8407659 Adde configurable value for list_all_files 2012-09-10 16:29:17 -04:00
Martin Konecny fba0e18620 add force-yes to all airtime-full-install packages 2012-09-10 16:26:30 -04:00
Martin Konecny 201e649014 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-10 16:24:24 -04:00
Martin Konecny f8e1bec318 add force-yes to all airtime-full-install packages 2012-09-10 16:24:15 -04:00
Rudi Grinberg c4f486e539 MM2: More detailed logging. 2012-09-10 16:08:33 -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
Rudi Grinberg 97317c0195 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-10 15:35:46 -04:00
Martin Konecny e85ea5c683 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-10 15:35:42 -04:00
Martin Konecny 3107286799 CC-4370: Transitioning between two webstreams a hiccup in the stream is audible 2012-09-10 15:35:32 -04:00
Rudi Grinberg 0c1c4aa27d Put sql in heredoc for better readability 2012-09-10 15:35:30 -04:00
Rudi Grinberg 9d825a55b3 Crap comment removed 2012-09-10 15:32:31 -04:00
Rudi Grinberg 2e0b29b14e Removed unused code 2012-09-10 15:31:56 -04:00
Rudi Grinberg 987b65af28 cc-4347: Extra pdo work 2012-09-10 14:53:26 -04:00
Rudi Grinberg 259a3eb792 cc-4359: normpath'd music dir before passing it to manager.py to remove
watch
2012-09-10 14:51:29 -04:00
James 0ab08af48f CC-4380: Show ReplayGain value in the Library page
- done
2012-09-10 14:37:38 -04:00
denise 60cf74a602 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-10 14:16:52 -04:00
denise 957e644829 -fixed javascript error in datatables.js 2012-09-10 14:16:36 -04:00
Rudi Grinberg b085f9ef67 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-10 14:15:07 -04:00