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 |
|
denise
|
f52cb81c64
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-08-21 14:08:36 -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 |
|
Rudi Grinberg
|
12e4585410
|
MM2: formatted some code
|
2012-08-21 14:07:26 -04:00 |
|
Rudi Grinberg
|
e15d345b4f
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-08-21 12:50:42 -04:00 |
|
Rudi Grinberg
|
8dc4bcb7d3
|
cc-4241: fixed this bug. and maybe 4232 too.
|
2012-08-21 12:50:29 -04:00 |
|
Rudi Grinberg
|
01060f560c
|
cc-4241: corrected unit test.
|
2012-08-21 12:49:57 -04:00 |
|
Rudi Grinberg
|
bbf5a86415
|
MM2: refactoring of metadata handling
|
2012-08-21 12:34:29 -04:00 |
|
Martin Konecny
|
20cfd01f80
|
CC-1665: Scheduled stream rebroadcasting and recording
-ls_script cleanup
|
2012-08-21 12:20:15 -04:00 |
|
Martin Konecny
|
f0336633ce
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-08-21 12:07:29 -04:00 |
|
Martin Konecny
|
656e5eb429
|
Merge branch '2.1.x' into devel
Conflicts:
python_apps/pypo/install/pypo-initialize.py
|
2012-08-21 12:07:21 -04:00 |
|
Martin Konecny
|
2a497bf941
|
remove symlink, not actual binary
|
2012-08-21 12:06:07 -04:00 |
|
denise
|
167881c903
|
CC-4253: Smart Playlist: Please support filter tracks by date
-code refactor
|
2012-08-21 12:01:48 -04:00 |
|
Rudi Grinberg
|
142eb6b66e
|
cc-4241:
Updated tests to test for this bug automatically.
|
2012-08-21 11:59:29 -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 |
|
Rudi Grinberg
|
bb1e67a83c
|
small refactoring of to os.path.join instead of manual path concatenation.
|
2012-08-21 10:46:48 -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 |
|
Rudi Grinberg
|
6d0d0eada9
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-08-21 10:43:04 -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 |
|
Rudi Grinberg
|
93d21b510c
|
MM2:
Fixed wrong use of split (misunderstanding of the maxsplit optional argument)
|
2012-08-20 18:01:42 -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
|
4f7c8bf0db
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-08-20 16:54:10 -04:00 |