Rudi Grinberg
|
93ff2ce9f6
|
removed extra import
|
2012-11-13 17:32:42 -05:00 |
|
Rudi Grinberg
|
6f42291f8a
|
merge api client conflict
|
2012-11-13 17:21:48 -05:00 |
|
Rudi Grinberg
|
350d5dd620
|
refactored logging setup when mm is setup
|
2012-11-10 09:24:26 -05:00 |
James
|
6145f9bcad
|
Merge branch '2.2.x' into devel
|
2012-11-08 17:28:23 -05:00 |
|
James
|
33b2520c14
|
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
|
2012-11-08 17:27:28 -05:00 |
|
James
|
628e6bed37
|
CC-4689: Live Stream: The 1st song of a show won't play if there is another show have live stream assigned and finished right before
- fixed
|
2012-11-08 17:26:55 -05:00 |
|
Rudi Grinberg
|
eaf0baa6b6
|
removed useless code
|
2012-11-07 23:22:25 -05:00 |
|
Rudi Grinberg
|
c222ac10f7
|
typo
|
2012-11-07 23:21:48 -05:00 |
|
Rudi Grinberg
|
55f0462946
|
removed useless line of code
|
2012-11-07 23:21:08 -05:00 |
|
Rudi Grinberg
|
ed00089a1a
|
added user level method to get current user of thread
|
2012-11-07 22:53:39 -05:00 |
|
Rudi Grinberg
|
7e5ec6505b
|
added tests for instance
|
2012-11-07 18:16:48 -05:00 |
|
Rudi Grinberg
|
13f59be21d
|
typo
|
2012-11-07 18:16:33 -05:00 |
|
Rudi Grinberg
|
9e7b8a6b28
|
added tests
|
2012-11-07 17:45:08 -05:00 |
|
Rudi Grinberg
|
882a515caa
|
refactored threads which know the user they belong to
|
2012-11-07 17:44:55 -05:00 |
|
James
|
7300b608cf
|
Merge branch 'cc-4661-listener-statistics' into devel
Conflicts:
python_apps/api_clients/api_client.py
|
2012-11-07 17:20:12 -05:00 |
|
Rudi Grinberg
|
debc5b6081
|
Merge remote-tracking branch 'sf/devel' into mm_refactor_for_saas
|
2012-11-07 12:19:35 -05:00 |
denise
|
073d243007
|
-airtime couldn't connect to liquidsoap
|
2012-11-07 12:18:10 -05:00 |
|
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 |
|
Martin Konecny
|
34d0ee5954
|
CC-4661: Listener Statistics
-add mount point names
|
2012-11-02 18:04:32 -04:00 |
|
Martin Konecny
|
5bd0fe0300
|
clean up source file tailing whitespace
|
2012-11-02 17:51:02 -04:00 |
|
Martin Konecny
|
6438b54a5f
|
CC-4661: Listener Statistics
-backend part working
|
2012-11-02 17:50:43 -04: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 |