Rudi Grinberg
|
dfc3cf9267
|
removed useless tests
|
2012-11-02 15:05:08 -04:00 |
Rudi Grinberg
|
c79b28aa90
|
Removed gevent from pybundle
|
2012-11-02 15:03:27 -04:00 |
Rudi Grinberg
|
899c62d31f
|
removed gevent from requirements
|
2012-11-02 15:01:11 -04:00 |
Rudi Grinberg
|
aec11feba5
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-11-02 14:59:02 -04:00 |
denise
|
ba1f6ed054
|
CC-4374: Nowplayling page: Cannot remove tracks from recording show
-fixed by disallowing dragging into recording shows
|
2012-11-02 13:24:47 -04:00 |
Rudi Grinberg
|
44e240741a
|
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
|
2012-11-02 12:45:01 -04:00 |
Rudi Grinberg
|
a1d5037e04
|
cc-4584: fixxxed
|
2012-11-02 12:42:24 -04:00 |
denise
|
135aadf16b
|
Merge branch '2.2.x' into devel
Conflicts:
airtime_mvc/application/controllers/LibraryController.php
airtime_mvc/application/views/scripts/library/library.phtml
airtime_mvc/public/js/airtime/showbuilder/builder.js
airtime_mvc/public/js/airtime/showbuilder/main_builder.js
|
2012-11-02 12:28:21 -04:00 |
denise
|
6267acc4b0
|
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
|
2012-11-02 11:59:54 -04:00 |
denise
|
715a21acb2
|
CC-4625: On tablet you cannot create a playlist, smart block or webstream
-upgraded bootstrap-dropdown.js to v2.2.1
|
2012-11-02 11:59:36 -04:00 |
Rudi Grinberg
|
e9524c8615
|
Merge remote-tracking branch 'rudi/cc-4652' into 2.2.x
|
2012-11-02 11:30:04 -04:00 |
Rudi Grinberg
|
466b647b59
|
Merge remote-tracking branch 'rudi/cc-4630' into 2.2.x
|
2012-11-02 11:29:22 -04:00 |
denise
|
a937df30ad
|
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
|
2012-11-02 10:48:16 -04:00 |
denise
|
cc208da2fb
|
CC-4536: Smart block criteria use AND logic, but additional modifiers use OR logic, without labels to show the difference
-added labels
|
2012-11-02 10:48:08 -04:00 |
James
|
feb6c9d6f5
|
CC-4636: Exception happens when trying to remove user that have created some smart block
- doing delete cascade on cc_block on deleting users
|
2012-11-01 17:45:28 -04:00 |
James
|
b746f65304
|
CC-4601: Do not rewrite metadata for master source and show source streams.
- fixed
|
2012-11-01 17:24:41 -04:00 |
Rudi Grinberg
|
6bcadd7ed6
|
cc-4630: Added permission set on permission folder before watching it
|
2012-11-01 17:01:32 -04:00 |
James
|
575400b4c2
|
CC-4623: Library: Preview button for Flac does not work
- fixed
|
2012-11-01 16:44:37 -04:00 |
Rudi Grinberg
|
5933cc3306
|
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into cc-4652
|
2012-11-01 16:19:22 -04:00 |
Rudi Grinberg
|
bf363dcdde
|
cc-4652: Added code to create the stor/ structure before adding any watched
|
2012-11-01 15:48:26 -04:00 |
Rudi Grinberg
|
176f2c45ba
|
Added information message when media monitor is restarted
|
2012-11-01 15:42:58 -04:00 |
James
|
d7a5ab4d94
|
CC-4622: Library: AAC file can be preview but is blocked from playlist and content menu
- fixed
|
2012-11-01 15:21:56 -04:00 |
Rudi Grinberg
|
c0dc38be62
|
cc-4652: added logging for when watch fails on startup
|
2012-11-01 15:16:23 -04:00 |
denise
|
5b14c4fe88
|
CC-4656: Library -> No error message when a dj tries to delete smart blocks and webstreams they do not own
-fixed
|
2012-10-31 17:19:27 -04:00 |
denise
|
0999b28b2d
|
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
|
2012-10-31 16:51:41 -04:00 |
denise
|
2507e0f8a4
|
CC-4655: DJ's can delete files that they do not own
-fixed
|
2012-10-31 16:51:29 -04:00 |
Martin Konecny
|
1472eb5e51
|
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
|
2012-10-31 16:39:03 -04:00 |
Martin Konecny
|
766a17bc2b
|
CC-4657: Don't use deb-multimedia.org for package liblame
|
2012-10-31 16:38:53 -04:00 |
denise
|
fc613aa597
|
CC-4604: Edit Metadata: DJ's cannot edit metadata on their own files
-fixed
|
2012-10-31 16:01:17 -04:00 |
denise
|
dfd52eedf1
|
CC-4654: Library -> Simple search still has effects even if you are doing an advanced search
-fixed
|
2012-10-31 15:24:50 -04:00 |
denise
|
cc40dfdf4e
|
CC-4641: Now Playing: Extending show's length won't change the overbooked track's style
-added comment
|
2012-10-31 14:16:16 -04:00 |
Rudi Grinberg
|
7c710fd84e
|
Removed unused method
|
2012-10-31 12:48:11 -04:00 |
Rudi Grinberg
|
11043d2eba
|
Refactored notify_webstream_data
|
2012-10-31 12:46:51 -04:00 |
denise
|
71be2b2bd1
|
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
|
2012-10-31 12:36:56 -04:00 |
denise
|
fd0e1c3c95
|
CC-4641: Now Playing: Extending show's length won't change the overbooked track's style
-fixed
|
2012-10-31 12:36:45 -04:00 |
james
|
2e4d5ec142
|
CC-4539: Advanced search: Sample rate searched on Hz, but search results
shown in kHz
- fixed
|
2012-10-31 12:32:40 -04:00 |
Rudi Grinberg
|
83211698a4
|
Added retrying mechanism to ApiRequest
|
2012-10-31 12:20:00 -04:00 |
james
|
9293a26738
|
CC-4639: Give an option to allow smart blocks to reuse tracks if not enough
tracks meet the time limit
- code optimazation
|
2012-10-31 12:05:17 -04:00 |
Rudi Grinberg
|
4ef38cbc91
|
Added retry mechanism
|
2012-10-31 11:45:22 -04:00 |
Rudi Grinberg
|
474f5aba48
|
Added hack for the response type not being set
|
2012-10-31 11:33:42 -04:00 |
Rudi Grinberg
|
18d6cd7868
|
removed commented code
|
2012-10-31 11:22:04 -04:00 |
Rudi Grinberg
|
cf27c18df7
|
Refactored update_replay_gain_values
|
2012-10-31 11:01:24 -04:00 |
Rudi Grinberg
|
e3914c429d
|
refactored get_stream_setting
|
2012-10-31 10:56:52 -04:00 |
Rudi Grinberg
|
82a8fe99ae
|
Refactored docstring
|
2012-10-31 10:54:02 -04:00 |
Rudi Grinberg
|
162028ee8a
|
Unused method removed
|
2012-10-31 10:52:14 -04:00 |
Rudi Grinberg
|
24088d63e0
|
Formatting
|
2012-10-31 10:48:14 -04:00 |
Rudi Grinberg
|
8e6f6b8894
|
formatted comment. added TODO
|
2012-10-31 10:48:03 -04:00 |
Rudi Grinberg
|
09c3e3a694
|
Refactored get_schedule not to suck
|
2012-10-31 10:47:08 -04:00 |
Rudi Grinberg
|
9cea6210bb
|
refactored __get_airtime_version
|
2012-10-31 10:45:36 -04:00 |
Rudi Grinberg
|
91ce35ee9a
|
added todo
|
2012-10-31 10:43:59 -04:00 |