Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,376 Commits 3 Branches 0 Tags 405 MiB
Commit Graph

3185 Commits

Author SHA1 Message Date
James eecc90547d CC-4461: Now Playing: Timeline does not reflect the changes on Show start time (which is changed from Calendar->Edit Show) 
- fixed
 2012-09-18 15:47:37 -04:00
denise 0241eb4714 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-18 15:29:08 -04:00
denise 09b117999e CC-4475: Register form button doesn't have any styling 
-fixed
 2012-09-18 15:28:38 -04:00
Martin Konecny da11dc077e Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-18 15:27:35 -04:00
Martin Konecny 4c58c4c9a9 CC-4473: On Air button greys out when one out of two same Webstreams is cancelled 
-fixed
 2012-09-18 15:27:27 -04:00
Rudi Grinberg a2f3210c79 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-18 15:26:53 -04:00
Rudi Grinberg 72e6ee35fa cc-4304: Temporarily fixed 2012-09-18 15:26:43 -04:00
denise e676cf856f -remove console.log 2012-09-18 15:16:54 -04:00
denise 0386f8a9cb Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-18 15:14:57 -04:00
denise 7bbd10556b CC-4465: Calendar: Remove warning icon on empty shows if show is in the past 
-done
 2012-09-18 15:14:46 -04:00
Rudi Grinberg 2cfb0c85d5 Formatted sql 2012-09-18 15:04:22 -04:00
Rudi Grinberg 3a60d729fd added todo 2012-09-18 15:02:07 -04:00
Rudi Grinberg b372c9ae50 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-18 14:56:53 -04:00
James 859041bcf4 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-18 14:40:32 -04:00
James 98f0692b8d CC-4457: Media Library: The background of 'Adding items' is minimize to a point 
- fixed
 2012-09-18 14:40:18 -04:00
Rudi Grinberg b069b1254e Aligned 2012-09-18 12:56:01 -04:00
Rudi Grinberg 90d3494576 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-18 12:48:55 -04:00
Rudi Grinberg 6ac241b1fc Added todo 2012-09-18 12:48:45 -04:00
Martin Konecny 09bc686d99 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-18 12:41:30 -04:00
Martin Konecny b0f2176329 fix some TODO's in webstream.php 2012-09-18 12:40:44 -04:00
Rudi Grinberg a22ba39de1 formatting 2012-09-18 12:26:07 -04:00
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 6fc0d50c9f lined up 2012-09-18 11:46:35 -04:00
Rudi Grinberg 018b50d316 added better logging 2012-09-18 11:45:10 -04:00
denise 355ceadedb Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-18 11:22:44 -04:00
denise e00ff6367d CC-4458: Now Playing -> "+ Add to current playlist text" might be replaced by something more appropriate 
-fixed
 2012-09-18 11:22:37 -04:00
Rudi Grinberg 9759543943 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-18 11:11:06 -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
denise 75d6b509ea Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-18 11:05:20 -04:00
denise 9c721f202f -small UI improvement 2012-09-18 11:05:13 -04:00
Rudi Grinberg 49e1b29bc9 Removed instances of getLine and getFile 2012-09-18 11:04:33 -04:00
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
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 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 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
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
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
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
James 5d60a599a6 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-17 12:42:11 -04:00
James 5e514b3b60 -UI alignment of input text element 2012-09-17 12:41:58 -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
denise fd72e20d83 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-17 12:30:56 -04:00
denise f840a9b24a CC-4451: (Firefox) Now Playing -> Can't cancel Current Show 
-fixed
 2012-09-17 12:30:43 -04:00
James 54c3c13754 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-17 12:29:07 -04:00
James d089d3fbf3 - putting scroll bar on library left pane 2012-09-17 12:28:46 -04:00
denise f02bf04a25 CC-4449: (Firefox) Now Playing -> Cancel currently playing track does not work 
-fixed
 2012-09-17 12:27:17 -04:00
denise b8b3bfb495 CC-4450: Now Playing -> Can't remove overbooked tracks 
-fixed
 2012-09-17 12:23:49 -04:00
denise e30d3b770c -removed unused code 2012-09-17 12:19:02 -04:00
denise 3c3b39796d CC-4445: Timeline: 'Select' dropdown menu should be disabled if the button is disabled 
-fixed
 2012-09-17 12:10:23 -04:00
Rudi Grinberg 990bcebfe8 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-17 11:58:18 -04:00
Rudi Grinberg b913b067c2 Added setColumnFilter(oTable) 2012-09-17 11:58:08 -04:00
denise 99969ff19d CC-4445: Timeline: 'Select' dropdown menu should be disabled if the button is disabled 
-fixed
 2012-09-17 11:58:05 -04:00
Vladimir c19030e8fb CC-4155: additional styling 2012-09-17 17:39:40 +02:00
James b3420984e2 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-17 11:27:52 -04:00
James 396b529162 - UI interation of advanced search 2012-09-17 11:23:38 -04:00
Rudi Grinberg fab7042ce6 cc-4419: Added quick hack for now -- actual fix 2012-09-17 11:18:18 -04:00
Martin Konecny ab99e64e8a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-17 11:13:44 -04:00