Martin Konecny
a061464ffb
Merge branch '2.3.x' into 2.3.x-saas
2013-04-04 15:14:04 -04:00
Martin Konecny
301115c035
CC-5039: Encoded forward slash causing lots of apache error logs
...
-fixed: data should have been sent as POST rather than GET
2013-04-04 15:12:52 -04:00
Martin Konecny
eb3fda8423
Merge branch '2.3.x' into 2.3.x-saas
2013-04-03 17:12:14 -04:00
Martin Konecny
a748b05125
CC-5040:
...
All API actions need to have consistent return value
-temp fix. Correct fix will require ensuring api_client always sends
XmlHttpRequest
2013-04-03 17:11:36 -04:00
Martin Konecny
43ffa2aece
Merge branch '2.3.x' into 2.3.x-saas
...
Conflicts:
airtime_mvc/application/controllers/SystemstatusController.php
2013-03-06 13:47:21 -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
b744ab74ee
Merge branch '2.3.x' into 2.3.x-saas
2013-03-01 18:22:12 -05:00
Martin Konecny
ae503121d8
CC-4984: Exception for replaygain
...
-fixed
2013-02-28 18:26:15 -05:00
Martin Konecny
e08732fba7
CC-4975: airtime-silan cmd error
...
-fixed
2013-02-25 19:45:26 -05:00
Martin Konecny
8bec9dea55
Merge branch '2.3.x' into 2.3.x-saas
2013-02-20 14:41:55 -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
74bc485b4b
XSS exploit prevention
...
- Calendar - Show Contents
- Playlist tooltip in Library page
- Adding track to a show
- Widgets
- Playlist/Webstream title and description
- Smart block expansion
2013-02-05 10:56:38 -05:00
Martin Konecny
f8208a355c
Merge branch 'devel' into 2.3.x-saas
2013-01-18 12:22:45 -05:00
James
f70ca93b53
CC-4841: Silan script
...
done
2013-01-18 11:53:26 -05:00
Martin Konecny
8b12f692cd
CC-4854: Remove SaaS checking from codebase
...
-fixed
2013-01-16 14:31:43 -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
James
5a97fb69f2
CC-4384: Remove annoying usage of $CC_CONFIG
...
- done
2013-01-14 16:16:14 -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
1ee90ed9b9
CC-4790: Media Monitor: Re-added files won't show up in Library
...
-fixed
2013-01-08 15:42:35 -05:00
James
b8f80866cf
CC-3018: Automatically strip out silence from audio tracks
...
- done
2013-01-03 14:02:06 -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
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
denise
5adadc2e91
CC-1960: Internationalize Airtime / Support translations
...
- added gettext wrapper function to all strings in controllers
2012-11-20 11:33:37 -05:00
James
d8165cbf44
- haproxy support subdomain name with '.'
2012-11-13 16:32:36 -05:00
Martin Konecny
ed7aba83bf
Merge branch 'cc-4661-listener-statistics' into 2.2.x-saas
2012-11-07 17:22:36 -05:00
Martin Konecny
6438b54a5f
CC-4661: Listener Statistics
...
-backend part working
2012-11-02 17:50:43 -04:00
James
b8d6132b52
- saas patch #1
2012-10-23 18:47:15 -04:00
James
58535bef88
CC-4580: No contents in rebroadcast show
...
- fixed
2012-10-19 16:40:32 -04:00
James
45801e5dc4
- fix spelling of some function name
2012-10-17 15:16:03 -04:00
Martin Konecny
0e82083ba1
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-17 15:55:53 -04:00
Rudi Grinberg
4f576afc00
cc-4396. Initial fix problem was a module was not being included in the soundcloud upload script.
2012-09-17 15:24:02 -04:00
Martin Konecny
54bb414500
CC-4318: Widgets: Weekly show cannot show the schedule
...
-fixed
2012-09-17 14:56:34 -04:00
Martin Konecny
be80eeb5fd
CC-4404: restart airtime-liquidsoap will interrupt the output stream and never resume until restart playout engine
...
-fixed
2012-09-14 18:20:46 -04:00
Rudi Grinberg
8d08aa888b
cc-4421: Added special handling for files that mutagen returns None for.
2012-09-13 14:54:52 -04:00
Rudi Grinberg
4137602116
Cleaned up API controller
2012-09-13 14:21:15 -04:00
Rudi Grinberg
e043816bf4
Removed superfluous logging
2012-09-13 12:23:48 -04:00
denise
a779142a08
-fix commenting error
2012-09-13 11:12:39 -04:00
denise
e1403d45bd
CC-4368: Unused local variables in Airtime Controllers. Should be removed.
...
-done
2012-09-13 10:32:33 -04:00
Rudi Grinberg
cc88a9a8e3
Fixed a lot of unused variables
2012-09-12 18:36:27 -04:00
Rudi Grinberg
975830ff90
Removed wrong comments
2012-09-11 18:22:24 -04:00
Rudi Grinberg
e2d69df4a6
Removed unused code
2012-09-11 17:51:39 -04:00
Rudi Grinberg
dc91db1f46
formatting
2012-09-11 17:48:08 -04:00
Rudi Grinberg
bc5718ec09
logging removed
2012-09-11 17:39:28 -04:00
Rudi Grinberg
cc3ba90ec3
added debugging
2012-09-11 17:32:26 -04:00
Rudi Grinberg
b8db419717
All hands for America. Added robust debugging
2012-09-11 17:23:07 -04:00
Rudi Grinberg
fc8b2096af
Added debugging for Clifford
2012-09-11 17:21:20 -04:00
Rudi Grinberg
728a0dd736
Added todo documenting slight inefficiency
2012-09-11 16:24:59 -04:00
Rudi Grinberg
355b0ad35d
cc-4292: Initial fix of the MD5 issue. Now MD5's are only collected not really used for anything. Moves are handled completely
...
through paths.
2012-09-11 16:02:39 -04:00