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

2588 Commits

Author SHA1 Message Date
denise 82f2b2e7c3 CC-4249: Playlist: Playlist's length doesn't update if it contains a smart playlist which the length is changed 
-fixed
 2012-08-24 11:12:31 -04:00
Rudi Grinberg 4efdf71aea cc-3936: Made phpName of foreign key conform to Fk prefix convention. 2012-08-24 11:10:05 -04:00
Rudi Grinberg 857be6b702 cc-3936: Removed manual path concatenation. Fixed setting owner of file. 2012-08-24 11:09:38 -04:00
denise 1f7a6fdc63 CC-4262: Smart Block: Characters do not get escaped properly 
-fixed
 2012-08-24 10:29:28 -04:00
Rudi Grinberg 19a5a8f992 cc-3936: fixed wrong argument order bug. 2012-08-24 10:20:59 -04:00
Rudi Grinberg 4ad983f63c cc-3936: applied schema changes 2012-08-24 10:20:59 -04:00
Rudi Grinberg c83fad2546 cc-3936: added owner to every file insert 2012-08-24 10:20:59 -04:00
Rudi Grinberg 60803e5146 cc-3936: 
Name of foreign key was given for easier access through propel. Also renamed phpName for ownerId
to fit the existing convention.
 2012-08-24 10:20:59 -04:00
Rudi Grinberg b0a61fc291 cc-3936: Added setting default owner_id for inserted files. 2012-08-24 10:20:59 -04:00
Rudi Grinberg 43ca0d21e6 cc-3936: removed unnecessary object creation 2012-08-24 10:20:59 -04:00
Rudi Grinberg dcc9c58577 cc-3936: Sexified equal signs. 2012-08-24 10:20:59 -04:00
Rudi Grinberg 50de229258 cc-3936: 
Refactored getUsers not to take multiple types of arguments.
 2012-08-24 10:20:59 -04:00
Rudi Grinberg 996dcfd35f cc-3936: Ran propgen to generate schema changes 2012-08-24 10:20:59 -04:00
Rudi Grinberg e2d9f220f8 cc-3936: 
Changed schema so that owner_id is not required for every file.
 2012-08-24 10:20:59 -04:00
Rudi Grinberg 36b344a910 cc-3936: remove unneeded garbage. 2012-08-24 10:20:59 -04:00
Rudi Grinberg dcfa865f7d cc-3936: 
Ran propel-gen to commit schema changes.
 2012-08-24 10:20:58 -04:00
Rudi Grinberg 4f88543de2 cc-3936: 
Updated schema so that every file has an owner.
 2012-08-24 10:20:58 -04:00
Rudi Grinberg f940c20701 cc-3936: 
Added success logging when identifier file has been written.
 2012-08-24 10:20:58 -04:00
Rudi Grinberg 23e3f6137d cc-3936: 
Sexified code. Added section for user handling.
 2012-08-24 10:20:58 -04:00
Martin Konecny 9893282e43 CC-4275: Enable debug mode where all Propel queries are displayed in raw SQL 
-add enablePropelLogging and disablePropelLogging functions
 2012-08-23 22:27:24 -04:00
Martin Konecny 7cbe037c7e Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-23 21:58:39 -04:00
Martin Konecny 628bb6de1f CC-4275: Enable debug mode where all Propel queries are displayed in raw SQL 
-done
 2012-08-23 21:58:21 -04:00
Martin Konecny d06fda0329 fix indentation 2012-08-23 21:43:55 -04:00
denise 17d030a3f9 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-23 17:41:20 -04:00
denise 0a851f3c96 CC-4263: Calendar: Can create one show contains another show (overlapping) 
-fixed
 2012-08-23 17:41:05 -04:00
Martin Konecny a9cf597f14 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-23 15:04:38 -04:00
Martin Konecny ea58ae9cc8 -remove unecessary logging 2012-08-23 15:03:59 -04:00
denise 9dfbd90e0f CC-4270: Media Library: Sample Rate is broken to 2 lines in context view 
-fixed
 2012-08-23 13:50:46 -04:00
denise 2f9ea4dc0b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-23 11:53:56 -04:00
denise bf69f23343 CC-4249: Playlist: Playlist's length doesn't update if it contains a smart playlist which the length is changed 
-fixed
 2012-08-23 11:53:44 -04:00
James a94039a0c6 CC-4268: Playlist: No "preview" button if a track of the playlist does not exist any more 
- fixed
 2012-08-23 11:32:37 -04:00
James a4c579f36e CC-4254: Library: advanced search on library 
- bug fix
 2012-08-23 10:59:34 -04:00
James c2d475e6d8 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 
Conflicts:
	airtime_mvc/application/controllers/PlaylistController.php
 2012-08-23 10:43:28 -04:00
James de0aeee594 CC-4254: Library: advanced search on library 
- initial commit
 2012-08-23 10:41:40 -04:00
denise 38173bd3a2 - small fix 2012-08-23 10:19:00 -04:00
denise e987f7a0aa Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-22 16:29:53 -04:00
denise f47e32d9de CC-4266: Smart Block: Bit rate with 'is in the range' modifier -> 2nd range value doesn't get multiplied by 1000 
-fixed
 2012-08-22 16:29:17 -04:00
Rudi Grinberg a3b6d0259c Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-22 16:09:14 -04:00
Rudi Grinberg e7689e5355 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-22 16:09:03 -04:00
Martin Konecny b506c37341 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-22 16:08:58 -04:00
Martin Konecny 442c156458 CC-1665: Scheduled stream rebroadcasting and recording 
-fixed context menu for webstreams
 2012-08-22 16:08:51 -04:00
Rudi Grinberg d1e7341046 cc-3936: Refactored php code to upload files 2012-08-22 16:08:46 -04:00
denise 6fec9b0301 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-22 16:02:02 -04:00
denise 7e50a11195 CC-4225: Smart playlists: Sample and bit rate ranges should include entered values 
-fixed
 2012-08-22 16:01:50 -04:00
Martin Konecny fe1aa7a169 CC-1665: Scheduled stream rebroadcasting and recording 
-fixed syntax error
 2012-08-22 15:56:18 -04:00
Martin Konecny 8573dcb870 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-22 15:35:09 -04:00
Martin Konecny 91f13a6279 CC-1665: Scheduled stream rebroadcasting and recording 
-current Library session object should not be stored as a property of the Controller class.
-fixed
 2012-08-22 15:34:59 -04:00
denise 9b3890ad19 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-22 15:22:13 -04:00
denise 0071caf94d CC-4080: Calendar -> Cannot create show because there was a repeating show at same time before 
-fixed
 2012-08-22 15:22:01 -04:00
Rudi Grinberg 6a16cf0084 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-22 14:39:45 -04:00
Rudi Grinberg e9bc0074c0 cleaned up ApiController.php a little bit. 2012-08-22 14:38:48 -04:00
denise ef5427d0bc CC-4197: Media Library -> Regular Playlist: Some character get cut off in context view 
-fixed
 2012-08-22 14:18:48 -04:00
Martin Konecny c8c257a330 CC-1665: Scheduled stream rebroadcasting and recording 
-change behaviour so that the webstream is not saved as soon as it it created.
 2012-08-22 14:04:01 -04:00
Martin Konecny 24988616b3 CC-1665: Scheduled stream rebroadcasting and recording 
-current Library session object should not be stored as a property of the Controller class.
-fixed
 2012-08-22 14:03:11 -04:00
Martin Konecny cef3ffb07b CC-4265: Keep track of how much memory each request is taking and log if over a threshold 
-fixed
 2012-08-22 14:01:44 -04:00
Martin Konecny ea4567f373 Make user functions work more consistently 
isHost didn't work similar to isPM or isAdmin
 2012-08-22 13:59:37 -04:00
denise 462e73d93b CC-4245: Playlists: Can only rearrange, by dragging and dropping, tracks once 
-fixed
 2012-08-22 13:58:13 -04:00
Martin Konecny 9885374d34 CC-1665: Scheduled stream rebroadcasting and recording 
-more work to make webstreams behave like playlist creator
 2012-08-21 18:55:38 -04:00
Martin Konecny 462542bf68 change Logging::log to Logging::info 2012-08-21 18:41:56 -04:00
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