Commit graph

9466 commits

Author SHA1 Message Date
Rudi Grinberg
2e0e0849c5 More clean up 2012-09-18 11:03:34 -04:00
Rudi Grinberg
d90559fdf8 Cleaned up ShowbuilderController 2012-09-18 11:02:41 -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
denise
1698aae251 CC-4466: Buttons on Now Playing page are clickable even though they are disabled
-fixed
2012-09-18 10:53:19 -04:00
Martin Konecny
aa3bf3941b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-17 22:48:16 -04:00
Martin Konecny
a661ab8850 CC-4289: Airtime 2.2 upgrade script
-fixed
2012-09-17 22:48:03 -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
7b72a14a02 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-17 17:59:02 -04:00
James
8f991dc50b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-17 17:56:45 -04:00
James
81a015dfac CC-4460: Differences between upgraded and fresh installed Airtime database
- done
2012-09-17 17:56:33 -04: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
8b50ff70c3 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-17 17:52:00 -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
James
df476d9cb6 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-17 17:47:53 -04:00
James
db52f1cfcf CC-4383: Fatal error in phone_home_stat script (2.2.0 dev)
- fixed
2012-09-17 17:47:32 -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
9c5ebdc4c0 Removed old commented code 2012-09-17 17:02:59 -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
d367c0f55c remove all newline characters from AirtimeInstall.php 2012-09-17 16:41:40 -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
efc0ace49c Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-17 16:06:30 -04:00
Martin Konecny
f3250ac616 CC-4447: Install minimal -> reinstall uring -r reports ERROR on existing database
-fixed
2012-09-17 16:06:16 -04:00
denise
182bdd0cf6 -added border to smart block expansion 2012-09-17 15:57:41 -04:00
Martin Konecny
0e82083ba1 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-17 15:55:53 -04:00
Martin Konecny
1483fb92e5 better detection of timezone during install
(suppress PHP warnings if timezone is not set in php.ini)
2012-09-17 15:55:46 -04:00
denise
cf57c12782 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-17 15:49:34 -04:00
denise
9b39ff93b4 -removed console.log 2012-09-17 15:49:22 -04:00
Rudi Grinberg
1a29499bb8 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-17 15:48:09 -04:00
James
c9b7fa7073 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-17 15:41:40 -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
denise
43c336eb6d CC-4155: Playlist Builder: Style static/dynamic expansion blocks in playlist contents
-implemented css changes
-formatted playlist_builder.css
2012-09-17 15:41:22 -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
denise
3329c36d0c - changed smart block range text boxes to align with new UI 2012-09-17 15:23:47 -04:00
James
b6f447a827 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-17 14:58:45 -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