Commit graph

8585 commits

Author SHA1 Message Date
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
d12b1645fd MM2: Fixed bug where mm would choke on songs without MDATA_KEY_CREATOR when trying to decide if they
are recorded or not.
2012-08-22 14:39:25 -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
32069e7351 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-22 13:58:20 -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
Rudi Grinberg
8e8f1b9a58 removed a usless check. added the project's first type annotations 2012-08-22 12:24:41 -04:00
Rudi Grinberg
37b7ec3e14 updated sql to upgrade airtime version 2012-08-22 12:12:49 -04:00
Rudi Grinberg
6d5b691795 Added config files for 2.2.0 upgrade. 2012-08-22 11:44:50 -04:00
Rudi Grinberg
22eea4e432 -fixed wrong copying in upgrade skip (see comment in code)
-improved config copying procedure. more general, better error reporting.
2012-08-22 11:43:32 -04:00
Rudi Grinberg
94df848358 MM2: removed shit comments. 2012-08-22 11:42:30 -04:00
Rudi Grinberg
bf3176c8dd Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-22 10:39:42 -04:00
Rudi Grinberg
73e52adee1 Upgraded version number to 2.2.0 2012-08-22 10:39:26 -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
Rudi Grinberg
c9afe4fa47 mm2: sexified tests 2012-08-21 17:30:05 -04:00
Rudi Grinberg
e918a56aea MM2: corrected unit tests 2012-08-21 17:23:51 -04:00
Rudi Grinberg
e02d927402 mm2: removed useless print statement 2012-08-21 17:17:20 -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
Rudi Grinberg
3df9935f37 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-21 16:39:56 -04:00
Rudi Grinberg
3871540e62 big code reformatting in pypo 2012-08-21 16:39:37 -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
Rudi Grinberg
9c046feffe Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-21 15:56:19 -04:00
Rudi Grinberg
8a0774d298 cc-4240: Added more tracebacks 2012-08-21 15:56:08 -04:00
denise
db0f6260c7 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-21 15:42:54 -04:00
denise
2cdaa186e3 CC-4257: Smart Block: Admin cannot delete DJ user's block
-fixed
2012-08-21 15:42:44 -04:00
Rudi Grinberg
36c3bf5763 cc-4240: added recorder stacktrace print 2012-08-21 15:12:45 -04:00
Rudi Grinberg
e539808586 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-21 14:24:35 -04:00
Rudi Grinberg
1090226fc3 cc-4255: registered component so that status works 2012-08-21 14:24:25 -04:00