Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
9,936 Commits 18 Branches 27 Tags 434 MiB
Commit Graph

3439 Commits

Author SHA1 Message Date
denise f2e495cbd8 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-19 16:40:05 -04:00
denise 2afc4183bb CC-4496: Library -> Contents-feed does not work if advanced search data is invalid 
-fixed
 2012-09-19 16:39:56 -04:00
Rudi Grinberg 946df8a2e3 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-19 16:36:13 -04:00
Rudi Grinberg 89ed6925df removed benchmarking 2012-09-19 16:36:04 -04:00
Rudi Grinberg e5085f0df3 Cleaned up code. 2012-09-19 16:34:46 -04:00
Martin Konecny a3b53ee3d3 remove gap on right side of show builder 2012-09-19 16:19:02 -04:00
denise b4277f1f17 CC-4495: Library -> Advanced Search: Some fields with ranges do not get validated 
-fixed
 2012-09-19 15:46:03 -04:00
denise 4b2d6caf0e CC-4485: Library -> Advanced Search -> Tooltip needed for invalid input 
-done
 2012-09-19 15:35:45 -04:00
denise dc4e12a0ae Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-19 15:03:29 -04:00
denise d70951a334 CC-4494: Calendar: Cannot resize show 
-fixed
 2012-09-19 15:03:16 -04:00
Martin Konecny f717efd7fb Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-19 13:23:14 -04:00
Martin Konecny ca0fb969b7 fix jplayer errors for mp3 and firefox (flash) 2012-09-19 13:23:06 -04:00
james 51bcf04803 CC-4491: Calendar -> Add /Remove contents: Cannot expand/collapse Advanced Search Options 
- fixed
 2012-09-19 13:11:08 -04:00
james b2e452acbb Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-19 12:51:13 -04:00
james 8652681eda CC-4306: Watch folder: rescan watch directory and remove watch directory tooltips should be shifted depending on the path length 
- fixed
 2012-09-19 12:51:03 -04:00
Rudi Grinberg 0158d3f936 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-19 12:47:18 -04:00
denise 801edc2fcf Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-19 12:42:08 -04:00
denise 81620d4f94 CC-4481: Library -> Advanced Search -> Validation icon does not show up sometimes 
-fixed
 2012-09-19 12:41:54 -04:00
Rudi Grinberg f801fcb81e empty space 2012-09-19 11:20:26 -04:00
Rudi Grinberg 014da73eed heredoc sql 2012-09-19 11:17:32 -04:00
Rudi Grinberg 6001995e01 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-19 11:15:09 -04:00
Rudi Grinberg ecb5c93ddf Removed methods again... 2012-09-19 11:14:59 -04:00
Rudi Grinberg 7dac1c6561 Added them back because not sure 2012-09-19 11:14:26 -04:00
Rudi Grinberg 99b28cca82 Removed unused methods 2012-09-19 11:11:50 -04:00
denise dc95ab1d00 CC-4155: Playlist Builder: Style static/dynamic expansion blocks in playlist contents 
-changed null values to empty strings
 2012-09-19 11:05:17 -04:00
Martin Konecny ddc0e8d2ba remove console.log from javascript library :/ 2012-09-19 11:04:01 -04:00
denise 281e7d1092 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-19 10:49:52 -04:00
denise 0c823af660 CC-4155: Playlist Builder: Style static/dynamic expansion blocks in playlist contents 
-done
 2012-09-19 10:49:17 -04:00
Rudi Grinberg 20b79374e2 Removed empty method 2012-09-19 10:25:29 -04:00
Rudi Grinberg 58620203cf line wrap 2012-09-19 10:24:45 -04:00
Rudi Grinberg fb4f7c1cb5 psr 2012-09-19 10:23:54 -04:00
Martin Konecny 1da4f44768 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-18 21:29:19 -04:00
Martin Konecny 7036036a86 CC-4476: Make all green notification boxes fade out after 5 seconds 
-fixed
 2012-09-18 21:29:02 -04:00
Rudi Grinberg 33be48e9e3 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-18 18:21:00 -04:00
Rudi Grinberg a9eefe21fa cc-4304: Add call to save after each file reassignment 2012-09-18 18:20:33 -04:00
denise 92b40bea0c CC-4484: Some js files do not have the airtime version appended 
-fixed
 2012-09-18 17:43:13 -04:00
denise 5003e86eac - changed smart block qtip text 2012-09-18 17:37:38 -04:00
denise f9778f2da4 -removed windows CRLF 2012-09-18 17:26:34 -04:00
denise 610a5da24e Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-18 17:23:37 -04:00
denise 1d699fe0b8 CC-4479: Buttons in dialog windows are not styled 
-done
 2012-09-18 17:22:24 -04:00
Martin Konecny b69f3288d3 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-18 17:22:22 -04:00
Martin Konecny 6420e6a830 remove trailing whitespace 2012-09-18 17:22:14 -04:00
denise 39e1bd5271 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-18 16:55:57 -04:00
denise b77429164b CC-4465: Calendar: Remove warning icon on empty shows if show is in the past 
-removed setInterval function
 2012-09-18 16:55:46 -04:00
James 3ecbab3259 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-18 16:50:57 -04:00
James 8433ec5445 CC-4482: Smart Blocks -> tracks with empty "Album" name are NOT filtered in 
- fixed
 2012-09-18 16:50:42 -04:00
denise cc966ca62b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-18 16:49:52 -04:00
denise 54ab58a9c7 CC-4465: Calendar: Remove warning icon on empty shows if show is in the past 
-removed (commented out) code for this ticket
-postponing for now
 2012-09-18 16:49:45 -04:00
Rudi Grinberg d55915d649 naming convention fix 2012-09-18 16:40:23 -04:00
Rudi Grinberg 608fff090c Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-18 15:52:26 -04:00
denise 1c89244b02 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-18 15:52:20 -04:00
Rudi Grinberg 7a958ec8b6 formatting 2012-09-18 15:52:16 -04:00
denise 8cae11d588 CC-4478: Library: audio preview check should be skipped if file does not exist 
-fixed
 2012-09-18 15:52:11 -04:00
James be214ac126 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-18 15:47:48 -04:00
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
Rudi Grinberg d4443da626 Removed debugging statement 2012-09-17 11:12:52 -04:00
Rudi Grinberg f6967ac575 Added Martin's fix 2012-09-17 11:03:36 -04:00
Martin Konecny 7fed5bcd18 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-17 10:57:19 -04:00
Rudi Grinberg 1d46110f36 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-17 10:52:47 -04:00
Rudi Grinberg 6118cd63d7 cc-4419: Added quick hack for now 2012-09-17 10:52:37 -04:00
Vladimir 207fe29560 CC-4155: Style static/dynamic expansion blocks in playlist contents 2012-09-17 16:50:34 +02:00
Rudi Grinberg a664e7f74a Removed extra comments 2012-09-17 10:30:55 -04:00
Rudi Grinberg 1c2cebf5a8 Removed comment 2012-09-17 10:27:12 -04:00
Rudi Grinberg 44f3020709 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-17 10:21:34 -04:00
Vladimir f6d8e4b957 CC-4078: Calendar -> Need better 'now-playing' icon 2012-09-17 16:17:05 +02:00
Vladimir 465de07ae0 Minor cosmetic change of the liquidsoap status 2012-09-17 15:32:33 +02:00
Vladimir d888d1cb1c CC-4443: Context menu is not displayed correctly 2012-09-17 15:27:13 +02:00
Vladimir 9776da8bf4 Fixed playlist item width 2012-09-17 14:39:57 +02:00
Rudi Grinberg f809a17c02 Formatting 2012-09-14 19:05:30 -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
denise a75a12a198 -smart block criteria UI change for small screen resolution 2012-09-14 18:02:40 -04:00
denise d5a2fc93e1 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-14 17:35:25 -04:00
denise 84deda99c5 CC-4440: System -> Streams: Update and Save 'Stream 1/2/3' will make it invisible 
-fixed
 2012-09-14 17:35:14 -04:00
Rudi Grinberg 2faf299c73 Removed code duplication 2012-09-14 17:28:50 -04:00
Rudi Grinberg 092595eb9f Removed profane logging message 2012-09-14 17:10:10 -04:00
Rudi Grinberg 7b1b271a2c Reformatted sql to use heredocs 2012-09-14 17:09:05 -04:00
Rudi Grinberg f2b07e4a83 alignment 2012-09-14 17:02:38 -04:00
Rudi Grinberg 67483f8bb2 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-14 17:01:45 -04:00
Rudi Grinberg 81dadb7f85 Removed annoying logging 2012-09-14 17:01:35 -04:00
Martin Konecny 4ea3d86121 remove unnecessary logging 2012-09-14 16:58:42 -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 c84a608747 CC-4438: Station Time is always UTC time no matter what the time zone setting is 
-fixed
 2012-09-14 16:51:39 -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 29909f0bd9 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-14 16:49:37 -04:00
Rudi Grinberg bf651a96aa cc-4431: Fixed isUserType 2012-09-14 16:47:55 -04:00
denise ee98c8fba5 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-14 16:38:33 -04:00
denise 8ffaaaef25 -skip playable test if item is a smart block 2012-09-14 16:38:26 -04:00
Rudi Grinberg ba08355c38 quick fix 2012-09-14 16:16:52 -04:00
Rudi Grinberg 76ba4bb6f0 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-14 16:03:03 -04:00
denise 4201176b3a -small UI change 2012-09-14 15:59:34 -04:00
denise da107f5120 -small UI fix 2012-09-14 15:55:55 -04:00
denise 0524e4e5d2 -implemented UI changes for playlist/block/webstream builder 2012-09-14 15:49:39 -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 239a228175 CC-4434: Make Application_Model_Preference::getValue and setValue private methods 
-small fix
 2012-09-14 14:36:31 -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
denise f581b0536e -fixed formatting 2012-09-14 11:18:13 -04:00
denise bb38512bae -fixed formatting 2012-09-14 10:52:50 -04:00
denise 97a0a82dc3 -renamed AIRTIME_DEV_README to AIRTIME_DEV_README_COLUMN_FILTER 
-added new diff file for dataTables.ColVis.js
 2012-09-13 17:19:08 -04:00
denise c35c76351b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-13 17:11:10 -04:00
denise 8f48544bb7 -implemented UI changes for Now Playing page 2012-09-13 17:10:38 -04:00
James d93fcec490 CC-4424: Clicking "edit" on playlist allows you to preview tracks that should be disabled 
- fixed
 2012-09-13 17:09:10 -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 505b53fa16 cc-1665: fix broken checkin for webstream 2012-09-13 16:11:06 -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
Rudi Grinberg 410a3406af Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-13 15:05:48 -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
Martin Konecny b04afaec2c CC-4393: Please ignore Flac items for Playlist Preview and disable to preview it as a single track 
-detect flash fallback
 2012-09-13 14:55:17 -04:00
Rudi Grinberg 8d08aa888b cc-4421: Added special handling for files that mutagen returns None for. 2012-09-13 14:54:52 -04:00
James b2d61f2402 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-13 14:22:27 -04:00
James 2293fcda01 CC-4393: Please ignore Flac items for Playlist Preview and disable to preview it as a single track 
- fixed
 2012-09-13 14:22:13 -04:00
Rudi Grinberg 4137602116 Cleaned up API controller 2012-09-13 14:21:15 -04:00
Rudi Grinberg e984faf394 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-13 12:33:30 -04:00
Rudi Grinberg 8a2703c50d Made method static 2012-09-13 12:33:15 -04:00
Martin Konecny 4fd9993108 CC-1710FLAC, BWF, AAC support 
-Enable browser preview for new filetypes
 2012-09-13 12:30:26 -04:00
Martin Konecny fad6635a1a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-13 12:28:30 -04:00
Martin Konecny 09d587e262 CC-4393: Please ignore Flac items for Playlist Preview and disable to preview it as a single track 
-better file type detection
 2012-09-13 12:28:10 -04:00
Rudi Grinberg 9dfb762bbe Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-13 12:27:17 -04:00
Rudi Grinberg 2b9e6081a4 Added log for exception 2012-09-13 12:27:04 -04:00
Martin Konecny e95933525b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-13 12:25:03 -04:00
Martin Konecny 983bbc5fc5 CC-4393: Please ignore Flac items for Playlist Preview and disable to preview it as a single track 
-better file type detection
 2012-09-13 12:24:53 -04:00
Rudi Grinberg e043816bf4 Removed superfluous logging 2012-09-13 12:23:48 -04:00
Rudi Grinberg 3fb7526fbb Shortened logging 2012-09-13 12:15:51 -04:00
Rudi Grinberg b28116f622 removed empty space 2012-09-13 11:34:00 -04:00
Rudi Grinberg d564b85e7c Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-13 11:12:32 -04:00
denise 771ca5e0b3 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-13 11:12:51 -04:00
denise a779142a08 -fix commenting error 2012-09-13 11:12:39 -04:00
Rudi Grinberg e2f8d8e0e7 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-13 11:10:43 -04:00
Rudi Grinberg d409af2876 shortened logging 2012-09-13 11:07:29 -04:00
Rudi Grinberg dced49c425 Removed unused variable 2012-09-13 10:52:58 -04:00
James 5067a304d9 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-13 10:49:33 -04:00
James b6b93618e6 CC-4353: Numeric search fields in Library would benefit from format labels 
- bug fix
 2012-09-13 10:49:24 -04:00
Martin Konecny 4fc278a55a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-13 10:42:59 -04:00
Martin Konecny a396136600 bootstrap.css file 2012-09-13 10:42:53 -04:00
Rudi Grinberg 55993352bf Removed unused variables. 2012-09-13 10:35:24 -04:00
Rudi Grinberg 52882ef938 Added mp4 removed aac. 2012-09-13 10:35:13 -04:00
Rudi Grinberg 8eda4a7035 Subtle bug fixed in smartPrepareAndExecute. 2012-09-13 10:34:15 -04:00
denise e1403d45bd CC-4368: Unused local variables in Airtime Controllers. Should be removed. 
-done
 2012-09-13 10:32:33 -04:00
Rudi Grinberg 24b3fb7e8a Remvod unused CC_CONFIG, reformatted some code 2012-09-13 10:26:50 -04:00
Martin Konecny 1f3bab2458 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-12 23:06:19 -04:00
Martin Konecny 54d7f496d9 add bootstrap.js to bootstrap.php 2012-09-12 23:06:05 -04:00
Rudi Grinberg cc88a9a8e3 Fixed a lot of unused variables 2012-09-12 18:36:27 -04:00
Martin Konecny 4998a63a6a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-12 17:34:32 -04:00
Martin Konecny 1c293839da CC-4393: Please ignore AAC and Flac items for Playlist Preview and disable to preview it as a single track 
-disable preview icon
 2012-09-12 17:32:19 -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
Vladimir 8938eaa637 Added missind Bootstrap CSS (bootstrap_custom.css) 2012-09-12 23:18:37 +02:00
Rudi Grinberg e708f60f68 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-12 17:08:58 -04:00
denise 9c8f4fe404 CC-4414: Unused local variables in forms 
-done
 2012-09-12 17:09:00 -04:00
Rudi Grinberg af8c813f35 Documented unimplemented interface methods 2012-09-12 17:08:51 -04:00
denise 32b1ee95b7 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-12 16:29:35 -04:00
denise 5ac6877e60 CC-4362: Smart Block: error for multiple criteria 
-fixed
 2012-09-12 16:29:26 -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 87fb9998dd increase mem warning limit to 30MB 2012-09-12 15:44:26 -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 9e7e9639ae Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-12 15:42:09 -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
Rudi Grinberg b2737688cc Added space to sql squery 2012-09-12 15:36:37 -04:00
Vladimir 77824afdd3 Added Bootstrap CSS, images and JS for new buttons and dropdown menues 2012-09-12 21:23:25 +02:00
Rudi Grinberg d1b4ce3de6 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-12 15:19:57 -04:00
Rudi Grinberg a432665146 Changed to heredoc 2012-09-12 15:19:39 -04:00
denise 07ac651f71 - move title and creator to top of library column view 2012-09-12 15:09:07 -04:00
Rudi Grinberg 92532cb708 cc-4394: Added m4a 2012-09-12 14:54:11 -04:00
denise b43a1e3032 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-12 14:27:29 -04:00
denise 54d18b7bcd CC-4382: Editing the color of a repeating show gives error message 
-fixed
 2012-09-12 14:27:17 -04:00
Rudi Grinberg d62ba61ea6 Formatting schedule.php 2012-09-12 14:19:02 -04:00
Rudi Grinberg 806fd83ccc Reformatted schedule 2012-09-12 14:14:55 -04:00
Rudi Grinberg dd68f6d945 Changed schedule to use james' helper function 2012-09-12 13:44:20 -04:00
Rudi Grinberg 7f9642dcd2 Fixed typo 2012-09-12 12:18:06 -04:00
Rudi Grinberg 195008d1e4 more pdo fix 2012-09-12 12:16:53 -04:00
Rudi Grinberg 845ec23fa3 fixed booboo 2012-09-12 12:15:47 -04:00
Rudi Grinberg ad75849a6f Fixed array_map over query instances 2012-09-12 12:09:38 -04:00
Rudi Grinberg d194ff1809 PDO'd a few things missed before in cancelShow() 2012-09-12 12:05:03 -04:00
Rudi Grinberg 6d32c03351 getHosts() changed sql style 2012-09-12 12:00:53 -04:00
Rudi Grinberg cebfdd6558 Changed sql string to heredoc 2012-09-12 11:59:27 -04:00
Rudi Grinberg 6519512924 fixed array_map over iterable 2012-09-12 11:54:37 -04:00
Rudi Grinberg f47593575c switch defaults for verbose stack trace 2012-09-12 11:51:11 -04:00
Rudi Grinberg 8b433de006 Made verbose trace opt out. 2012-09-12 11:45:08 -04:00
Rudi Grinberg d69391d2dd Formatted Block.php 2012-09-12 11:35:28 -04:00
Rudi Grinberg 7b41d94352 Reforamtted Block.php 2012-09-12 11:31:41 -04:00