Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
10450 commits 3 branches 0 tags 405 MiB
Commit graph

1655 commits

Author SHA1 Message Date
Rudi Grinberg
7ed1f08e07 Added new launch script for mm. 2012-11-15 12:10:52 -05:00
Rudi Grinberg
ce4dbf0028 added launcher that should replace most of mm2.py 2012-11-14 22:06:09 -05:00
Rudi Grinberg
dd139e5028 added default value for exception class parameter 2012-11-14 16:50:34 -05:00
Rudi Grinberg
fcfa5cceee removed useless comment 2012-11-14 14:49:28 -05:00
Rudi Grinberg
2e59eca131 moved files to pypo dir 2012-11-14 14:43:33 -05:00
Rudi Grinberg
d5cacf4011 moved replay gain to pypo for better saas performance 2012-11-14 14:43:10 -05:00
Rudi Grinberg
f1effc37a9 removed dependency of mm from replaygain 2012-11-14 11:51:00 -05:00
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
Martin Konecny
dfede98b82 Merge branch '2.2.x-saas' of dev.sourcefabric.org:airtime into 2.2.x-saas 
Conflicts:
	airtime_mvc/application/models/Schedule.php
 2012-11-12 17:46:22 -05:00
Martin Konecny
a0a9fc71f1 disable unlimited attempts for pushing stats data 2012-11-12 17:44:26 -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
f657ee4f20 Merge branch '2.2.x' into 2.2.x-saas 2012-11-08 17:27:51 -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
Martin Konecny
ed7aba83bf Merge branch 'cc-4661-listener-statistics' into 2.2.x-saas 2012-11-07 17:22:36 -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
Martin Konecny
bb8f5e107c CC-4661: Listener Statistics 
-ability to gather stats without
admin password
 2012-11-07 17:19:47 -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
Martin Konecny
272e428fa7 Merge branch '2.2.x' into 2.2.x-saas 
Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
	airtime_mvc/application/controllers/ScheduleController.php
	airtime_mvc/application/forms/EmailServerPreferences.php
	airtime_mvc/application/forms/GeneralPreferences.php
	airtime_mvc/application/forms/LiveStreamingPreferences.php
	airtime_mvc/application/forms/Preferences.php
	airtime_mvc/application/forms/SupportSettings.php
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/views/scripts/form/preferences.phtml
	airtime_mvc/application/views/scripts/form/preferences_email_server.phtml
	airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
	airtime_mvc/application/views/scripts/form/support-setting.phtml
	airtime_mvc/application/views/scripts/menu.phtml
	airtime_mvc/application/views/scripts/schedule/add-
show-form.phtml
 2012-11-06 17:23:32 -05:00
Rudi Grinberg
b3c9472bcb cc-4672: added dirty workaround to fix this issue 2012-11-06 16:16:37 -05:00
Martin Konecny
3f7d8a0c7f Merge branch '2.2.x' into 2.2.x-saas 2012-11-06 16:11:51 -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