Commit graph

2569 commits

Author SHA1 Message Date
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