Commit graph

1622 commits

Author SHA1 Message Date
Rudi Grinberg
d2f43058c2 fixed comment 2012-09-18 12:09:28 -04:00
Rudi Grinberg
f9319b869a Corrected comments 2012-09-18 12:08:30 -04:00
Rudi Grinberg
bc873a3ece Added extension handling for file path 2012-09-18 12:04:54 -04:00
Rudi Grinberg
8657a80459 removed return '' 2012-09-18 11:51:13 -04:00
Rudi Grinberg
0a83b33a5a Removed extra logging statements 2012-09-18 11:10:54 -04:00
Rudi Grinberg
6481556f9b Showbuilder formatting 2012-09-18 11:07:32 -04:00
Rudi Grinberg
49e1b29bc9 Removed instances of getLine and getFile 2012-09-18 11:04:33 -04:00
Rudi Grinberg
96f138a9fe Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-18 10:55:55 -04:00
Rudi Grinberg
9249bf8cd0 Big formatting changes. 2012-09-18 10:55:42 -04:00
Naomi Aro
f50fccaf5f Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-17 16:28:36 -07:00
Naomi Aro
bb3ffce071 CC-3944 : Now Playing -> Time Line view: Cannot cancel record show, cancel button is disabled 2012-09-17 16:28:28 -07:00
Rudi Grinberg
542c5c857f alignment 2012-09-17 17:54:10 -04:00
Rudi Grinberg
53c6d77821 Formatting 2012-09-17 17:52:56 -04:00
Rudi Grinberg
095a5cce4f Added better debugging 2012-09-17 17:51:50 -04:00
Rudi Grinberg
69756f60ca formatting 2012-09-17 17:49:25 -04:00
Rudi Grinberg
ff22b80dfc formatting 2012-09-17 17:49:16 -04:00
Rudi Grinberg
3ba3df07f8 better logging 2012-09-17 17:39:41 -04:00
Rudi Grinberg
5a37777cfd formatting 2012-09-17 17:04:49 -04:00
Rudi Grinberg
1c736d6366 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-17 16:47:45 -04:00
Rudi Grinberg
d0e67d8475 cc-4462: Bandaided, marked as hack 2012-09-17 16:47:33 -04:00
Martin Konecny
117f11ef97 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-17 16:46:57 -04:00
Martin Konecny
75620be761 remove all mosty carriage return characters 2012-09-17 16:46:51 -04:00
Rudi Grinberg
81c72b8344 cc-4462: Bandaided 2012-09-17 16:46:49 -04:00
Martin Konecny
56eb2dff92 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-17 16:40:37 -04:00
Martin Konecny
c310cecf40 CC-4463: do we need getFileExtension()? 2012-09-17 16:40:27 -04:00
Rudi Grinberg
ae1ae80d36 in_array -> array_key_exists 2012-09-17 16:40:22 -04:00
Rudi Grinberg
c2b2ea1d16 Fixed formatting 2012-09-17 16:27:10 -04:00
Martin Konecny
8b445486b1 CC-4427: Listen button does not work
fixed
2012-09-17 16:17:53 -04:00
Martin Konecny
0e82083ba1 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-17 15:55:53 -04:00
Rudi Grinberg
1a29499bb8 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-17 15:48:09 -04:00
James
54b6b12ec0 CC-4094: Dashboard -> Source Info panel: DJ assigned to current show can turn off the Master Resouce but cannot disconnect it.
- fixed
2012-09-17 15:41:27 -04:00
Rudi Grinberg
4f576afc00 cc-4396. Initial fix problem was a module was not being included in the soundcloud upload script. 2012-09-17 15:24:02 -04:00
Martin Konecny
54bb414500 CC-4318: Widgets: Weekly show cannot show the schedule
-fixed
2012-09-17 14:56:34 -04:00
denise
1e0595d7ad Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-17 14:53:17 -04:00
denise
8801ccecce CC-4459: Now Playing -> Timeline: 'Filter by show' does not work
-fixed
2012-09-17 14:52:56 -04:00
Rudi Grinberg
ed45011b40 needle <-> haystack 2012-09-17 14:21:13 -04:00
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