57c1d74286
SAAS-985 - Port sandwich menu to showbuilder branch
2015-08-04 16:37:45 -04:00
f138dc6b47
SAAS-948 - tab layout for right-hand pane
2015-07-31 18:28:16 -04:00
661a87dfbc
SAAS-948 - Frontend tweaks and fixes
2015-07-29 13:35:01 -04:00
59d89b0b9e
SAAS-948 - ShowBuilder redesign editors and fixes
2015-07-27 15:37:55 -04:00
ba90b1f1eb
Merge branch 'saas-dev' into saas-showbuilder
...
Conflicts:
airtime_mvc/public/css/styles.css
2015-07-20 12:23:11 -04:00
d7d9a994d5
SAAS-948 - ShowBuilder redesign initial commit
2015-07-15 18:53:19 -04:00
dddc6e6591
Fix for context menu on calendar being too small sometimes
2015-07-15 07:19:48 -04:00
fdef9d9f78
Fixed calendar context menu width
2015-07-14 13:45:37 -04:00
2693c9f02c
Small bugfix for CC-6064
2015-07-14 11:25:11 -04:00
45b09a0d24
Merge branch 'saas-dev' into saas-dev-usability-hints
...
Conflicts:
airtime_mvc/public/js/airtime/schedule/add-show.js
2015-07-14 10:56:12 -04:00
c05d4bac2f
Merge branch 'saas-dev' into saas-stream-settings
2015-07-13 13:27:34 -04:00
6d883d2fa4
Fix Add Show button bug and update styling
2015-07-13 13:23:24 -04:00
55999a07ec
SAAS-940: Provide usability hints to user
2015-07-13 08:06:41 -04:00
37ed35f5b2
Merge branch 'saas-dev' into saas-stream-settings
...
Conflicts:
airtime_mvc/application/models/Preference.php
2015-07-10 10:29:38 -04:00
ac2e1a2d4b
SAAS-876 - More work on stream settings page
2015-07-08 16:04:09 -04:00
ad39174f57
Fix fieldset flow for Firefox
2015-07-08 14:19:50 -04:00
457230ba07
SAAS-876 - Initial commit
2015-07-03 13:32:41 -04:00
3c33cfd8b2
Remove min-width on showbuilder panel to fix add-content pane issue
2015-06-30 16:35:25 -04:00
7f9b54b006
SAAS-908 - Styles for new field layout
2015-06-30 12:15:15 -04:00
133f1b72ca
Remove min-height on datatables for now
2015-06-29 11:32:28 -04:00
9d60a3d130
Move Help Translate Airtime link to help menu
2015-06-26 14:27:27 -04:00
3a51e66b07
Add transifex link to login page
2015-06-26 13:25:19 -04:00
6497bc28c5
Show collapsible sections (other than 'dangerous settings') by default on preferences page
2015-06-25 17:43:15 -04:00
609f073a25
Merge branch '2.5.x-installer' into saas-dev-plus
...
Conflicts:
airtime_mvc/public/css/styles.css
airtime_mvc/public/index.php
2015-06-16 11:20:43 -04:00
57d63ebb19
Backport some CSS fixes
2015-06-16 11:17:41 -04:00
f4ff00355d
Added Radio Page link
2015-06-12 17:21:46 -04:00
505d6fbc57
Fixed some issues with embedded schedule widget style
2015-06-11 15:04:59 -04:00
1efc47beb9
Tweaked layout of the embed widgets page
2015-06-11 14:30:52 -04:00
6528a9b0a3
SAAS-843: Create Embeddable Schedule Widget View
...
Replaced player controller with embeddablewidgets controller.
Replaced 'Player' page with 'Widgets' page.
Added schedule widget to the widgets page.
2015-06-04 12:00:23 -04:00
a2a9e54553
Merge branch 'saas-dev' into saas-tunein
...
Conflicts:
airtime_mvc/application/views/scripts/form/preferences.phtml
2015-05-19 15:50:16 -04:00
b023f191e3
SAAS-772: Send metadata to Tunein
...
Added form validation by making a test request to the TuneIn API with
the user-entered values
2015-05-14 13:13:33 -04:00
15bebc6267
Dangerous options subform on Preferences page and Delete all tracks button
2015-05-13 15:56:08 -04:00
be614415de
SAAS-757: metadata edit window goes under the header menu
2015-04-30 10:29:43 -04:00
c1af91bb9a
Suspension notice layout fix
2015-04-29 13:58:50 -04:00
49456318ff
Fix layout being too narrow sometimes
2015-04-29 13:22:22 -04:00
574fdf4b27
Merged 2.5.x into saas
2015-04-27 14:01:28 -04:00
4b307d6b47
Fix for vertical scrollbar issue
2015-04-27 13:52:55 -04:00
5d25fcea2d
Style tweaks to the suspension notice.
2015-04-17 12:58:05 -04:00
1964cbb75e
Merge branch 'saas' into saas-suspend
2015-04-17 12:18:56 -04:00
3695049a6c
Added Admin_Only decorator and greyed out read-only text-areas
2015-04-14 14:35:37 -04:00
088ada1d2c
Reformatted Bootstrap, added Station Suspended notice
2015-04-10 17:14:56 -04:00
3fe1a46c41
Fixed dropdown menus not behaving correctly
2015-03-26 12:50:53 -04:00
040eb1443d
CSS fixes to make page header more responsive
2015-03-25 17:29:28 -04:00
3d03f837d2
Trial->Paid conversion tracking with GTM
...
* Added trial to paid conversion tracking with GTM
* Removed WHMCS roundtrip from Showbuilder
* Moved all Analytics code into common/GoogleAnalytics.php
* Added a new Thank You page after plan changes to capture conversions
* Added a ConversionTracking plugin to facilitate that
* Also backported some minor staticBaseDir compatibility changes
* Fixed a logic error in creating the baseDir
2015-03-24 10:11:25 -04:00
32aa962138
Fixed error logging and refactored ErrorController to get invoked
...
correctly when using API key authentication
* Along with the bugfixes, backported improved ErrorController from upstream branch,
including style improvements.
2015-03-20 17:20:34 -04:00
936d11b367
Merge branch '2.5.x-albertenhancements' into saas
2015-02-27 17:21:20 -05:00
78c7170c4e
Reformatted logo remove button to use Zend
2015-02-27 17:19:37 -05:00
e13e4413ea
Merge remote-tracking branch 'origin/2.5.x-albertenhancements' into saas
2015-02-24 15:03:06 -05:00
5e256df061
Added remove button for station logo on preferences page
2015-02-24 12:12:30 -05:00
69d588d2f6
Merge branch '2.5.x' into 2.5.x-albertenhancements
2015-02-24 10:45:52 -05:00
fd42c67b0b
Merge branch 'saas' of github.com:sourcefabric/Airtime into saas
2015-01-21 18:08:05 -05:00
345b2b5d26
Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas
2015-01-21 15:14:34 -05:00
2fadc8f8f1
Merge branch '2.5.x' into saas
...
Conflicts:
CREDITS
2015-01-20 11:44:53 -05:00
620029c04e
Stop Chrome from flashing white between page loads
2015-01-15 16:45:14 -05:00
7c28b66ce9
Merge branch '2.5.x-albertenhancements' into saas
...
Conflicts:
airtime_mvc/application/controllers/PreferenceController.php
airtime_mvc/application/forms/Preferences.php
airtime_mvc/application/views/scripts/form/preferences.phtml
airtime_mvc/application/views/scripts/form/support-setting.phtml
2015-01-15 16:32:29 -05:00
f9bf71a349
Moved the Station Logo field to GeneralPreferences, and stopped using
...
AJAX on the general prefs form
2015-01-15 16:28:18 -05:00
a5cc529c4a
Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas
2015-01-15 11:24:16 -05:00
d5b969f94f
Merge branch '2.5.x' into saas
...
Conflicts:
airtime_mvc/application/forms/GeneralPreferences.php
airtime_mvc/application/views/scripts/form/preferences_general.phtml
airtime_mvc/application/views/scripts/form/support-setting.phtml
2015-01-13 21:31:57 -05:00
c4d3a8fa62
Massive simplification of the GeneralPreferences dialog
...
* The purpose of this was so that we can use Zend_Form_Element
decorators, which I need.
2015-01-13 20:51:46 -05:00
6b8163748d
Updated styles for csrf elements
2014-11-13 09:46:44 -05:00
4d263ce897
Merged 2.5.x into saas
2014-11-05 17:36:58 -05:00
534b56351e
Added styles to completely hide csrf elements on the page; changed tabs to spaces
2014-11-05 17:26:05 -05:00
4add0f0b7b
CC-5786: Quota Enforcement in the File Upload API
2014-04-14 11:24:39 -04:00
653f0e02a4
CC-5648: Events are shifted down in the month view
...
* Fixed it.
2013-12-17 15:25:43 -05:00
f16d8ca2ea
Fixed a bunch of annoying/major graphical issues with the calendar
...
* Fixed a bug where the calendar would keep shrinking smaller and
smaller as you resized the window.
* Fixed the size and alignment of the time span combobox in the corner,
which fixes a bug where the text was cut off.
* Fixed a bug where the schedule header would grow as you flipped
to the next or previous week.
* Dropped javascript from the resizing of the calendar (for the most
part).
2013-12-14 00:05:13 -05:00
e6d28b250e
CC-5629 : Smart Block timestamps aren't saved in UTC time
2013-12-11 17:35:31 -05:00
55254e88a5
UI text improvements for setting the station/user timezones
...
Added info icon in the add-show form for timezone setting
2013-10-07 14:49:52 -04:00
a8a02704f3
Merge branch '2.5.x' into cc-5232-show-timezone
2013-09-25 17:24:44 -04:00
99669c78a0
Fixed CC-5045 and Now Playing time remaining style improvements
2013-09-25 16:40:20 -04:00
107263ae20
CC-5323: User's Timezone Can Improperly Edit Show
2013-09-25 16:22:30 -04:00
53c326b320
pagination buttons look better if they can fit on the same line.
2013-08-30 01:23:35 -04:00
9b45b9dc72
converting to a jquery UI based datepicker.
2013-08-16 15:12:00 -04:00
950cc6d6b7
CC-5177: Create "?" icon beside linked show check box
2013-05-28 14:18:26 -04:00
5bf91d513d
CC-5127: Library -> Scheduled and Playlist columns needs better icon
...
Changed icon
Renamed Playlist to Playlist / Block
2013-05-17 11:42:48 -04:00
7d5177d77d
CC-5096 : Add "i" (info) icon to stream output type
2013-05-14 18:14:38 -04:00
fedf564090
CC-5081: Calendar -> Add a linked show icon
2013-05-09 12:14:49 -04:00
0da0e798c6
make password input width same as text input width. Also make everything a little wider.
2013-04-10 18:19:46 -04:00
cf2ed25bfb
CC-4900: Indicate in the library if a webstream is scheduled in the future or belongs to a playlist
...
-done
2013-01-30 16:53:59 -05:00
a3477106cf
CC-4734: French - UI breaks in several places
...
-fixed
2013-01-18 10:39:06 -05:00
67706bede9
CC-4834: Problem about "Share" button in the "Listen" Panel
...
-fixed
2013-01-14 11:56:46 -05:00
a129b0b081
CC-4472: User password verify or clear text display.
...
-done with password verify
2013-01-10 17:51:25 -05:00
b2d709052e
Modified show is partially filled icon
2013-01-10 14:26:39 -05:00
1572955d07
CC-4810: Add language setting to login page
...
-done
2013-01-09 18:03:23 -05:00
7866b8a0cb
Small fix to select box sizes
2013-01-09 15:11:22 -05:00
3b2b275c30
CC-4809: Listen popup UI breaks with localization
...
-fixed
2013-01-08 17:51:42 -05:00
3de33bc3e3
CC-4811: Move the edit user form to its own page
...
-done
2013-01-08 15:09:35 -05:00
82da4dcfe8
CC-4599: Calendar: Add an icon to indicate show is not fully booked
...
-done but a new icon is needed
2013-01-07 12:41:28 -05:00
02a1199386
CC-4734: French - UI breaks in several places
2013-01-04 17:27:58 -05:00
495fd7da1a
CC-4734: French - UI breaks in several places
...
-fixed
2013-01-04 17:19:09 -05:00
7e1efe5d96
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-04 11:00:36 -05:00
596e103d96
CC-4763: Alignment error for User settings UI in Firefox
...
-fixed
2013-01-04 11:00:21 -05:00
ae7b6fe092
CC-4732: Ask for admin username + password in Stream Settings page
...
- done
2013-01-03 17:58:50 -05:00
59f3826055
CC-4725: Have a "share" button on the popup player
...
-done
2013-01-03 13:13:27 -05:00
bd18039785
CC-4744: Edit user form needs styling
...
-done
2012-12-17 14:12:27 -05:00
dd5882984e
CC-4736: Let non-admin users update their user info
...
-done but needs design
2012-12-10 16:55:44 -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
dc00528cd5
Merged baseUrl related conflicts
2012-10-29 11:56:20 -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
Duncan Sommerville
drigato
Albert Santoni
Naomi
denise
Martin Konecny
James
Rudi Grinberg