Martin Konecny
|
784cb390d3
|
Merge branch 'devel' into 2.3.x-saas
|
2013-01-17 10:56:18 -05:00 |
|
james
|
5283757cc6
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2013-01-16 16:38:44 -05:00 |
|
james
|
3f2ab9bb4e
|
CC-4847: Listener Stats page shows misleading error when the Icecast admin password has not been entered
- done
|
2013-01-16 16:38:24 -05:00 |
|
cliff.wang
|
d7e40710f4
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2013-01-16 16:33:30 -05:00 |
|
cliff.wang
|
e05d99e16f
|
Update Chinese translation
|
2013-01-16 16:33:16 -05:00 |
|
denise
|
e4c2f43d9e
|
CC-4855: System->Preferences->Fade in/out settings: Number's format is incorrect.
-fixed
|
2013-01-16 15:40:50 -05:00 |
|
Martin Konecny
|
6640c1ea4b
|
CC-4856: 2.3.x-saas: Overwriting metadata doesn't take effect
-fixed
|
2013-01-16 14:45:14 -05:00 |
|
denise
|
f7e8fd33fd
|
CC-4848: Streaming server passwords should be hidden with dots, once entered
-fixed
|
2013-01-16 14:36:56 -05:00 |
|
Martin Konecny
|
8b12f692cd
|
CC-4854: Remove SaaS checking from codebase
-fixed
|
2013-01-16 14:31:43 -05:00 |
|
Martin Konecny
|
9d8c9149fd
|
remove code that will never be executed on SaaS branch
|
2013-01-16 14:06:04 -05:00 |
|
Martin Konecny
|
dbaf7d9b4b
|
Merge branch 'devel' into 2.3.x-saas
|
2013-01-16 13:41:27 -05:00 |
|
Martin Konecny
|
ab83029b2f
|
CC-4852: 2.3.x-saas: Exception happens when updating System -> Preferences
-fixed
|
2013-01-16 12:44:26 -05:00 |
|
denise
|
9cb4633823
|
CC-4850: Upgrade Scripts -> Add default timezone and locale for each user in cc_pref
-fallback to default settings if user setting is not set
|
2013-01-16 12:42:58 -05:00 |
|
Martin Konecny
|
bd3d12bd26
|
CC-4849: 2.3.x-saas: Empty page for Support feedback
-fixed
|
2013-01-16 12:34:20 -05:00 |
|
denise
|
b7fb7a4166
|
Removed English-US language option
|
2013-01-16 11:49:04 -05:00 |
|
denise
|
712df8b12d
|
Removed extra style element
|
2013-01-16 11:10:23 -05:00 |
|
Daniel James
|
5f12bc713d
|
Bumped copyright date to 2013
|
2013-01-16 12:24:45 +00:00 |
|
denise
|
2791c5fcc5
|
Updating fr_FR .po files
|
2013-01-15 17:05:57 -05:00 |
|
Martin Konecny
|
e98d6e92bb
|
Merge branch 'devel' into 2.3.x-saas
|
2013-01-15 15:38:27 -05:00 |
|
Martin Konecny
|
84373391de
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2013-01-15 15:37:39 -05:00 |
|
Martin Konecny
|
973a415164
|
-fix installation error
|
2013-01-15 15:37:26 -05:00 |
|
denise
|
aef19aadbe
|
Updating es_ES .po files
|
2013-01-15 15:31:38 -05:00 |
|
cliff.wang
|
52bd3d17d7
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2013-01-15 14:40:52 -05:00 |
|
cliff.wang
|
e51a53671b
|
Update Chiness translation file
|
2013-01-15 14:40:36 -05:00 |
|
Martin Konecny
|
c57e19983c
|
-fix merge mistakes from devel
|
2013-01-15 14:06:02 -05:00 |
|
James
|
08b52fceca
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2013-01-15 13:54:56 -05:00 |
|
James
|
8226105b2f
|
- translation(Korean)
|
2013-01-15 13:54:40 -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 |
|
cliff.wang
|
3f1bbade52
|
Update Chinese translation files
|
2013-01-15 11:00:24 -05:00 |
|
denise
|
dc5cac9834
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2013-01-15 10:41:45 -05:00 |
|
denise
|
146326c406
|
Updating .po files with new messages
|
2013-01-15 10:41:03 -05:00 |
|
Martin Konecny
|
4e0d644d8b
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2013-01-14 17:16:01 -05:00 |
|
Martin Konecny
|
e22a573d8a
|
CC-2184: Hardcoded CSS path should be relative path instead
-missed some paths
|
2013-01-14 17:15:53 -05:00 |
|
James
|
175dbcbabc
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2013-01-14 17:09:03 -05:00 |
|
James
|
ea70357920
|
- remove logging
|
2013-01-14 17:08:47 -05:00 |
|
denise
|
a85b394d63
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2013-01-14 17:02:05 -05:00 |
|
denise
|
692c1a1c9e
|
CC-4838: I18N: HTML contents of Print preview for Playout History need to be translated
-fixed
|
2013-01-14 17:01:50 -05:00 |
|
James
|
8c19384d32
|
- CRLF fix
|
2013-01-14 16:21:02 -05:00 |
|
James
|
9ae3559305
|
Merge branch 'cc-4384-remove-table-calling-with-cc-config' into devel
Conflicts:
airtime_mvc/application/Bootstrap.php
|
2013-01-14 16:19:51 -05:00 |
|
James
|
5a97fb69f2
|
CC-4384: Remove annoying usage of $CC_CONFIG
- done
|
2013-01-14 16:16:14 -05:00 |
|
Martin Konecny
|
0dfd8acf7a
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2013-01-14 16:00:46 -05:00 |
|
Martin Konecny
|
fae3f3a03f
|
CC-2184: Hardcoded CSS path should be relative path instead
-Make '/' the default root
|
2013-01-14 16:00:38 -05:00 |
|
James
|
ed2e25fb29
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2013-01-14 14:49:22 -05:00 |
|
James
|
0eb5fb51b6
|
CC-4836: Playlist length is wrong because wrong cue out setting.
- fixed
|
2013-01-14 14:49:06 -05:00 |
|
James
|
a55bc9973c
|
- temp commit
|
2013-01-14 14:43:02 -05:00 |
|
denise
|
9603e7c2fd
|
CC-4830: I18N: System -> Streams: "dB" for Replay Gain Modifier is not translated
-fixed
|
2013-01-14 14:30:59 -05:00 |
|
denise
|
7b4693e5f9
|
CC-4831: I18N: Error message of background settings when creating a show is not translated
-fixed
|
2013-01-14 14:13:32 -05:00 |
|
Martin Konecny
|
ba66746a00
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2013-01-14 14:07:55 -05:00 |
|
denise
|
8ea3aca3a0
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2013-01-14 14:07:55 -05:00 |
|