Martin Konecny
|
6f5ffdc1e7
|
Merge branch '2.3.x' into 2.3.x-saas
|
2013-01-24 17:49:08 -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 |
Martin Konecny
|
f8208a355c
|
Merge branch 'devel' into 2.3.x-saas
|
2013-01-18 12:22:45 -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 |
Martin Konecny
|
74877b289e
|
CC-4843: Make listener stats work with SaaS in 2.3.x-saas branch
-fixed
|
2013-01-16 14:05:45 -05:00 |
Martin Konecny
|
e98d6e92bb
|
Merge branch 'devel' into 2.3.x-saas
|
2013-01-15 15:38:27 -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
|
8cd6bd9aa4
|
Merge branch 'devel' into 2.3.x-saas
Conflicts:
airtime_mvc/application/controllers/PreferenceController.php
airtime_mvc/application/forms/AddShowWhen.php
airtime_mvc/application/forms/GeneralPreferences.php
airtime_mvc/application/forms/LiveStreamingPreferences.php
airtime_mvc/application/forms/SoundcloudPreferences.php
airtime_mvc/application/forms/SupportSettings.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_general.phtml
airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
airtime_mvc/application/views/scripts/form/support-setting.phtml
airtime_mvc/application/views/scripts/schedule/add-
show-form.phtml
airtime_mvc/public/js/airtime/preferences/preferences.js
python_apps/api_clients/api_client.py
python_apps/pypo/listenerstat.py
|
2013-01-15 13:44:44 -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
|
fc09e8cd74
|
Merge branch '2.2.x' into 2.2.x-saas
|
2012-12-03 17:08:49 -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
|
4983721565
|
Merge branch '2.2.x' into 2.2.x-saas
Conflicts:
airtime_mvc/application/forms/LiveStreamingPreferences.php
|
2012-11-28 16:10:33 -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 |