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

1970 Commits

Author SHA1 Message Date
denise 5a63a284c8 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-09 18:24:32 -04:00
denise 10ea825536 CC-4201: Playlist Builder -> Smart Playlist: DJ user can edit SP created by others in particular situation 
-fixed
 2012-08-09 18:24:22 -04:00
Martin Konecny 200eec37f6 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-09 18:15:03 -04:00
Martin Konecny 65cb34db4a CC-1665: Scheduled stream rebroadcasting and recording 
-webstream preview on show builder working
 2012-08-09 18:14:53 -04:00
denise 321e6c6524 CC-4197: Media Library -> Regular Playlist: Some character get cut off in context view 
-fixed
 2012-08-09 17:55:08 -04:00
James 63a51081c1 CC-4182: Media Library -> Smart Playlist: Empty box appears after left clicking a Dynamic Smart Playlist created by other users, when login as DJ 
- fixed
 2012-08-09 17:50:43 -04:00
denise 00a484d595 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-09 17:43:22 -04:00
denise 23683ccccb Smart Playlists: changed positioning of error message on click 'Save' 2012-08-09 17:43:12 -04:00
Martin Konecny bc72a6743b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-09 17:42:32 -04:00
Martin Konecny 4129900858 CC-1665: Scheduled stream rebroadcasting and recording 
-step 1 of getting stream preview on show builder working
 2012-08-09 17:42:25 -04:00
denise f75cf5ffe2 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-09 17:24:00 -04:00
denise e674654cb1 CC-4192: Smart Playlist Builder: make save button save title, description, and criteria 
-done
 2012-08-09 17:23:52 -04:00
James 618813ebc1 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-09 16:59:33 -04:00
James 6c721cd68d CC-4184: Playlist Builder : Error alert for trying to add Web Stream to Smart Playlist 
- fixed
- extra fix: context menu for webstream
 2012-08-09 16:59:18 -04:00
Martin Konecny c73328e297 CC-1665: Scheduled stream rebroadcasting and recording 
-ability to preview webstreams inside of playlists
 2012-08-09 16:49:20 -04:00
Martin Konecny 952f18dc3c Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-09 14:39:42 -04:00
Martin Konecny b53bc36f4f CC-1665: Scheduled stream rebroadcasting and recording 
-ability to preview webstreams
 2012-08-09 14:39:31 -04:00
James 1367bde728 CC-4185: Playlist Builder -> Smart Playlist: Able to create Smart Playlist more than 24 hours 
- fixed
 2012-08-09 14:18:15 -04:00
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 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 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
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 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 47ae223a1c CC-1665: Scheduled stream rebroadcasting and recording 
-fix SQL error
 2012-08-07 19:23:42 -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 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
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
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 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
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 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 b83be1a922 CC-1665: Scheduled stream rebroadcasting and recording 
-fix incorrectly named column
 2012-07-31 11:00:01 -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
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