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

2585 Commits

Author SHA1 Message Date
James ef0e800c92 CC-4186: Playlist Builder -> Smart Playlist : The static Smart Playlist's length value will be empty if no file meet the criteria. 
- fixed
 2012-08-09 14:12:30 -04:00
James 825abca61b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-09 11:44:43 -04:00
James 685354e000 CC-4189: Playlist Builder -> Smart Playlist: Cannot change the position of manually added tracks 
- fixed
 2012-08-09 11:44:27 -04:00
denise bad418062e Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-09 11:21:01 -04:00
denise 677d523ef4 CC-4187: Media Library -> Regular Playlist : Use legend instead of label for different elements in context view 
-done
 2012-08-09 11:20:49 -04:00
James ae5b6e58d7 CC-4144: Playlist Builder: Adding smart playlist into regular playlist will reset the Fade in/out settings to default value 
- fixed
 2012-08-09 11:03:57 -04:00
James d959e4ff11 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-09 10:47:59 -04:00
James cf1178522a CC-4166: Playlist Builder -> Regular Playlist : clicking Fade in/out button for a empty playlist will cause PHP Fatal Error 
- changes made on phtml were cause some errors. fixed.
 2012-08-09 10:47:43 -04:00
Martin Konecny c69dac7ab6 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-08 23:02:39 -04:00
Martin Konecny d0d70db391 remove useless debugging 2012-08-08 23:02:16 -04:00
Martin Konecny 8f3037c3e4 CC-1665: Scheduled stream rebroadcasting and recording 
-remove incorrect "no items" warning when a show only contained a webstream
 2012-08-08 23:02:08 -04:00
denise 90ec046854 CC-4188: Playlist Builder -> Smart Playlist : sometimes elements do not index properly when add a new criteria row 
-fixed
 2012-08-08 16:27:03 -04:00
denise b2d3ee0aa4 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-08 15:35:44 -04:00
denise 791989faf7 Smart Playlists: changed label 'block' to 'playlist' type 2012-08-08 15:35:28 -04:00
James ab19d6f511 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-08 15:29:28 -04:00
James d1e6f8178b CC-4166: Playlist Builder -> Regular Playlist : clicking Fade in/out button for a empty playlist will cause PHP Fatal Error 
- fixed. Not displaying fade setting button if the playst/smartplaylist
is empty.
 2012-08-08 15:29:09 -04:00
denise 3a4a827f1f CC-4180: Smart Playlist Builder: modifier select boxes do not change when criteria changes 
-fixed
 2012-08-08 15:24:47 -04:00
denise 50f9582b95 CC-4179: Media Library -> In brief view of Dynamic Smart Playlist, 'does not contain' will be broken to 2 lines 
-fixed
 2012-08-08 13:24:53 -04:00
denise 67a8457889 Smart Playlists: modifier buttons appear incorrectly when editing 2012-08-08 13:16:02 -04:00
denise 5c3701c064 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-08 13:07:12 -04:00
denise 85259e5bba CC-4170: Smart Playlist Builder: elements don't organize properly after deleting a row 
-fixed
 2012-08-08 13:07:00 -04:00
James 83917ed894 CC-4166: Playlist Builder -> Regular Playlist : clicking Fade in/out button for a empty playlist will cause PHP Fatal Error 
- fixed
 2012-08-08 12:23:07 -04:00
James fd1628f971 CC-4117: Smart Playlist: radio_station_name criteria doesnot take effect 
- removing radio_station_name from criteria list
 2012-08-08 12:01:10 -04:00
James 61e38381af CC-4176: Smart Playlist: Set implicit item limit when user uses time as a limit 
- done
 2012-08-08 11:46:48 -04:00
Martin Konecny f33485f8ea Merge branch '2.1.x' into devel 2012-08-08 00:09:13 -04:00
Martin Konecny 333c8ec211 slightly improved PHP logging format 2012-08-08 00:08:46 -04:00
Martin Konecny 18ca6b22cb CC-1665: Scheduled stream rebroadcasting and recording 
-add placeholder icons for smart playlists/webstreams
 2012-08-07 23:44:21 -04:00
Martin Konecny 230c3399ef CC-1665: Scheduled stream rebroadcasting and recording 
-fix newlines appearing in playlist/webstream title
-disable autosave of playlist/webstream title
 2012-08-07 20:48:58 -04:00
Martin Konecny db36870aec CC-1665: Scheduled stream rebroadcasting and recording 
-fix creator id on another SQL query
 2012-08-07 20:38:36 -04:00
Martin Konecny 8876b312fb CC-4167: Create new playlist doesn't work 
-fixed
 2012-08-07 19:49:59 -04:00
Martin Konecny 1dddaa0ba2 CC-1665: Scheduled stream rebroadcasting and recording 
-refresh library to show new stream after save
 2012-08-07 19:49:26 -04:00
Martin Konecny 47ae223a1c CC-1665: Scheduled stream rebroadcasting and recording 
-fix SQL error
 2012-08-07 19:23:42 -04:00
denise 9b805f0a01 CC-4159: Playlist Builder -> Smart Playlist : "+" for modifier disappears if 3 or more Criteria 
-fixed
 2012-08-07 17:40:47 -04:00
denise 4ee232944d CC-4169: Playlist Builder: Smart Playlist time validates even if time isn't given 
-fixed
 2012-08-07 16:27:18 -04:00
denise 9c678c0429 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-07 16:18:00 -04:00
denise 97943a6af8 CC-4157: Playlist Builder -> Smart Playlist -> Wrong warning msg if trying to input 0000-00-00 into Upload criteria 
-fixed
 2012-08-07 16:17:24 -04:00
James 0fe501508e Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-07 15:54:42 -04:00
James 171825e19a CC-4148: Playlist Builder: Please add a 'Processing' for generating Smart playlist 
- added processing box
 2012-08-07 15:54:16 -04:00
denise f6dffc95c8 CC-4158: Playlist Builder -> Smart Playlist: Warning msg field is a little bit longer 
-fixed
 2012-08-07 15:22:32 -04:00
denise 152a97917d Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-07 15:20:32 -04:00
denise 823ab1dd41 CC-4162: Smart Playlist Builder: extra space in between limit and error message 
-fixed
 2012-08-07 15:20:12 -04:00
denise 550c97a2dc CC-4154L: Indicate whether a show has scheduled content on the calendar page 
-done
 2012-08-07 14:57:04 -04:00
James 2f8d0b77fa CC-4149: Playlist Builder: Fail to generate Smart Playlist with 5000 items 
- set the items limit to 500
 2012-08-07 14:53:07 -04:00
denise d05661afff Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-07 11:08:34 -04:00
denise 2c0f7bf03b CC-4145: Playlist Builder: Alert pops up when clicking 'Add to playlist' in context menu of Smart Playlist to add it into regular playlist 
-fixed
 2012-08-07 11:08:00 -04:00
Martin Konecny e20289e5cf Merge branch '2.1.x' into devel 2012-08-06 17:17:05 -04:00
Martin Konecny 975abbaf10 Remove unecessary information being sent from API 2012-08-06 17:16:43 -04:00
Martin Konecny 48a1bf3f02 Merge branch '2.1.x' into devel 
Conflicts:
	airtime_mvc/application/controllers/ApiController.php
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/models/Show.php
 2012-08-06 17:10:46 -04:00
Martin Konecny 40023d9086 CC-4152: Widget does not display current show in some modes 
-fixed
 2012-08-06 17:07:18 -04:00
Martin Konecny 688051b59e CC-1665: Scheduled stream rebroadcasting and recording 
-Remove sX_name from being inserted into DB
 2012-08-03 18:45:43 -04:00
Martin Konecny f901e13a84 CC-1665: Scheduled stream rebroadcasting and recording 
-Make playlist builder show creator name instead of creator id
 2012-08-03 18:06:47 -04:00
Martin Konecny b23b9a0cbd CC-1665: Scheduled stream rebroadcasting and recording 
-allow to filter by webstream only
 2012-08-03 16:33:58 -04:00
Martin Konecny 183937b8e9 CC-1665: Scheduled stream rebroadcasting and recording 
-when editing string should hav 00h 00m format.
 2012-08-03 16:18:45 -04:00
Martin Konecny 0ea66fc33f CC-1665: Scheduled stream rebroadcasting and recording 
-ability to edit playlists
 2012-08-03 15:59:34 -04:00
denise d18acfdc75 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-02 17:17:52 -04:00
denise 2a7c5eef64 CC-84: Smart Playlists 
- added no-wrap class to qtip
 2012-08-02 17:17:44 -04:00
denise 8e67ecff0a CC-84: Smart Playlists 
- added a no-wrap class to qtip
 2012-08-02 17:17:13 -04:00
James 82970c6e73 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-02 17:04:49 -04:00
James af939469d3 CC-84: Smart Playlists 
- fixed bug on expanding block
- fixed text bug
 2012-08-02 17:03:54 -04:00
denise 361e681a59 CC-84: Smart Playlists 
- remove 'add to playlist' option on showbuilder screen
 2012-08-02 16:50:35 -04:00
denise ef994aa449 CC-84: Smart Playlists 
- block options scroll for small screens
 2012-08-02 16:40:32 -04:00
James 028e089c82 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 
Conflicts:
	airtime_mvc/application/models/Block.php
 2012-08-02 16:37:12 -04:00
James 0d2d8218bf CC-84: Smart Playlists 
- audio preview on playlist
- cleaning up some code
 2012-08-02 16:36:12 -04:00
Martin Konecny a146fdcd37 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-02 16:27:00 -04:00
Martin Konecny 9cc152c0ae CC-1665: Scheduled stream rebroadcasting and recording 
-validate form fields of new webstream
 2012-08-02 15:45:15 -04:00
denise 4fca33c5fc CC-84: Smart Playlists 
- removed block from right side if it gets deleted from context menu
 2012-08-02 12:59:00 -04:00
denise 997b5c31c3 CC-84: Smart Playlists 
- fixed dragging tracks into playlists (smart and dumb)
- display alert when dragging into dynamic block
- display alert when dragging playlist into block
 2012-08-02 11:52:11 -04:00
James 6e71a6bb92 CC-84: Smart Playlists 
- dynamic block length display
 2012-08-02 11:17:10 -04:00
denise 9479aeb3dd CC-84: Smart Playlists 
- fixed db column mapping for radio station name and track title
 2012-08-01 17:10:56 -04:00
denise ddd6016b28 CC-84: Smart Playlists 
- qtip cleanup
 2012-08-01 16:36:12 -04:00
denise bf0dcc9035 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-01 16:26:14 -04:00
denise 483ffdf6af CC-84: Smart Playlists 
- increased size of criteria column
- it was too smallf for some fields
 2012-08-01 16:25:59 -04:00
Martin Konecny 2ef4fd314c Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-01 15:37:58 -04:00
Martin Konecny b9bb87f69d CC-1665: Scheduled stream rebroadcasting and recording 
-clicking save now show's webstream save was successful
 2012-08-01 15:37:50 -04:00
denise bcab41cb86 - 'New User' button text was wrapping onto two lines 2012-08-01 15:30:35 -04:00
denise 40ebeb7fb4 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-01 15:00:54 -04:00
denise 13bb036bad CC-84: Smart Playlists 
-on criteria qtip limit was displaying more than once
-fixed
 2012-08-01 15:00:41 -04:00
Martin Konecny e6a3877c1e Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-01 14:52:29 -04:00
Martin Konecny 63b89043b6 CC-1665: Scheduled stream rebroadcasting and recording 
on-air light works with streams now
 2012-08-01 14:51:56 -04:00
denise 7d788c51b2 CC-84: Smart Playlists 
- added scrolling on qtip
 2012-08-01 14:43:52 -04:00
denise 0f681d7c25 CC-84: Smart Playlists 
-fixed undefined offset apache warnings
 2012-08-01 14:07:38 -04:00
denise 8f063367cc CC-84: Smart Playlists 
- qtip cleanup for dynamic playlists
 2012-08-01 13:49:16 -04:00
denise c9afac239a CC-84: Smart Playlists 
- add qtip for smart playlists
- modified qtip content for regular playlists that contain smart playlists
 2012-08-01 12:04:48 -04:00
James 9d51222dae CC-84: Smart Playlists 
- Length calculation for dynamic blocks and playlist that contains
dynamic blocks
 2012-07-31 17:46:37 -04:00
James 1b0cd6b01b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-07-31 11:01:34 -04:00
James b312b2bd45 CC-84: Smart Playlists 
- fixed db query part for static smart playlist generate
 2012-07-31 11:01:19 -04:00
Martin Konecny 45a77e90a8 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-07-31 11:00:26 -04:00
Martin Konecny 92e34b12f7 CC-1665: Scheduled stream rebroadcasting and recording 
-cancel button has effect now :)
 2012-07-31 11:00:15 -04:00
Martin Konecny b83be1a922 CC-1665: Scheduled stream rebroadcasting and recording 
-fix incorrectly named column
 2012-07-31 11:00:01 -04:00
denise eb2a8c1009 CC-84: Smart Playlists 
- renamed Smart Blocks to Smart Playlists in library filter
 2012-07-31 10:17:48 -04:00
Martin Konecny 527b43e8ba CC-1665: Scheduled stream rebroadcasting and recording 
-fix incorrectly named column
 2012-07-31 10:13:41 -04:00
denise cbbdd5a1fd Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-07-31 10:05:50 -04:00
denise 1b1b7e11d0 CC-84: Smart Playlists 
-fixed spacing of modifier '+' button
 2012-07-31 10:05:38 -04:00
Martin Konecny ab85ab59d9 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-07-30 21:48:25 -04:00
Martin Konecny 7e433b61fb CC-1665: Scheduled stream rebroadcasting and recording 
-improve working with "webstreams"
 2012-07-30 21:48:04 -04:00
denise ecd926ae90 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-07-30 18:53:57 -04:00
denise ff62769d6c CC-84: Smart Playlists 
-UI cleanup
 2012-07-30 18:53:50 -04:00
James 27017c7903 CC-84: Smart Playlists 
- fixed getCriteria() to non static function
 2012-07-30 18:21:27 -04:00
James b9739b022d Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-07-30 17:55:39 -04:00
James 019d13b4c9 CC-84: Smart Playlists 
- backend implementation
- UI for blocks within playlist
 2012-07-30 17:55:22 -04:00
denise 142aa214b3 CC-84: Smart Playlists 
-dos2unix
 2012-07-30 17:31:54 -04:00
denise d169f4aa31 CC-84: Smart Playlists 
- improved validation to not allow multiple criteria fields
 2012-07-30 17:03:01 -04:00
denise f91be9468f CC-84: Smart Playlists 
-UI cleanup
 2012-07-30 16:42:37 -04:00
denise e04273c335 CC-84: Smart Playlists 
- created function that returns an array of block criteria
- fixed form so it displays modifier rows properly
 2012-07-29 15:47:42 -04:00
denise c2aea7490f Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-07-27 17:30:35 -04:00
denise 55b8b08508 CC-84: Smart Playlists 
-fixed how the modifier rows are parsed when saving to db
 2012-07-27 17:30:21 -04:00
Martin Konecny 648b8ae296 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-07-27 14:47:26 -04:00
Martin Konecny f0f9e8e215 CC-1665: Scheduled stream rebroadcasting and recording 
-minor fixes
 2012-07-27 14:47:15 -04:00
denise 2083d04107 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-07-27 14:32:39 -04:00
denise d7cf50b2f4 CC-84: Smart Playlists 
- changed error handling and criteria saving to handle same criteria rows
 2012-07-27 14:32:31 -04:00
James 4e022c407d Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-07-27 11:52:08 -04:00
James 5becd70ab1 CC-84: Smart Playlists 
- drag and drop playlist that contains block
- audio preview of playlist that contains static block
 2012-07-27 11:51:50 -04:00
Martin Konecny ebed110429 CC-1665: Scheduled stream rebroadcasting and recording 
-code cleanup
 2012-07-26 17:51:47 -04:00
James 7cde4ba2ba CC-84: Smart Playlists 
- merging code
 2012-07-26 16:16:07 -04:00
James 8755500d30 CC-84: Smart Playlists 
- some minor fix
 2012-07-26 15:30:49 -04:00
James 8f2339f109 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 
Conflicts:
	airtime_mvc/application/models/airtime/map/CcPlaylistcontentsTableMap.php
	airtime_mvc/build/schema.xml
	airtime_mvc/build/sql/schema.sql
 2012-07-26 14:54:47 -04:00
James a51b04e422 CC-84: Smart Playlists 
- db schema change for type column on playlistcontents
 2012-07-26 14:49:42 -04:00
Martin Konecny eb4c23b0b6 CC-1665: Scheduled stream rebroadcasting and recording 
-Fix scheduled streams mixed with scheduled files
 2012-07-26 14:49:32 -04:00
Martin Konecny ccdc06786d CC-1665: Scheduled stream rebroadcasting and recording 
-remove some hardcoded webstream values
-fix some broken problems from devel
 2012-07-26 14:49:32 -04:00
Martin Konecny fbc5b72f14 CC-1665: Scheduled stream rebroadcasting and recording 
-webstreams now start and stop at the correct time.
 2012-07-26 14:49:32 -04:00
Martin Konecny c90495d2d3 CC-1665: Scheduled stream rebroadcasting and recording 
-getting closer to being able to schedule a webstream
 2012-07-26 14:49:32 -04:00
Martin Konecny 3735579378 -remove cc_access table and gunid usage 2012-07-26 14:49:32 -04:00
Martin Konecny b283b5b55e CC-1665: Scheduled stream rebroadcasting and recording 
-remove unused function
 2012-07-26 14:49:32 -04:00
Martin Konecny be8262b67c CC-1665: Scheduled stream rebroadcasting and recording 
-fixed web stream length not showing up correctly
 2012-07-26 14:49:32 -04:00
Martin Konecny 8b2facaa96 CC-1665: Scheduled stream rebroadcasting and recording 
-playlists load contents now correctly identify tracks vs streams
 2012-07-26 14:49:32 -04:00
Martin Konecny a16a1f5033 CC-1665: Scheduled stream rebroadcasting and recording 
-Webstreams now appearing in the library
 2012-07-26 14:49:31 -04:00
Martin Konecny 31176f525e CC-1665: Scheduled stream rebroadcasting and recording 
-started working on UI
 2012-07-26 14:41:40 -04:00
Martin Konecny ed54e882a3 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-07-26 14:41:22 -04:00
Martin Konecny 3f41835e12 re-add getCurrentShowAction 2012-07-26 14:36:21 -04:00
denise a828c46d32 CC-84: Smart Playlists 
- changed name of 'block' to 'smart playlist' on UI only
 2012-07-26 13:16:29 -04:00
denise 3df0f2d26e CC-84: Smart Playlists 
- added 'add' option to smart playlist context menu
 2012-07-26 12:45:31 -04:00
James 40bd33df11 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-07-26 10:49:38 -04:00
James 9bd823ee2c CC-84: Smart Playlists 
- fixed the issue where block length wasn't updated on spl section
 2012-07-26 10:49:23 -04:00
Martin Konecny 077cc735d7 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-07-25 18:42:59 -04:00
Martin Konecny 275efb254a fix improperly renamed functions 2012-07-25 18:42:46 -04:00
denise bef9ba1eea CC-84: Smart Playlists 
- added 'Smart Block' filter in datatable
- added block files to library datatable
 2012-07-25 17:08:22 -04:00
James 1f3cbd8aba CC-84: Smart Playlists 
- introducing smart-block
 2012-07-25 12:44:37 -04:00
denise 722e470f6f CC-84: Smart Playlists 
- changed playlist controller to also handle Blocks
- created new view for smart blocks
 2012-07-25 11:00:46 -04:00
denise c79110644d Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-07-24 12:14:02 -04:00
denise 754187a2b7 CC-84: Smart Playlists 
- remove subform and combined back into one form
 2012-07-24 12:13:51 -04:00
denise c82ea30809 CC-84: Smart Playlists 
- removed criteria subform and reverted back to original criteria options design
 2012-07-24 12:12:47 -04:00
denise 64185dac95 CC-84: Smart Playlists 
- subforms now open and close on the click event
- fixed add and remove criteria to work with new subforms
 2012-07-23 12:42:00 -04:00
James 32f431c584 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 
Conflicts:
	airtime_mvc/application/models/Playlist.php
 2012-07-23 11:03:29 -04:00
denise 952a584f10 CC-84: Smart Playlists 
- form cleanup
 2012-07-23 10:45:17 -04:00
denise 30b64f81fd Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-07-23 10:41:09 -04:00
denise c99e1b892c CC-84: Smart Playlists 
-divided criteria into sub form to handle multiple sets
 2012-07-23 10:40:53 -04:00
Martin Konecny 255866d240 Merge branch '2.1.x' into devel 
Conflicts:
	airtime_mvc/application/controllers/ScheduleController.php
	airtime_mvc/application/models/Show.php
 2012-07-22 19:18:53 -04:00
Martin Konecny aaa0c01e01 CC-4120: memory optimizations for calendar page. 
-can now fetch over a year of data at a time
 2012-07-22 19:14:29 -04:00
James ef64ce2b73 CC-4112: Smart Playlist: Cannot search Long string 
- added length validator
- extra fix: Due to lazy loading, aggregated field on playlist was not
updated properly.
 2012-07-20 15:32:46 -04:00
denise 9bdb4a40e0 CC-84: Smart Playlists 
-fixed playlist type spacing on UI
 2012-07-20 12:32:18 -04:00
denise a67b2fa300 CC-84: Smart Playlists 
- removed soundcloud_id criteria
- added last_played criteria
 2012-07-20 11:25:54 -04:00
denise d801139a12 CC-84: Smart Playlists 
- utime and mtime in library were displaying in UTC
 2012-07-19 19:11:42 -04:00
denise 14712d4d78 CC-84: Smart Playlists 
- fixed undefined index warnings
 2012-07-19 19:09:51 -04:00
denise 624986e973 - removed unnecessary logging line 2012-07-19 18:11:31 -04:00
denise 8e60aec601 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-07-19 18:07:55 -04:00
denise 647de9ed39 CC-84: Smart Playlists 
- started storing last played time in cc_files
- db column (lptime) already existed but was not being used before this
- will use this as a criteria for smart playlists
 2012-07-19 18:07:39 -04:00
James 2e7cf68777 CC-4110: Smart Playlist: some search criteria don't work 
- added bunch of validation
- fixed a bug with range modifier not working correctly
 2012-07-19 16:57:24 -04:00
denise 9fcc851523 CC-84: Smart Playlists 
-hides playlist content if dynamic instead of disabling
-show the user how many files match specified criteria
 2012-07-19 14:52:39 -04:00
James 0322e6b0c6 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-07-19 14:45:34 -04:00
James 82f087c84d CC-84: Smart Playlists 
- changed db query so it's lazy loading
 2012-07-19 14:45:15 -04:00
Rudi Grinberg 1f603bb75b cc-4105 : merge devel into my branch 2012-07-19 10:51:04 -04:00
James 6fc41ee4bf Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-07-18 16:12:20 -04:00
James 266d86d9e4 CC-84: Smart Playlists 
- fixed a bug
- change LIKE to ILIKE
 2012-07-18 16:12:06 -04:00
denise 2d8a9188eb CC-84: Smart Playlists 
- qtip wasn't showing up on 'new' and 'edit' events
- changed 'Artist' to 'Creator' to be consistent with library
 2012-07-18 15:48:15 -04:00
James 9516771099 Merge branch 'cc-84-smart-playlist' into devel 
Conflicts:
	airtime_mvc/application/controllers/PlaylistController.php
	airtime_mvc/application/models/Scheduler.php
 2012-07-18 12:23:57 -04:00
denise 7c5291fe0c CC-84: Smart Playlists 
- ui cleanup
 2012-07-18 11:55:29 -04:00
James 2a38527161 CC-84: Smart Playlists 
- propel usage chage
- cleaning up code
- some js changes
 2012-07-18 11:52:09 -04:00
Rudi Grinberg c23023bcd9 Removed irrelevant comment 2012-07-17 16:43:04 -04:00
Rudi Grinberg 25d3028fb1 cc-4105: added testing support for api client and ApiController 2012-07-17 16:43:04 -04:00
Rudi Grinberg 531dfe2b5e cc-4105: fixed up python media monitor request parameter for recorded shows\n.Added more input validation in php controller 2012-07-17 16:43:04 -04:00
Rudi Grinberg 0ddc8497c3 cc-4105: small improvement in reloadMetadataGroupAction. We give more detailed responses and log bad requests in a little more detail as well 2012-07-17 16:43:04 -04:00
Rudi Grinberg f348652f0e cc-4105: reloadMetadataGroupAction seems to be ready for production.\nSet the parameter correctly after finishing the debugging from the python side 2012-07-17 16:43:04 -04:00
Rudi Grinberg fdf921bbaf cc-4105: Made reloadMetadataGroupAction safer by validating input 2012-07-17 16:43:04 -04:00
Rudi Grinberg 01448d42df cc-4105: added some comments to describe development 2012-07-17 16:43:04 -04:00
Rudi Grinberg b0f5b722db cc-4105: fixed typo.\nadded some error checking in case bad parameters are given to dispatchMetadataAction 2012-07-17 16:43:04 -04:00
Rudi Grinberg 98b4e3c47b cc-4105: Tweaked php method to have more consistent return values 2012-07-17 16:43:04 -04:00
Rudi Grinberg aa298453b7 cc-4105: removed useless comments 2012-07-17 16:43:04 -04:00
Rudi Grinberg eb00b5cbb3 cc-4105: renamed controller action and method to correct name 2012-07-17 16:43:04 -04:00
denise 0aae7c75ae CC-84: Smart Playlists 
- added shuffle button
- moved all callbacks into one function
 2012-07-17 15:32:26 -04:00
Martin Konecny 1bd07eeaca Merge branch '2.1.x' into devel 
Conflicts:
	airtime_mvc/application/models/ServiceRegister.php
 2012-07-17 15:00:53 -04:00
Martin Konecny eba4b688c4 User Patch: If a callback is not given, then just provide the raw JSON. 
Submitted by Ross Masters <ross@rossmasters.com>
 2012-07-17 14:47:13 -04:00
denise a8ca9accdb CC-84: Smart Playlists 
- added remove button to all rows unless only one row is enabled
- disabled playlist contents if type switches from static to dynamic
  and vice versa
 2012-07-17 14:40:52 -04:00
Vladimir 1e76845e9c more sophisticated remote_addr determining 2012-07-17 13:34:48 -04:00
James 7c07bf146c Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist 2012-07-17 11:07:38 -04:00
James a4ba776b0f CC-84: Smart Playlists 
- save playlist type to db
- on edit type is loaded
 2012-07-17 11:07:16 -04:00
denise e0a674a96c CC-84: Smart Playlists 
-added save button for static playlists
 2012-07-16 18:24:46 -04:00
Rudi Grinberg 20e32b98ba Merge branch 'devel' into mediamonitor2 
Conflicts:
	python_apps/api_clients/api_client.py
 2012-07-16 17:41:36 -04:00
Rudi Grinberg 1804531e84 removed comment 2012-07-16 17:19:11 -04:00
James fc09baacd7 CC-84: Smart Playlists 
- static playlist is done.
 2012-07-16 17:18:37 -04:00
Rudi Grinberg a1c205edff cc-4105: Removed wrong error handling from api_client. Split up controller action to make it reusable through other actions 2012-07-16 16:43:48 -04:00
Rudi Grinberg 1c084a3101 moved misplaced docstring 2012-07-16 15:47:44 -04:00
Rudi Grinberg d08b62dd39 cc-4105: removed dead code path 2012-07-16 15:25:45 -04:00
Rudi Grinberg 723e6356bc Merge branch 'mediamonitor2' of dev.sourcefabric.org:airtime into mediamonitor2 2012-07-16 14:58:34 -04:00
Rudi Grinberg a9f6bb3b5c cc-4105: changed error handling from returning none to throwing exception 2012-07-16 14:58:23 -04:00
denise 1bb97c8603 CC-84: Smart Playlists 
- ui clean-up
 2012-07-16 14:44:50 -04:00
Martin Konecny 4ebcb1b1f9 Merge branch '2.1.x' into devel 
Conflicts:
	airtime_mvc/application/controllers/ApiController.php
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/controllers/PlaylistController.php
	airtime_mvc/application/models/Playlist.php
	python_apps/media-monitor/airtimefilemonitor/airtimemediamonitorbootstrap.py
	python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py
 2012-07-16 14:31:03 -04:00
Martin Konecny 312f35ae48 CC-430: Audio normalization (Replaygain Support) 
-change default database value to null
 2012-07-16 12:10:42 -04:00
denise 2dae5f30f7 CC-84: Smart Playlists 
- code cleanup
- adds 'Add' button to last row, always
 2012-07-16 11:01:34 -04:00
Rudi Grinberg 3e24b71436 removed wrong comments 2012-07-16 10:31:00 -04:00
Martin Konecny ce1a63f47d CC-430: Audio normalization (Replaygain Support) 
-small bug fixes
 2012-07-15 22:55:52 -04:00
Martin Konecny 583695f98c CC-430: Audio normalization (Replaygain Support) 
-values are now written through to database
 2012-07-15 22:22:42 -04:00
Martin Konecny 39760f8494 CC-4090: Make code style PSR compliant 2012-07-15 22:22:07 -04:00
Martin Konecny 632f039977 CC-430: Audio normalization (Replaygain Support) 
-values are now written through to database
 2012-07-15 22:19:55 -04:00
Martin Konecny b4f1cc13c0 CC-430: Audio normalization (Replaygain Support) 
make code simpler (don't download database to file)
 2012-07-15 22:19:16 -04:00
Rudi Grinberg 71dc7d99b4 cc-4105: added a method in API client corresponding to chunked requests.\nAlso add prepared corresponding apicontroller method 2012-07-15 22:17:36 -04:00
Rudi Grinberg 44d91f7798 cc-4105: clean up url construction in api client 2012-07-15 22:17:36 -04:00
Rudi Grinberg 0fd6c4adbf fixed typo 2012-07-15 22:17:36 -04:00
Rudi Grinberg 9f1ec3c05c created a new controller action for chunked requests from media monitor 2012-07-15 22:16:58 -04:00
Martin Konecny 794cf2c845 CC-4090: Make code style PSR compliant 
-run psr-cs-fixer
 2012-07-15 21:17:13 -04:00
Martin Konecny 5661872034 checkAuth in init() function 2012-07-15 21:07:34 -04:00
Rudi Grinberg 8340079b95 cc-4105: added a method in API client corresponding to chunked requests.\nAlso add prepared corresponding apicontroller method 2012-07-13 17:57:18 -04:00
Rudi Grinberg 47893865cc cc-4105: clean up url construction in api client 2012-07-13 16:32:17 -04:00
James 601263b7a0 CC-84: Smart Playlists 
- adding propel files for playlistcriteria table
 2012-07-13 16:16:07 -04:00
James 46294c3f40 Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist 
Conflicts:
	airtime_mvc/application/forms/SmartPlaylistCriteria.php
 2012-07-13 16:00:02 -04:00
James ae9442d7f5 CC-84: Smart Playlists 
- editing playlist
 2012-07-13 15:58:23 -04:00
denise b48fb49947 CC-84: Smart Playlists 
-fixed add/remove behaviour
 2012-07-13 15:15:11 -04:00
Rudi Grinberg 3b708fae6a fixed typo 2012-07-13 14:54:04 -04:00
Rudi Grinberg a6d51bea8d created a new controller action for chunked requests from media monitor 2012-07-13 14:51:43 -04:00
denise 971b4cf7cf Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist 2012-07-13 14:32:31 -04:00
James bf46605ea1 CC-84: Smart Playlists 
- changing field name in backend
- diabled loading criteria on edit temporarly
 2012-07-13 14:32:05 -04:00
denise fcc4c1f9af CC-84: Smart Playlists 
-fixed merge conflict
 2012-07-13 14:26:17 -04:00
James 207582eb7e CC-84: Smart Playlists 
- temp commit
 2012-07-13 14:23:30 -04:00
Martin Konecny 8dcb1f8f3d CC-4101Calendar displays white on white for certain show names, making shows invisible 2012-07-13 10:28:50 -04:00
James 55fd4e5d50 Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist 2012-07-12 17:59:04 -04:00
James 3bce6b4999 CC-84: Smart Playlists 
- db inserting into cc_playlistcriteria
- error validations
 2012-07-12 17:58:44 -04:00
Martin Konecny f0f033b4fb CC-430: Audio normalization (Replaygain Support) 2012-07-12 17:58:29 -04:00
denise 7dc0229770 CC-84: Smart Playlists 
- error msgs were not deleting from a removed row
- fixed
 2012-07-12 17:33:40 -04:00
denise e7e4aa41dd Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist 2012-07-12 17:20:01 -04:00
denise d81253cccc CC-84: Smart Playlists 
- send playlist id on generate/save action
- fixed some small UI bugs
 2012-07-12 17:19:53 -04:00
Martin Konecny a8f4148373 Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist 2012-07-12 15:30:31 -04:00
James 64857410a6 Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist 2012-07-12 15:28:11 -04:00
James f0134ba3fa CC-84: Smart Playlists 
- validation on server side
- getting list of files from db which satisfies criteria
 2012-07-12 15:27:51 -04:00
denise 31bb07b4f0 CC-84: Smart Playlists 
- removed modifier array list from form and populate in javascript
- fixed remove functionality to handle the extra criteria value used
  for 'is in the range' modifier
- moved 'add' button to last row
 2012-07-12 13:02:02 -04:00
James 470fef80ba Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist 2012-07-12 12:05:51 -04:00
Martin Konecny 8f6d6058a2 CC-4100: Make number of shows displayed in widget customizable 
-removed Logging message
 2012-07-11 19:33:19 -04:00
Martin Konecny bd51b4db02 CC-4100: Make number of shows displayed in widget customizable 
-fixed
 2012-07-11 19:31:24 -04:00
denise e8a2f23856 CC-84: Smart Playlists 
- dynamically change modifier list depending on criteria type
- added extra text box for 'is in the range' modifier
 2012-07-11 18:53:28 -04:00
Martin Konecny 765a739b58 Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist 2012-07-11 17:10:08 -04:00
James 393495433f Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist 2012-07-11 16:17:22 -04:00
denise c27b886817 CC-84: Smart Playlists 
-0-indexed form elements
 2012-07-11 16:15:44 -04:00
James d52c079606 Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist 2012-07-11 16:14:59 -04:00
James 93b34bb079 CC-84: Smart Playlists 
- controller skeleton
- playlist model dummy functions
 2012-07-11 16:14:11 -04:00
denise 4842f1a5a1 CC-84: Smart Playlists 
-removed limit checkbox
 2012-07-11 15:52:46 -04:00
Martin Konecny ce755d409b cc-84: smart playlist 
-added new database table defs
 2012-07-11 15:48:11 -04:00
denise 7358b00c81 CC-84: Smart Playlists 
-disabled non-visible form elements
 2012-07-11 15:18:47 -04:00
denise 5fb0364f2d CC-84: Smart Playlists 
-switched action names for static/dynamic
 2012-07-11 11:57:13 -04:00
denise fe75ba0e93 Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist 2012-07-11 11:50:52 -04:00
denise 1afe1e4d32 CC-84: Smart Playlists 
-added in save/generate functionality in the UI
 2012-07-11 11:50:40 -04:00
Martin Konecny 646e028037 Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist 2012-07-11 10:47:14 -04:00
denise 4bed5e647e CC-84: Smart Playlists 
-moved smart_playlistbuilder.js into playlist folder
 2012-07-11 10:45:24 -04:00
denise a1ceb4bfa0 CC-84: Smart Playlists 
-added in 'Add' and 'Remove' form elements functionality on the UI
 2012-07-11 10:42:51 -04:00
denise b7cd90bc28 CC-84: Smart Playlists 
-created form and view script
 2012-07-11 10:42:51 -04:00
Martin Konecny 7ce4934cdc CC-4090: Make code style PSR compliant 
-removed all trailing whitespace in forms directory
-replace all tabs with 4 spaces
 2012-07-10 18:55:44 -04:00
Martin Konecny d9cde230cd CC-4090: Make code style PSR compliant 
-removed all trailing whitespace
 2012-07-10 18:53:06 -04:00
Martin Konecny ee3447f903 CC-4090: Make code style PSR compliant 
-User.php
-removed all trailing whitespace
 2012-07-10 18:51:32 -04:00
denise 4301a221b7 CC-84: Smart Playlists 
-added in 'Add' and 'Remove' form elements functionality on the UI
 2012-07-10 18:20:23 -04:00
James 24a90700a1 CC-4095: Media Library -> Playlist: dj user can delete the playlist owned by 
others on some situation.
 2012-07-10 17:24:57 -04:00
James f174a2bcf3 Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-07-10 17:09:46 -04:00
James 39506740eb CC-4095: Media Library -> Playlist: dj user can delete the playlist owned by 
others on some situation.

- fixed
 2012-07-10 17:09:21 -04:00
Martin Konecny f072be5d0e Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-07-10 16:41:48 -04:00
Martin Konecny 6d98cca9c3 SAAS-270: Apache2 errors on SaaS 
-no reason to pass $pl since it is not even used. Fixed
 2012-07-10 16:41:30 -04:00
denise 72dd48e33e CC-84: Smart Playlists 
-created form and view script
 2012-07-10 15:25:29 -04:00
James d90d83200e Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-07-10 15:12:27 -04:00
James 62b0fec595 CC-4095: Media Library -> Playlist: dj user can delete the playlist owned by 
others on some situation.

- fixed
 2012-07-10 15:11:59 -04:00
denise 69bbc53b98 CC-4037: Remove SaaS specific code from Airtime codebase 
-removed live chat popup
 2012-07-10 15:09:28 -04:00
denise 0171212e9b Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-07-10 13:19:19 -04:00
denise 81eb751c9f - shortened height on Add/Remove content dialog window 2012-07-10 13:19:03 -04:00
James 78acd4f805 CC-4093: Timeline -> Alert for deleting track(s) appears twice by clicking 
context menu

- fixed
 2012-07-10 13:08:36 -04:00
Martin Konecny 3d243468a7 CC-4090: Make code style PSR compliant 
Subjects.php
 2012-07-10 10:36:53 -04:00
Martin Konecny dc2b4fed0a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-07-10 10:19:35 -04:00
Martin Konecny 00a2a19833 CC-4090: Make code style PSR compliant 
Subjects.php
 2012-07-09 23:41:00 -04:00
Martin Konecny e91c96b90e CC-4090: Make code style PSR compliant 
StreamSetting.php
 2012-07-09 23:32:21 -04:00
denise 6369c85ed1 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-07-09 14:50:49 -04:00
denise c6c0a70152 CC-4075: Calendar -> Can create overlapping show by repeating show 
-fixed
 2012-07-09 14:50:35 -04:00
James c279e008d0 Merge branch '2.1.x' into devel 2012-07-06 15:52:09 -04:00
James 63856ea918 CC-4079: Apache error: missing $startDt variable 
- fixed
 2012-07-06 15:40:16 -04:00
denise e4fb42cbd0 CC-4027: In the Calendar view, please have a little play icon indicating the currently playing show. 
-done
 2012-07-06 15:26:51 -04:00
Martin Konecny 24349e64d8 CC-430: Audio normalization (Replaygain Support) 
-some minor fixes for default value (should be 0 dB not 1dB)
 2012-07-05 23:30:53 -04:00
Martin Konecny 5c1af49252 CC-430: Audio normalization (Replaygain Support) 
-Added support on Liquidsoap side
 2012-07-05 23:24:34 -04:00
Martin Konecny ce698d4123 CC-430: Audio normalization (Replaygain Support) 
-Added support on server side
 2012-07-05 22:37:40 -04:00
James 31f1d5879e CC-4076: Library: make doubleclick trigger adding files to playlist/timeline 
- done
 2012-07-05 18:24:07 -04:00
James f3fbaf89f5 CC-4076: Library: make doubleclick trigger adding files to playlist/timeline 
- done
 2012-07-05 18:23:34 -04:00
James 9bc1c66fe3 CC-2747: If the file contains '\' in its meta title, airtime doesn't 
detect duplicate

- fixed
- extra fix: there was also problem with web UI upload and it's fixed
see the comment on the ticket for more detail.
 2012-07-05 15:27:49 -04:00
denise 1cbb0345b3 improved error message for overlapping shows 2012-07-05 11:33:03 -04:00
denise 4441bf18b7 CC-4072: Improve the check overlapping shows function 
-done
 2012-07-05 11:24:49 -04:00
denise 771974433b CC-4071: Prevent shows from overlapping on drag and drop in calendar 
-done
 2012-07-05 11:01:48 -04:00
denise 1fa3da5bd0 CC-4069: Edit Show -> cannot edit show 
-fixed
 2012-07-04 18:58:22 -04:00
denise cbf026412c CC-4056: Add Show -> Prevent shows from overlapping 
-done
 2012-07-04 11:34:18 -04:00
denise bc93119adc Merge branch '2.1.x' into devel 2012-07-04 09:46:30 -04:00
denise 87afea63bf CC-4065: Timeline -> Cursor will disappear after a track is finished sometimes 
-fixed
 2012-07-03 18:22:48 -04:00
denise 598bf8942c Merge branch '2.1.x' into devel 2012-07-03 14:57:16 -04:00
denise 8a394f752b Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-07-03 14:52:53 -04:00
denise f6d79b1f54 CC-4063: Timeline -> Add a track to a show will cause another show's cursor to be selected 
-fixed
 2012-07-03 14:52:27 -04:00
james 4384c978b0 Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-07-03 13:33:26 -04:00
james 7342ea4d4b CC-4053: Widget not showing correct day on Sunday 
- fixed weekly widget
- also fixed today's show widget
 2012-07-03 13:17:48 -04:00
denise 2bf6d0e54e Merge branch '2.1.x' into devel 2012-07-03 12:57:25 -04:00
denise e11fe8a2b8 CC-4058: Timeline -> Cannot add song twice if last cursor is selected 
-fixed
 2012-07-03 12:42:53 -04:00
denise bc569462ee CC-4057: Calendar -> Add/Remove contents: Lost cursor after add contents to a show 
-fixed
 2012-07-03 11:48:57 -04:00
denise 3e75b28c9d Merge branch '2.1.x' into devel 
Conflicts:
	airtime_mvc/application/controllers/ApiController.php
 2012-07-03 10:42:29 -04:00
denise 46604fdf59 CC-4046: Timeline -> cannot drag and drog song into the posion between song's name and "show empty" 
-fixed
 2012-06-29 16:59:03 -04:00