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

2479 Commits

Author SHA1 Message Date
Martin Konecny 15eae0698b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-21 16:55:17 -04:00
Martin Konecny 9b7413dafa CC-1665: Scheduled stream rebroadcasting and recording 
-use sessions to determine currently open object in Library
-forgot to check in these files
 2012-08-21 16:55:10 -04:00
Martin Konecny ecfc27431a CC-1665: Scheduled stream rebroadcasting and recording 
-verify user that is deleting has current permissions
 2012-08-21 16:54:41 -04:00
Martin Konecny a1b91aebbd CC-1665: Scheduled stream rebroadcasting and recording 
-use sessions to determine currently open object in Library
 2012-08-21 16:54:14 -04:00
denise 316afaf2a1 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-21 16:37:41 -04:00
denise ffbdba6f6b CC-4260: Add-user: Undefined index: ftype 
-fixed
 2012-08-21 16:37:33 -04:00
Rudi Grinberg 64a36ea21a cc-4240: fixed 2012-08-21 16:33:37 -04:00
denise 2cdaa186e3 CC-4257: Smart Block: Admin cannot delete DJ user's block 
-fixed
 2012-08-21 15:42:44 -04:00
denise d06f02f1f5 CC-4244: Playlist Builder: Original Length should not be changed after setting Cue in/out value 
-fixed
 2012-08-21 14:08:30 -04:00
denise 167881c903 CC-4253: Smart Playlist: Please support filter tracks by date 
-code refactor
 2012-08-21 12:01:48 -04:00
denise d23bd2d85b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-21 11:58:46 -04:00
denise 0c381d4692 CC-4253: Smart Playlist: Please support filter tracks by date 
-fixed
 2012-08-21 11:58:39 -04:00
Martin Konecny 0ce4c1000b replace tabs with spaces 
-also remove \r characters
 2012-08-21 11:16:07 -04:00
Martin Konecny 51ebae3de9 Make sure we are using the Library controller for the Library page 2012-08-21 11:12:33 -04:00
Martin Konecny d2eca0faaf Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-21 10:50:33 -04:00
Martin Konecny 47852bce2a indentation fixes 2012-08-21 10:50:24 -04:00
Martin Konecny 179aa3d739 CC-1665: Scheduled stream rebroadcasting and recording 
-Show meaningful page after webstream is deleted
 2012-08-21 10:50:18 -04:00
denise 025656be1c CC-4205: Smart Playlist Builder: Change text on button mouseovers 
-changed generate success msg
 2012-08-21 10:46:25 -04:00
denise c60198722d Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-21 10:42:37 -04:00
denise 4cd5dbb926 CC-4205: Smart Playlist Builder: Change text on button mouseovers 
-changed save button text
 2012-08-21 10:42:10 -04:00
Martin Konecny cba717dc4b CC-1665: Scheduled stream rebroadcasting and recording 
-Fixed regressions introduced by changing HTML element id
 2012-08-21 10:33:36 -04:00
Martin Konecny 337e5fec8a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-20 18:36:32 -04:00
Martin Konecny 3230f14231 CC-1665: Scheduled stream rebroadcasting and recording 
-Fixed delete button on right side of library screen not working
 2012-08-20 18:35:10 -04:00
Martin Konecny d517bf6e19 fix indentation and remove \r characters 2012-08-20 18:29:57 -04:00
James 734be21269 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-20 17:18:00 -04:00
James a24da9e324 CC-4256: Smart Playlist: change name to smart block and etc 
- done
 2012-08-20 17:17:48 -04:00
Martin Konecny 4d8dc01638 don't crash js if a backend service is not running 2012-08-20 17:09:59 -04:00
Martin Konecny f3f9ef80ff CC-4119: zendphp.log is not rotated 
-fixed
 2012-08-20 16:05:25 -04:00
Martin Konecny f6a4732e87 CC-4119: zendphp.log is not rotated 
-fixed
 2012-08-20 15:54:10 -04:00
Martin Konecny 69f150ac7f more detailed error message 2012-08-20 14:41:43 -04:00
Martin Konecny 398fbb04db CC-1665: Scheduled stream rebroadcasting and recording 
-don't show delete button until a stream has been saved
 2012-08-17 17:29:17 -04:00
Martin Konecny 284b028521 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-17 16:51:45 -04:00
Martin Konecny 4216440670 CC-1665: Scheduled stream rebroadcasting and recording 
-previewing streams have NaN:NaN:NaN as length
 2012-08-17 16:51:23 -04:00
denise 76833344d6 CC-4250: Smart Playlists: Remove save button from form 
-done
 2012-08-17 16:24:11 -04:00
denise 817fe13533 CC-4248: Playlist Builder: 'Something went wrong' error message when dragging playlist into playlist 
-fixed
 2012-08-17 15:56:16 -04:00
denise 764316a36c CC-4247: Smart Playlist: Lost modifier when delete one from multiple modifiers 
-fixed
 2012-08-17 15:30:30 -04:00
denise 854e3ec75e Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-17 15:11:52 -04:00
denise 92408612f6 CC-4246: Smart Playlist: Click shuffle button will shuffle the contents multiple times 
-fixed
 2012-08-17 15:11:43 -04:00
Martin Konecny 99437147dc Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-17 15:08:10 -04:00
Martin Konecny 2a1ea33362 CC-1665: Scheduled stream rebroadcasting and recording 
-store Liquidsoap metadata in cc_schedule instead of cc_webstream
 2012-08-17 15:07:58 -04:00
denise 36a080ac13 CC-4243: Playlist Builder: Remove main fade block if there are no fades to set 
-fixed
 2012-08-17 14:30:46 -04:00
denise 3e879f390a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-17 12:56:52 -04:00
denise e2fe6d4284 CC-4243: Playlist Builder: Remove main fade block if there are no fades to set 
-fixed
 2012-08-17 12:56:45 -04:00
Rudi Grinberg 5b134d0055 cc-4228: fixed this ticket by stomping out bugs in eventcontractor and tweaking ApiController 2012-08-17 12:37:58 -04:00
James c1cc1c8fba CC-4184: Playlist Builder : Error alert for trying to add Web Stream to Smart Playlist 
- fixed
 2012-08-17 10:55:42 -04:00
denise 1e1398739f Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-16 18:17:54 -04:00
denise e57885c934 CC-4191: Password Reset: Reset link should be updated after default port is changed 
-done
 2012-08-16 18:17:43 -04:00
Martin Konecny 0cbd6165c4 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-16 17:49:23 -04:00
Martin Konecny e511f7cd37 CC-1665: Scheduled stream rebroadcasting and recording 
-fixed clicking save multiple times creates multiple smart playlists
 2012-08-16 17:49:07 -04:00
denise 6b841a0fc4 CC-4239: Playlist: need to improve error msg "Something went wrong" 
-fixed
 2012-08-16 17:11:48 -04:00