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
a129b0b081
CC-4472: User password verify or clear text display.
...
-done with password verify
2013-01-10 17:51:25 -05:00
2797809c74
CC-4786: Refresh page when language setting changes
...
-done
2013-01-10 13:55:52 -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
771b9b9412
Fixed whitespace in Preferences page between 'Timezone' and colon
2013-01-07 11:41:29 +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
e2c87ed8b6
CC-4781: Store localization settings on a per-user basis
...
-done
2013-01-03 16:19:02 -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
fde74105de
CC-4729: Register dialog is missing title
2012-12-04 14:33:45 -05:00
542434d9f0
CC-1960: Internationalize Airtime / Support translations
...
-got rid of spaces at beginning of strings
-removed empty string translations
-overwrote Zend_Validate_Between object error messages
2012-11-28 16:16:39 -05:00
36c6edcff1
CC-1960: Internationalize Airtime / Support translations
...
-addded gettext wrapper to string missing it
2012-11-27 12:10:32 -05:00
f86cd7d474
CC-1960: Internationalize Airtime / Support translations
...
-fixed typos
2012-11-27 12:03:38 -05:00
b9b387fcd0
CC-1960: Internationalize Airtime / Support translations
...
-fixed typos
2012-11-27 11:59:55 -05:00
b677130a3f
CC-1960Internationalize Airtime / Support translations
...
-added gettext wrapper to strings missing it
-timepicker close button was not getting translated -fixed
2012-11-23 16:39:41 -05:00
dd0e71efcc
CC-1960: Internationalize Airtime / Support translations
...
-added gettext wrapper function to all strings missing it
-i18n of jquery timepicker and datepicker
-i18n of jquery datatables columnFilter input place holder labels
2012-11-22 17:32:24 -05:00
25ddd083bc
CC-1960: Internationalize Airtime / Support translations
...
-added language option in preferences
2012-11-21 12:44:50 -05:00
c344282e4d
CC-1960: Internationalize Airtime / Support translations
...
-rescan watched folder button was missing
2012-11-21 11:57:41 -05:00
43a797058c
-extra quote typo
2012-11-20 11:33:37 -05:00
e5f67c8b05
CC-1960: Internationalize Airtime / Support translations
...
-added gettext wrapper functions for all strings in view/scripts, and forms
2012-11-20 11:33:37 -05:00
a69ff167d4
mass string change to _
2012-11-20 11:33:37 -05:00
15741bdfa9
renamed links
2012-11-20 11:29:56 -05:00
33e4d6154d
CC-4693: Preferences: Bottom save button is not aligned
...
-fixed
2012-11-12 14:43:44 -05:00
4b09b289ce
SAAS-290: Hosted SaaS widgets + javascript code generation
...
Slight improvements to description as well as element
positioning
2012-11-07 15:44:22 -05:00
1b0b124247
SAAS-290: Hosted SaaS widgets + javascript code generation
...
-working code
2012-11-07 12:49:17 -05:00
b817684972
Merge branch '2.2.x' into devel
...
Conflicts:
airtime_mvc/application/controllers/PreferenceController.php
airtime_mvc/application/models/StoredFile.php
airtime_mvc/public/js/bootstrap/bootstrap.js
2012-11-07 11:21:36 -05:00
27d40ef4df
SAAS-290: Hosted SaaS widgets + javascript code generation
2012-11-06 18:10:53 -05:00
272e428fa7
Merge branch '2.2.x' into 2.2.x-saas
...
Conflicts:
airtime_mvc/application/controllers/PreferenceController.php
airtime_mvc/application/controllers/ScheduleController.php
airtime_mvc/application/forms/EmailServerPreferences.php
airtime_mvc/application/forms/GeneralPreferences.php
airtime_mvc/application/forms/LiveStreamingPreferences.php
airtime_mvc/application/forms/Preferences.php
airtime_mvc/application/forms/SupportSettings.php
airtime_mvc/application/models/Schedule.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_livestream.phtml
airtime_mvc/application/views/scripts/form/support-setting.phtml
airtime_mvc/application/views/scripts/menu.phtml
airtime_mvc/application/views/scripts/schedule/add-
show-form.phtml
2012-11-06 17:23:32 -05:00
fd3305bc4c
SAAS-289: Remove all isSaaS checks
...
-done
2012-11-06 17:10:47 -05:00
38d28d3346
SAAS-289: Remove all isSaaS checks
2012-11-06 16:48:34 -05:00
3f7d8a0c7f
Merge branch '2.2.x' into 2.2.x-saas
2012-11-06 16:11:51 -05:00
e262d48eec
CC-4675: Preferences: Error messages are hidden
...
-fixed
2012-11-06 12:17:45 -05:00
de89686d48
CC-4536: Smart block criteria use AND logic, but additional modifiers use OR logic, without labels to show the difference
...
-added comments
2012-11-06 12:03:49 -05:00
2cbba60037
CC-4673: Smart Block: Exception happens when create a smart block with 5 criteria
...
-fixed
2012-11-06 11:54:24 -05:00
135aadf16b
Merge branch '2.2.x' into devel
...
Conflicts:
airtime_mvc/application/controllers/LibraryController.php
airtime_mvc/application/views/scripts/library/library.phtml
airtime_mvc/public/js/airtime/showbuilder/builder.js
airtime_mvc/public/js/airtime/showbuilder/main_builder.js
2012-11-02 12:28:21 -04:00
cc208da2fb
CC-4536: Smart block criteria use AND logic, but additional modifiers use OR logic, without labels to show the difference
...
-added labels
2012-11-02 10:48:08 -04:00
9d495ebc03
CC-4639: Give an option to allow smart blocks to reuse tracks if not enough tracks meet the time limit.
...
- done
2012-10-30 17:57:58 -04:00
3e60ac4393
remove \r line endings
2012-10-30 13:23:09 -04:00
dc00528cd5
Merged baseUrl related conflicts
2012-10-29 11:56:20 -04:00
3a7700eaac
CC-4583: Use AJAX calls instead of refreshing entire page
...
-done
2012-10-26 18:09:30 -04:00
b8d6132b52
- saas patch #1
2012-10-23 18:47:15 -04:00
c51fb8a040
CC-4549: Tooltip for source username cannot be shared between input and output settings
...
-fixed
2012-10-22 16:37:06 -04:00
d32495d100
CC-2184: Hardcoded CSS path should be relative path instead
2012-10-19 11:09:34 -04:00
095c2c7cc6
CC-4559: More useful tooltip for Find Shows button in Now Playing page
2012-10-15 12:41:39 +01:00
f77ec31a8d
CC-4552: Small formatting improvement
2012-10-11 17:44:08 +01:00
843a456b3b
CC-4552: Fixed various errors in Support Feedback page
2012-10-11 17:03:09 +01:00
Martin Konecny
denise
Daniel James
James
james
Rudi Grinberg
Rudi Grinberg
James