8bec9dea55
Merge branch '2.3.x' into 2.3.x-saas
2013-02-20 14:41:55 -05:00
50bfcb7eb8
XSS exploit prevention
...
- Calendar -> show content
2013-02-05 15:37:00 -05:00
63439c276d
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
2013-02-05 10:56:54 -05:00
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
60d6f5585b
CC-4913: System -> Media Folder: Exception happens when media folder's path contains '<'
2013-02-04 16:27:09 -05:00
c398ce930b
Merge branch '2.3.x' into 2.3.x-saas
...
Conflicts:
airtime_mvc/application/controllers/PreferenceController.php
2013-02-04 16:22:35 -05:00
b45f71e8f9
CC-4897: XSS exploit on library page
2013-02-04 12:44:14 -05:00
0a198ae424
Merge branch '2.3.x' into 2.3.x-saas
...
Conflicts:
airtime_mvc/application/models/User.php
2013-01-30 18:31:45 -05:00
b15c4569eb
CC-4894: Need to filter output for potential XSS exploits
...
-fixed few areas
2013-01-29 15:17:29 -05:00
210336d20a
Merge branch 'devel' into 2.3.x-saas
2013-01-18 17:14:11 -05:00
280c4a81ad
CC-4859: I18N: "AND" and "OR" for Smartblock's criteria need to be translated.
...
-fixed
2013-01-18 17:04:39 -05:00
f8208a355c
Merge branch 'devel' into 2.3.x-saas
2013-01-18 12:22:45 -05:00
6acc5696f9
Save button on edit user settings was not translating
2013-01-17 14:34:18 -05:00
8b12f692cd
CC-4854: Remove SaaS checking from codebase
...
-fixed
2013-01-16 14:31:43 -05:00
dbaf7d9b4b
Merge branch 'devel' into 2.3.x-saas
2013-01-16 13:41:27 -05:00
bd3d12bd26
CC-4849: 2.3.x-saas: Empty page for Support feedback
...
-fixed
2013-01-16 12:34:20 -05:00
712df8b12d
Removed extra style element
2013-01-16 11:10:23 -05:00
5f12bc713d
Bumped copyright date to 2013
2013-01-16 12:24:45 +00:00
c57e19983c
-fix merge mistakes from devel
2013-01-15 14:06:02 -05:00
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
0dfd8acf7a
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-14 16:00:46 -05:00
fae3f3a03f
CC-2184: Hardcoded CSS path should be relative path instead
...
-Make '/' the default root
2013-01-14 16:00:38 -05:00
9603e7c2fd
CC-4830: I18N: System -> Streams: "dB" for Replay Gain Modifier is not translated
...
-fixed
2013-01-14 14:30:59 -05:00
a129b0b081
CC-4472: User password verify or clear text display.
...
-done with password verify
2013-01-10 17:51:25 -05:00
55fa8b8dc1
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-10 14:52:45 -05:00
2797809c74
CC-4786: Refresh page when language setting changes
...
-done
2013-01-10 13:55:52 -05:00
048ee05030
CC-4821: Add option to disable ReplayGain
...
- done
2013-01-10 13:49:41 -05:00
1572955d07
CC-4810: Add language setting to login page
...
-done
2013-01-09 18:03:23 -05:00
db62b538dd
CC-4816: Timezones should be a user preference
...
-done
2013-01-09 13:38:38 -05:00
03da2aee80
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-08 17:51:58 -05:00
3b2b275c30
CC-4809: Listen popup UI breaks with localization
...
-fixed
2013-01-08 17:51:42 -05:00
6e7f45e615
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-08 17:32:39 -05:00
1263c04621
CC-4796: Listener Stat: Authentication exception happens but no warning message on UI
...
- done
2013-01-08 17:32:27 -05:00
22e4811b22
Add gettext wrapper function to string missing it
2013-01-08 16:51:11 -05:00
3de33bc3e3
CC-4811: Move the edit user form to its own page
...
-done
2013-01-08 15:09:35 -05:00
6e241fd3ec
CC-4512: Allow changing stream "Offline" message via Web UI
...
- fixed
2013-01-07 18:14:57 -05:00
771b9b9412
Fixed whitespace in Preferences page between 'Timezone' and colon
2013-01-07 11:41:29 +00:00
c5f1d4a568
Removed bogus extra comma
2013-01-04 17:30:51 +00:00
5d76bb2d17
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-03 18:00:33 -05:00
ae7b6fe092
CC-4732: Ask for admin username + password in Stream Settings page
...
- done
2013-01-03 17:58:50 -05:00
64116c7bff
CC-4779: Library -> Metadata tooltip -> Some words get wrapped in different languages
...
-fixed
2013-01-03 16:56:04 -05:00
c11032111e
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-03 16:19:20 -05:00
e2c87ed8b6
CC-4781: Store localization settings on a per-user basis
...
-done
2013-01-03 16:19:02 -05:00
1f7e0ce042
CC-4782: Replay Gain modifier adds horizontal scroll bar when set to +10dB
...
- fixed
2013-01-03 14:58:29 -05:00
59f3826055
CC-4725: Have a "share" button on the popup player
...
-done
2013-01-03 13:13:27 -05:00
cd252d357d
CC-4777: Edit Metadata: Remove second title
...
-done
2013-01-02 16:27:35 -05:00
1dfe99224c
CC-4754: Replay gain modifier
...
- adding text
2012-12-28 16:18:47 -05:00
cf38e2c596
CC-4754: Replay gain modifier
...
- done
2012-12-27 22:58:41 -05:00
c0665e4748
CC-4754: Replay gain modifier
...
- Initial commit
2012-12-27 00:36:11 -05:00
bd18039785
CC-4744: Edit user form needs styling
...
-done
2012-12-17 14:12:27 -05:00
Martin Konecny
denise
Daniel James
James
james