Commit graph

2305 commits

Author SHA1 Message Date
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
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
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
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
Rudi Grinberg
e85a83d045 Fixed pdo 2012-09-10 14:14:44 -04:00
James
4d3c624607 CC-4380: Show ReplayGain value in the Library page
- temp commit
2012-09-10 12:35:32 -04:00
Martin Konecny
e5de4f560d Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-10 12:18:41 -04:00
Martin Konecny
ac8610ca06 CC-4385: Problem with mono streams for stream rebroadcasting
-fixed
2012-09-10 12:18:19 -04:00
Rudi Grinberg
567a8a2635 cc-4347: Fixed typo 2012-09-10 12:04:33 -04:00
Rudi Grinberg
8340db3ce9 Added error handing todo 2012-09-10 11:53:22 -04:00
Rudi Grinberg
a0b3742758 cc-4347: resizeShow pdo'd 2012-09-10 11:49:56 -04:00
Rudi Grinberg
3df4c8d65a cc-4347: deleteRebroadcasts and GetEndTimeOfNextShowWithLiveDJ pdo'd 2012-09-10 11:39:22 -04:00
Rudi Grinberg
e2c2f67fbb cc-4347: GetShowInstanceCount() pdo'd 2012-09-10 11:29:28 -04:00