Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,116 Commits 3 Branches 0 Tags 405 MiB
Commit Graph

1874 Commits

Author SHA1 Message Date
Martin Konecny 5ab52b12c7 CC-4417: 
Opus codec support
 2013-03-26 15:00:41 -04:00
Martin Konecny 38f8a0d231 more robust handling if system permissions go wrong 2013-03-24 22:58:13 -04:00
Martin Konecny 89983bd4f8 remove unnecessary file delete 2013-03-24 22:25:38 -04:00
Martin Konecny a5c8b7624e CC-1469: Crossfading support (non-equal power) 
-handle file attributes changing (end time, replaygain etc.)
 2013-03-22 15:56:05 -04:00
Martin Konecny 7a6940c96c Merge branch 'cc-1469-crossfade' into devel 
Conflicts:
	python_apps/pypo/pypopush.py
 2013-03-22 15:24:14 -04:00
Martin Konecny 8a5c82d71a CC-1469: Crossfading support (non-equal power) 
-fix few bugs
 2013-03-22 15:21:28 -04:00
Martin Konecny 2fc1612460 Merge branch '2.3.x' into devel 2013-03-22 14:24:37 -04:00
Martin Konecny fc6742869f better frozen liquidsoap handling 2013-03-22 14:23:42 -04:00
Martin Konecny 6d1025507a Merge branch '2.3.x' into devel 2013-03-22 14:05:08 -04:00
Martin Konecny 19753429dc add wait timer before liquidsoap is shutdown 2013-03-22 14:04:50 -04:00
Martin Konecny 33ca2e7c9c CC-1469: Crossfading support (non-equal power) 
-refactor
 2013-03-22 12:16:17 -04:00
Martin Konecny 708d36ba9c syntax error 2013-03-19 15:22:27 -04:00
Martin Konecny 6dae7d3973 CC-1469: Crossfading support (non-equal power) 
-cleanup
 2013-03-15 17:00:36 -04:00
Martin Konecny 445573dcdb CC-1469: Crossfading support (non-equal power) 
-webstreams scheduled in the future are now working...
 2013-03-15 15:07:55 -04:00
Martin Konecny dd7fc61e23 CC-1469: Crossfading support (non-equal power) 
-further implementation..
 2013-03-15 12:50:23 -04:00
Martin Konecny 2b7ebafa94 CC-1469: Crossfading support (non-equal power) 
-further implementation..
 2013-03-14 18:29:52 -04:00
Martin Konecny 91d1243554 CC-1469: 
Crossfading support (non-equal power)

-initial commit
 2013-03-14 16:50:55 -04:00
Martin Konecny 661a407f72 CC-5016: Allow user control for webstream metadata format 
-fixed
 2013-03-08 16:45:19 -05:00
Martin Konecny fe96b66fd7 CC-5016: 
Allow user control for webstream metadata format

-fixed
 2013-03-08 16:00:16 -05:00
Martin Konecny 0075b27947 CC-5015: Allow for cue_out points to be Null in DB 
-prep for 2.4
 2013-03-08 14:57:20 -05:00
Martin Konecny 635dfd356d Merge branch '2.3.x' into devel 2013-03-08 12:39:47 -05:00
Martin Konecny 30970598fe minor fixes 
-don't show print subprocess commands to py-interpreter.log
 2013-03-08 12:39:29 -05:00
Martin Konecny 3969e38d51 Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x 2013-03-07 18:34:10 -05:00
Martin Konecny c2fb811100 CC-5012: 
remove all shell=True commands for subprocess calls

-fixed
 2013-03-07 18:33:55 -05:00
Martin Konecny fc261035a8 CC-4999: Do silan analysis quietly in the background 
-set silan nice level to 19
 2013-03-06 19:48:35 -05:00
Martin Konecny 3497a3730c Merge branch '2.3.x' into devel 2013-03-06 18:24:48 -05:00
Martin Konecny 0321464ab8 CC-4999: 
Do silan analysis quietly in the background

-fixed
 2013-03-06 18:24:19 -05:00
Martin Konecny 5ceeb88899 Merge branch '2.3.x' into devel 2013-03-06 13:46:01 -05:00
Martin Konecny 7ca178295f CC-4993: airtime-check-system reports airtime-liquidsoap as down 
-fixed
 2013-03-06 13:43:22 -05:00
Martin Konecny 8e314477c7 CC-5005: airtime-purge doesn't remove all files 
-cleanup
 2013-03-06 12:26:07 -05:00
Martin Konecny e669b7a91a refactor some liquidsoap code + remove unused --data argument 2013-03-05 17:31:09 -05:00
Martin Konecny 7039493ea1 2.3.1 preparation 2013-03-05 17:00:52 -05:00
Martin Konecny cc69418215 Merge branch '2.3.x' into devel 2013-03-05 16:21:22 -05:00
Martin Konecny 215e5ccb4c CC-5001: remove /etc/monit/conf.d/monit-airtime-rabbitmq-server.cfg on 2.3.1 upgrade 
-don't even install rabbitmq monit file
 2013-03-05 16:21:05 -05:00
Martin Konecny c747b6ad47 CC-4978: Media Monitor: importing file slowly 
-disable silan on file import
-silan will need to be done manually for now using airtime-silan
 2013-03-04 16:00:14 -05:00
Martin Konecny 05b988fc6a CC-4758: File removed before Liquidsoap finishes reading it? 
-fixed
 2013-03-01 16:15:28 -05:00
Martin Konecny 259f70bc21 CC-4915: Media-Monitor cannot handle rabbitmq restart event 
-fixed
 2013-03-01 16:05:55 -05:00
Martin Konecny 764ee0389f CC-4916: Pypo cannot handle Schedule updates after rabbitmq restart happens 
-fixed
 2013-03-01 15:52:41 -05:00
Martin Konecny 2f33e99ff5 CC-4915: Media-Monitor cannot handle rabbitmq restart event 
-fixed
 2013-03-01 15:52:19 -05:00
Martin Konecny d4891803cc CC-4989: upgrade to mutagen 1.21 
-done
 2013-03-01 14:58:26 -05:00
Martin Konecny 0f7063e8a6 another refactor of the switches in LS 2013-03-01 12:48:32 -05:00
Martin Konecny 7e19eba7e1 another refactor of LS source 2013-03-01 11:44:11 -05:00
Martin Konecny 6624911d2c minor refactor of LS code 2013-02-28 18:54:23 -05:00
Martin Konecny ae503121d8 CC-4984: Exception for replaygain 
-fixed
 2013-02-28 18:26:15 -05:00
Martin Konecny 5ae4ed67a5 CC-4986: Installation fail because of monit-airtime-liquidsoap.cfg 
-fixed
 2013-02-28 16:33:59 -05:00
Martin Konecny 66fbfa1554 CC-4986: Installation fail because of monit-airtime-liquidsoap.cfg 
-fixed
 2013-02-28 16:27:52 -05:00
Martin Konecny b3ecb477be minor refactor of LS code 2013-02-27 17:48:10 -05:00
Martin Konecny fbaba59dca CC-4974: Watchdog for ensuring Liquidsoap does not consume more than 1GB of memory 
-changed to 600MB for now. May lower even more later
 2013-02-26 14:47:48 -05:00
Martin Konecny 15f2533225 less verbose logging 2013-02-26 13:34:05 -05:00
Martin Konecny 0c88949eb2 potential future optimization by using -b silan option 
-in the future this -b should be quicker for silan
 2013-02-26 13:33:56 -05:00
Martin Konecny 1e1d291124 CC-4888: Add unofficial support for AAC plugin 
-fixed
 2013-02-26 12:06:22 -05:00
Martin Konecny e08732fba7 CC-4975: airtime-silan cmd error 
-fixed
 2013-02-25 19:45:26 -05:00
Martin Konecny e35416b1e8 undo - make sure path names are quoted when passing to lsof 2013-02-25 17:43:02 -05:00
Martin Konecny deb50ea769 make sure path names are quoted when passing to lsof 2013-02-25 16:44:28 -05:00
Martin Konecny b06fd8b3d3 Merge branch '2.3.x' into devel 2013-02-22 12:09:02 -05:00
Martin Konecny 57183b8ac8 prevent creation of Zombie processes when running lsof 2013-02-22 12:03:39 -05:00
Martin Konecny 168a364da5 Merge branch '2.3.x' into devel 2013-02-20 14:42:35 -05:00
Martin Konecny 8f53871ddc CC-4970: Process return codes aren't "reaped" after exiting - Zombie processes are created. 
-fixed
 2013-02-20 14:40:16 -05:00
Naomi e3f4e91bef Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-02-15 17:06:42 -05:00
Naomi f2773fcb01 Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x 2013-02-15 16:32:43 -05:00
Naomi fe611e7c6a CC-4957 : Replay Gain undefined error, json response not being sent back properly. 2013-02-15 16:32:05 -05:00
denise 9715a9ad6d CC-4883: Python services contacting Apache with strange URL format 
-fixed
 2013-02-15 12:55:57 -05:00
Martin Konecny 331386f74f CC-4910: Need to properly handle non-200 http status codes in api client 
-fixed
 2013-02-04 16:05:58 -05:00
Martin Konecny 34eee60bee CC-4910: Need to properly handle non-200 http status codes in api client 
-wrap all service calls in exception
 2013-02-03 00:40:41 -05:00
Martin Konecny 1f4cfa8f65 fix pypo not auto restarting 2013-02-02 08:50:44 -05:00
Martin Konecny 149b744ba7 remove using self in a static method 2013-02-01 01:40:48 -05:00
Martin Konecny f145ede01b CC-4905: Unit tests for Pypo 
-whitespace removal
 2013-01-31 17:45:57 -05:00
Martin Konecny 8adb4b259c CC-4905: Unit tests for Pypo 2013-01-31 12:33:14 -05:00
Martin Konecny e459f739f2 indentation error fix 2013-01-30 11:29:28 -05:00
Martin Konecny 2a0cc9e45f fix indentation 2013-01-30 11:23:20 -05:00
Martin Konecny 9d4e0d2dd1 Merge branch 'martin' into 2.3.x 2013-01-29 12:17:36 -05:00
Martin Konecny 28c01760dd be more gentle to Liquidsoap when sending lots of commands 2013-01-29 12:17:05 -05:00
drigato db4e6bb94a CC-4889: API client URL request is not wrapping in try/catch 
-fixed
 2013-01-29 10:29:29 -05:00
Martin Konecny 9d8a9faca8 make code formatting easier on eyes 2013-01-28 17:00:35 -05:00
Martin Konecny d7358338f0 improved logging in pypo fetch 2013-01-28 17:00:16 -05:00
Martin Konecny b389e44001 take liquidsoap by the horns if it misbehaves. 2013-01-27 15:00:56 -05:00
Martin Konecny c93b90cc54 prepare for improvements to way pypo communicates with LS 2013-01-26 20:05:31 -05:00
Martin Konecny 807aa6b4a6 fix restart liquidsoap being sent as default no arguments for pypo-notify 2013-01-25 15:14:40 -05:00
Martin Konecny 8dd7ffee8c locks should occur inside try/catch 2013-01-25 14:16:53 -05:00
Martin Konecny 21a04803e5 Fix Pypo giving up too early on attempting to receive schedule 2013-01-25 12:11:50 -05:00
Martin Konecny 7b3850fac6 false not being returned on connection error 2013-01-25 11:30:36 -05:00
Martin Konecny c6ee5bfe58 prepare baby mm for saas 2013-01-22 13:02:45 -05:00
Martin Konecny b637365f55 add some missing statements in the sql upgrade script 2013-01-18 15:58:00 -05:00
James ed7b22118c Merge branch 'silan-script' into devel 2013-01-18 11:54:10 -05:00
James f70ca93b53 CC-4841: Silan script 
done
 2013-01-18 11:53:26 -05:00
denise bbedce2951 Changed default base directory in airtime.conf and api_client.cfg 2013-01-15 13:47:35 -05:00
Martin Konecny c266bf189f upgrade version number to 2.3.0 2013-01-15 12:31:41 -05:00
Martin Konecny 1d6ff24242 SAAS-298: Issues with http://iqkidsradio.airtime.pro/Schedule 
potential fix
 2013-01-10 10:29:57 -05:00
James 6e7f45e615 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-08 17:32:39 -05:00
James 1263c04621 CC-4796: Listener Stat: Authentication exception happens but no warning message on UI 
- done
 2013-01-08 17:32:27 -05:00
Martin Konecny 8b8e12a234 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-08 17:23:28 -05:00
Martin Konecny e79066de55 CC-4760: Airtime fails to play out 2nd webstream upon switching from one webstream to another 
-fix attempt
 2013-01-08 17:23:21 -05:00
James adda497bbb CC-4812: Property "off_air_meta" will block airtime-liquidsoap to start 
- fixed
 2013-01-08 15:52:11 -05:00
James b580a7be73 CC-4812: Property "off_air_meta" will block airtime-liquidsoap to start 
- fixed
 2013-01-08 12:31:14 -05:00
James 6e241fd3ec CC-4512: Allow changing stream "Offline" message via Web UI 
- fixed
 2013-01-07 18:14:57 -05:00
Martin Konecny 225a5d8f48 CC-4733: Stream statistics for Shoutcast users 
-initial implementation
 2013-01-04 18:32:20 -05:00
James 5d76bb2d17 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-03 18:00:33 -05:00
James ae7b6fe092 CC-4732: Ask for admin username + password in Stream Settings page 
- done
 2013-01-03 17:58:50 -05:00
Martin Konecny 5df867d142 remove whitespace 2013-01-03 15:05:31 -05:00
James a05259bd8f CC-4771: System -> Streams: It will restart liquidsoap every time when I click "Save" button without changing anything 
- fixed
 2013-01-03 14:42:12 -05:00
James f5b6d85406 CC-3018: Automatically strip out silence from audio tracks 
- adding logging
 2013-01-03 14:30:19 -05:00
James a1837366be Merge branch 'cc-3018-silence-detection' into devel 2013-01-03 14:08:21 -05:00
James f936f510c5 CC-3018: Automatically strip out silence from audio tracks 
- adding try/catch
 2013-01-03 14:07:34 -05:00
James b8f80866cf CC-3018: Automatically strip out silence from audio tracks 
- done
 2013-01-03 14:02:06 -05:00
Martin Konecny f2322e4f76 -disable liquidsoap playability test 2013-01-03 11:48:00 -05:00
Martin Konecny 77da642996 -fix missing import 2013-01-02 17:49:06 -05:00
Martin Konecny 2589b133d9 CC-4343: Unflushed events loop in media monitor 
-fixed
 2013-01-02 16:58:24 -05:00
Martin Konecny b9d829a33c CC-4754: Replay gain modifier 
-make pypo repush song if its replay_gain changed
 2012-12-28 13:58:55 -05:00
Martin Konecny 0596d1c391 Merge branch 'cc-4759-add-aac-stream-in-support' into devel 
Conflicts:
	python_apps/media-monitor2/media/monitor/pure.py
 2012-12-27 17:29:25 -05:00
Martin Konecny 735ad30483 CC-4726: Sometimes mm doesn't start after a fresh install 
-fixed
 2012-12-03 16:56:11 -05:00
Martin Konecny e3761bd8d6 -make sure lsof works for files with spaces 2012-12-03 16:33:24 -05:00
denise b2699fa914 merge from devel 2012-12-03 11:06:56 -05:00
Martin Konecny 7249e36081 -2.2.1 upgrade scripts 2012-11-27 12:13:16 -05:00
martin 735640d40b Merge branch 'lsof_quote_fix' of https://github.com/rgrinberg/Airtime into devel 2012-11-23 16:18:23 -05:00
martin 50bdeeef26 CC-4702: Webstream: When webstream is playing, it isn't marked as 'media_item_played' in cc_schedule 2012-11-23 16:00:10 -05:00
James 8d3024d42e api_client fix 2012-11-22 15:59:37 -05:00
James da6013b523 CC-4717: Lintian warnings from devel branch 
- fixed
 2012-11-22 15:14:55 -05:00
Martin Konecny 612ac415d2 cc-4708: cue points not working 
-fixed
 2012-11-22 12:24:59 -05:00
Martin Konecny 3a1945a818 CC-4702Webstream: When webstream is playing, it isn't marked as 'media_item_played' in cc_schedule 
-fixed
 2012-11-22 11:40:44 -05:00
james 8cc162f7a9 CC-4716: Cannot hear fade in & fade out 
- fixed
 2012-11-21 17:34:07 -05:00
Rudi Grinberg 1f5a5fd294 typo 2012-11-21 17:24:31 -05:00
Rudi Grinberg 0e91188939 made a unique toucher file 2012-11-21 17:22:32 -05:00
Rudi Grinberg 8c97995c2f Added vulnerability where strings would not be escaped when pass to shell command 2012-11-21 12:55:57 -05:00
Martin Konecny 8aa11f7e8c Better error message for api client constructor 2012-11-21 12:26:37 -05:00
Rudi Grinberg ac6a5a11bf docstring fixes 2012-11-20 16:41:45 -05:00
Rudi Grinberg 383244f962 changed implementation of timer thread because using threading.Timer does not allow us to properly inject 
the AirtimeInstance object.
 2012-11-20 14:44:58 -05:00
Rudi Grinberg 95e757a52c removed file mediator because it seems to be useless and incompatible with saas 2012-11-20 14:44:24 -05:00
Rudi Grinberg 58d888a59f Small refactoring to let user be assignable from any class that inherits from HasUser 2012-11-20 14:43:48 -05:00
Rudi Grinberg 58662b42be fixed typo missing self 2012-11-20 12:11:31 -05:00
Martin Konecny fed39077c0 Merge branch '2.2.x' into devel 2012-11-20 11:21:29 -05:00
Rudi Grinberg c1959f936e added TODO + formatting 2012-11-19 20:16:06 -05:00
Rudi Grinberg fdf8c9fb4e refactored EventRegistry to play nice with saas. 2012-11-19 20:13:19 -05:00
Rudi Grinberg ebca3fa9f5 refactored file mediator to play nice with saas 2012-11-19 20:13:00 -05:00
Rudi Grinberg 8696571b02 refactor owner to be saas friendly 2012-11-19 19:57:33 -05:00
Rudi Grinberg a28c9d9e27 added untracked configs 2012-11-19 16:46:47 -05:00
Rudi Grinberg a995129df5 added general getsig routine to get the correct signals from anywhere in the code. 2012-11-19 16:07:40 -05:00
Rudi Grinberg 4acb7d92db removed hardcoded signals in the code. 2012-11-19 16:07:26 -05:00
Rudi Grinberg 6101e9dfe3 fixed bug where only part of the path was joined. 2012-11-19 16:06:36 -05:00
Rudi Grinberg e46da35d3b made root path a variable to remove duplication. 2012-11-19 16:06:19 -05:00
Rudi Grinberg cd7d292aa5 fixed faulty regex. 2012-11-19 16:05:52 -05:00
Rudi Grinberg 9d04204389 fixed bug where path was only relative. 2012-11-19 16:05:26 -05:00
Rudi Grinberg 8dd0d80f68 fixed typo that was causing bug 2012-11-19 16:04:43 -05:00
Rudi Grinberg dc8315fef9 added more detailed output when launching baby mm 2012-11-19 16:04:22 -05:00
Rudi Grinberg d595d1112f added routine to verify config exists in "baby" media monitor" 2012-11-19 16:03:58 -05:00
Rudi Grinberg 647832b0a0 added comments to document config options 2012-11-19 16:03:25 -05:00
Rudi Grinberg c784df7f6e Added comments describing config options 2012-11-19 11:35:37 -05:00
Rudi Grinberg 1cbe2fb1a1 typo 2012-11-16 12:59:17 -05:00
Rudi Grinberg 57b2762e5c cleaned up imports 2012-11-16 12:51:23 -05:00
Rudi Grinberg bc9f7c4c95 removed hardcoding of path received from MM for SaaS. 2012-11-16 12:51:07 -05:00
Rudi Grinberg cf6e1d66ee removed direct usage of api client to AirtimeDB which encapsulates that behaviour 2012-11-16 12:36:58 -05:00
Rudi Grinberg 11214d754d docstring formatting 2012-11-16 12:31:10 -05:00
Rudi Grinberg e22162cc87 added initialization message 2012-11-16 12:29:06 -05:00
Rudi Grinberg aeb449ea76 import formatting 2012-11-16 11:15:49 -05:00
Rudi Grinberg a50995cd9b formatting + clearer name. 2012-11-16 11:14:31 -05:00
Rudi Grinberg cc66ac4a83 typo 2012-11-16 11:14:18 -05:00
Rudi Grinberg 7527b366d0 removed instance specific logging 2012-11-16 00:10:40 -05:00
Rudi Grinberg 757a561975 added missing import 2012-11-16 00:10:24 -05:00
Rudi Grinberg 26ad6dae74 Added a convenience constructor for an AirtimeInstance 2012-11-16 00:09:56 -05:00
Rudi Grinberg e12e311537 Added some routines to baby mm. 2012-11-16 00:09:33 -05:00
Martin Konecny 62b3c39c5b CC-4702: Webstream: When webstream is playing, it isn't marked as 'media_item_played' in cc_schedule 
-fixed
 2012-11-15 17:35:06 -05:00
Martin Konecny 5f534b5ef6 CC-4702Webstream: When webstream is playing, it isn't marked as 'media_item_played' in cc_schedule 2012-11-15 17:29:25 -05:00
Martin Konecny 8c73731c41 CC-4633: Use David's new method of Liquidsoap webstream switching 
-fixed
 2012-11-15 16:43:22 -05:00
Rudi Grinberg 88231a19c3 added baby mm launcher 2012-11-15 15:08:49 -05:00
Rudi Grinberg 9c74b0ea2c removed bastard injection from AirtimeApiClient 2012-11-15 15:08:18 -05:00
Rudi Grinberg 350c6e2f94 moved logging logic to launcher 2012-11-15 15:02:26 -05:00
Rudi Grinberg 11a43eb891 Generalized a lot of launching logic into the saas launcher away from the hosted installation script: mm2.py. 2012-11-15 14:49:55 -05:00
Rudi Grinberg c43dbe42a8 refactored creating an instance into its own function 2012-11-15 14:27:09 -05:00
Rudi Grinberg 975508a549 added TODO 2012-11-15 14:24:17 -05:00
Rudi Grinberg 57b13607c5 removed crap hacks 2012-11-15 14:22:42 -05:00
Martin Konecny 2010778876 cleanup redundant code, remove whitespace 2012-11-15 13:33:27 -05:00
Rudi Grinberg 0b0e96f49c removed old runner code 2012-11-15 12:46:57 -05:00
Rudi Grinberg 8a7535774c fixed import typo 2012-11-15 12:13:52 -05:00
Rudi Grinberg 4ac3efe228 renamed typo log to logger. 2012-11-15 12:13:33 -05:00
Rudi Grinberg 5073ced732 Made timeout watcher provide AirtimeInstnace 2012-11-15 12:12:47 -05:00
Rudi Grinberg fa66f33ffa changed RequestSync to use injected apc and injected it in ThreadedRequestedSync. 2012-11-15 12:12:19 -05:00
Rudi Grinberg 15f4212360 make ManagerTimeout provide the correct AirtimeInstance object. 2012-11-15 12:11:48 -05:00
Rudi Grinberg ab35263869 inject apc properly into AirtimeNotifier 2012-11-15 12:11:18 -05:00
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
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