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 |
|
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
|
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
|
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
|
a24da9e324
|
CC-4256: Smart Playlist: change name to smart block and etc
- done
|
2012-08-20 17:17:48 -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 |
|