Duncan Sommerville 936d11b367 Merge branch '2.5.x-albertenhancements' into saas

2015-02-27 17:21:20 -05:00

..

add-show-block.phtml

…

add-show-live-stream.phtml

CC-5354: Remove PHP short open tags for better compatibility

2013-10-04 14:15:23 -04:00

add-show-rebroadcast-absolute.phtml

CC-5354: Remove PHP short open tags for better compatibility

2013-10-04 14:15:23 -04:00

add-show-rebroadcast.phtml

CC-5354: Remove PHP short open tags for better compatibility

2013-10-04 14:15:23 -04:00

add-show-style.phtml

…

add-show-what.phtml

…

add-show-when.phtml

UI text improvements for setting the station/user timezones

2013-10-07 14:49:52 -04:00

daterange.phtml

CC-1960: Internationalize Airtime / Support translations

2012-11-20 11:33:37 -05:00

edit-history-file.phtml

subclassing the template types, files summary table is now fully configurable form wise.

2013-08-12 15:06:26 -04:00

edit-history-item.phtml

adding show instance to the create form if it's already set.

2013-08-31 23:34:37 -04:00

edit-user.phtml

Resolved merge conflicts for merging cc-5709-airtime-analyzer into saas.

2014-10-10 19:57:22 +00:00

login.phtml

Add form tokens to several forms.

2014-09-30 23:09:27 +00:00

password-change.phtml

CC-3416 : Create password reset form

2012-04-20 16:10:27 +02:00

password-restore.phtml

CC-4283: Password Reset: Please let user input username they want to reset

2012-08-24 12:40:30 -04:00

preferences_email_server.phtml

CC-1960: Internationalize Airtime / Support translations

2012-11-28 16:16:39 -05:00

preferences_general.phtml

Merge branch '2.5.x-albertenhancements' into saas

2015-02-27 17:21:20 -05:00

preferences_livestream.phtml

Merge branch '2.5.x' into 2.5.x-saas

2013-12-17 17:20:38 -05:00

preferences_soundcloud.phtml

Merge branch 'devel' into 2.3.x-saas

2013-01-15 13:44:44 -05:00

preferences_watched_dirs.phtml

Made several reoccurring strings into application constants and altered any static strings containing them to use these constants in string format calls.

2014-11-06 18:39:48 -05:00

preferences.phtml

Merge branch '2.5.x-albertenhancements' into saas

2015-01-15 16:32:29 -05:00

register-dialog.phtml

String updates

2014-11-14 10:01:06 -05:00

showbuilder.phtml

CC-5354: Remove PHP short open tags for better compatibility

2013-10-04 14:15:23 -04:00

smart-block-criteria.phtml

Added sort tracks by upload time to smart blocks criteria

2014-10-19 23:02:40 -04:00

stream-setting-form.phtml

CC-5354: Remove PHP short open tags for better compatibility

2013-10-04 14:15:23 -04:00

support-setting.phtml

Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas

2015-01-23 16:36:31 -05:00