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
|
dcfa865f7d
|
cc-3936:
Ran propel-gen to commit schema changes.
|
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
|
d06fda0329
|
fix indentation
|
2012-08-23 21:43:55 -04:00 |
denise
|
0a851f3c96
|
CC-4263: Calendar: Can create one show contains another show (overlapping)
-fixed
|
2012-08-23 17:41:05 -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
|
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
|
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 |
|
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 |
|
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 |
|
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
|
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
|
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
|
51ebae3de9
|
Make sure we are using the Library controller for the Library page
|
2012-08-21 11:12:33 -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
|
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
|
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
|
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
|
0d21d9a9af
|
Smart Playlists: code cleanup
|
2012-08-16 15:40:36 -04:00 |
|
denise
|
ae0d5d8598
|
CC-4238: Playlists: Fade in/out is in wrong format
-added comment
|
2012-08-16 14:45:51 -04:00 |