Commit graph

1486 commits

Author SHA1 Message Date
Rudi Grinberg
fef949f6ea band aided some bug 2012-09-17 12:50:04 -04:00
Rudi Grinberg
92a5bf51a6 Added warning for uploading unknown file types 2012-09-17 12:45:33 -04:00
Rudi Grinberg
048da282fa Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-17 12:36:57 -04:00
Rudi Grinberg
2337078dd8 Cleaned up unused variables. Formatted some lines. 2012-09-17 12:35:12 -04:00
Martin Konecny
5bbc815a78 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-17 12:32:54 -04:00
Martin Konecny
5d0592c729 CC-4454: Show deleting: if you do 'delete this instance and all following', it doesn't remove entries from cc_schedule table
-fixed
2012-09-17 12:32:39 -04:00
Rudi Grinberg
b913b067c2 Added setColumnFilter(oTable) 2012-09-17 11:58:08 -04:00
Martin Konecny
7fed5bcd18 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-17 10:57:19 -04:00
Martin Konecny
be80eeb5fd CC-4404: restart airtime-liquidsoap will interrupt the output stream and never resume until restart playout engine
-fixed
2012-09-14 18:20:46 -04:00
Rudi Grinberg
7b1b271a2c Reformatted sql to use heredocs 2012-09-14 17:09:05 -04:00
Martin Konecny
39903be69a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-14 16:51:48 -04:00
Martin Konecny
3ced92db7a CC-4415: Smart Block audio preview doesn't work 2012-09-14 16:51:14 -04:00
Rudi Grinberg
ec3e0a9b9f Added todo 2012-09-14 16:50:28 -04:00
Rudi Grinberg
bf651a96aa cc-4431: Fixed isUserType 2012-09-14 16:47:55 -04:00
Rudi Grinberg
76ba4bb6f0 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-14 16:03:03 -04:00
Rudi Grinberg
05916a4d26 Code cleanup 2012-09-14 15:13:08 -04:00
Martin Konecny
198d15adc8 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-14 14:53:32 -04:00
Martin Konecny
78460703a2 CC-4434: Make Application_Model_Preference::getValue and setValue private methods
-done
2012-09-14 14:53:25 -04:00
Rudi Grinberg
79ce7b572c cc-4202: Fixed 2012-09-14 14:51:50 -04:00
Martin Konecny
6e239d08e9 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-14 14:43:15 -04:00
Martin Konecny
e3c1a3ac0e CC-4434: Make Application_Model_Preference::getValue and setValue private methods
-initial commit
2012-09-14 12:09:40 -04:00
denise
c7f4ede766 -implemented UI changes for library page 2012-09-14 12:08:51 -04:00
James
43503475fd CC-4430: Block: Please don't count the removed files in when calculating how many files meet the criteria
- CRLF fix
2012-09-13 17:07:47 -04:00
James
d2f0b10552 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-13 17:05:56 -04:00
James
0b917f385e CC-4430: Block: Please don't count the removed files in when calculating how many files meet the criteria
- fixed
2012-09-13 17:05:40 -04:00
Martin Konecny
d534f22ce4 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-13 16:11:15 -04:00
Martin Konecny
da72c00f28 CC-4370: Transitioning between two webstreams: a hiccup in the stream is audible
-fixed
2012-09-13 16:10:17 -04:00
Rudi Grinberg
11ef613d1c comment formatting 2012-09-13 15:16:46 -04:00
Rudi Grinberg
e31d570a1c Sql formatting 2012-09-13 15:13:37 -04:00
Rudi Grinberg
f754d78687 Formatted comments and = 2012-09-13 15:12:54 -04:00
Martin Konecny
14db5053b1 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-13 14:56:10 -04:00
Martin Konecny
203378e60a More exception handling 2012-09-13 14:56:03 -04:00
Rudi Grinberg
8a2703c50d Made method static 2012-09-13 12:33:15 -04:00
Rudi Grinberg
24b3fb7e8a Remvod unused CC_CONFIG, reformatted some code 2012-09-13 10:26:50 -04:00
Rudi Grinberg
cc88a9a8e3 Fixed a lot of unused variables 2012-09-12 18:36:27 -04:00
Rudi Grinberg
536fdabb77 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-12 17:27:08 -04:00
denise
3b43efefe0 CC-4413: Unused local variables in models.
-done
2012-09-12 17:26:41 -04:00
Rudi Grinberg
8e91c515f0 cc-4397: Fixed handling for bad metadata. 2012-09-12 17:26:37 -04:00
Rudi Grinberg
af8c813f35 Documented unimplemented interface methods 2012-09-12 17:08:51 -04:00
Rudi Grinberg
88604eabcc Removed unused variable 2012-09-12 16:24:49 -04:00
Rudi Grinberg
15355f9e30 Formatted comment 2012-09-12 16:12:00 -04:00
Rudi Grinberg
6e8313a395 Fixed typo in SQL missing , 2012-09-12 16:10:56 -04:00
Rudi Grinberg
db5dbab086 Removed unused local variables 2012-09-12 16:09:53 -04:00
Rudi Grinberg
414d1fa511 PDO'd UpdateBroadcastedStatus 2012-09-12 16:09:28 -04:00
Rudi Grinberg
643c00418a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-12 15:59:53 -04:00
Rudi Grinberg
64a1dade9b Massive formatting of SQL 2012-09-12 15:59:46 -04:00
Martin Konecny
20f5fe6480 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
Conflicts:
	airtime_mvc/application/models/Block.php
	airtime_mvc/public/css/styles.css
2012-09-12 15:55:43 -04:00
Martin Konecny
a418f5777c CC-4393: Please ignore AAC and Flac items for Playlist Preview and disable to preview it as a single track
-initial commit
2012-09-12 15:43:50 -04:00
Rudi Grinberg
2c1acf8b17 Removed reference to CC_CONFIG 2012-09-12 15:42:00 -04:00
Rudi Grinberg
6fc8df9226 Here doc'd sql 2012-09-12 15:39:02 -04:00