Commit Graph

1520 Commits

Author SHA1 Message Date
Rudi Grinberg cd6c305b81 Merge remote-tracking branch 'sf/devel' into mm_refactor_for_saas 2012-11-07 12:05:37 -05:00
denise 4200059200 -airtime_version fix 2012-11-07 11:43:49 -05:00
Rudi Grinberg 110008e909 added saas shit 2012-11-07 11:29:39 -05:00
Rudi Grinberg af51ddca79 Merge remote-tracking branch 'sf/devel' into mm_refactor_for_saas 2012-11-07 11:29:17 -05:00
denise b817684972 Merge branch '2.2.x' into devel
Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
	airtime_mvc/application/models/StoredFile.php
	airtime_mvc/public/js/bootstrap/bootstrap.js
2012-11-07 11:21:36 -05:00
Rudi Grinberg b3c9472bcb cc-4672: added dirty workaround to fix this issue 2012-11-06 16:16:37 -05:00
Rudi Grinberg 1762e418c0 added better logging 2012-11-06 14:57:53 -05:00
Rudi Grinberg b4555e9845 docstring formatting 2012-11-06 13:51:04 -05:00
Rudi Grinberg 66138c4baf removed references to gevent 2012-11-05 16:11:35 -05:00
Rudi Grinberg 6392c69e27 Removed unused code 2012-11-05 16:10:59 -05:00
Rudi Grinberg a851d8dd74 docstring format 2012-11-05 16:04:39 -05:00
Rudi Grinberg 83d4705bca removed useless comments 2012-11-05 14:19:37 -05:00
Rudi Grinberg 3509cfc212 formatting 2012-11-05 14:03:46 -05:00
Rudi Grinberg c287e11bee moved setting up unicde into it's own routine 2012-11-05 14:02:55 -05:00
Rudi Grinberg ce313a5b22 docstring formatting 2012-11-05 13:29:10 -05:00
Martin Konecny f6ee2afb88 CC-4665: ReplayGain does not work for FLAC files
-fixed
2012-11-05 12:03:25 -05:00
Martin Konecny fffaf7788a Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-11-05 11:53:52 -05:00
Martin Konecny af7e94a44d don't break 80 character line limit 2012-11-05 11:53:37 -05:00
Martin Konecny d89166e2ff CC-4665: ReplayGain does not work for FLAC files
-fixed
2012-11-05 11:53:20 -05:00
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
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
Rudi Grinberg e9524c8615 Merge remote-tracking branch 'rudi/cc-4652' into 2.2.x 2012-11-02 11:30:04 -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 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
Rudi Grinberg c0dc38be62 cc-4652: added logging for when watch fails on startup 2012-11-01 15:16:23 -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
Rudi Grinberg 83211698a4 Added retrying mechanism to ApiRequest 2012-10-31 12:20:00 -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
Rudi Grinberg 75ce5b205d Fixed setup_media_monitor 2012-10-30 17:48:24 -04:00
Rudi Grinberg 3ed762bc38 check_live_stream_auth fixed 2012-10-30 17:47:09 -04:00
Rudi Grinberg 4ad1468313 refactored get_shows_to_record 2012-10-30 17:45:22 -04:00
Rudi Grinberg d6f644d53f Removed unused method 2012-10-30 17:44:27 -04:00
Rudi Grinberg e85996d814 Removed unused method 2012-10-30 17:43:11 -04:00