Albert Santoni
ea2a6b3f68
Clean up and bugfixes for password reset (SAAS-1009)
2015-08-07 13:57:42 -04:00
Albert Santoni
e49d337db0
Merge remote-tracking branch 'origin/saas-stream-settings' into saas-dev
2015-08-05 14:50:31 -04:00
drigato
dddc6e6591
Fix for context menu on calendar being too small sometimes
2015-07-15 07:19:48 -04:00
drigato
fdef9d9f78
Fixed calendar context menu width
2015-07-14 13:45:37 -04:00
Albert Santoni
2693c9f02c
Small bugfix for CC-6064
2015-07-14 11:25:11 -04:00
Albert Santoni
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
Duncan Sommerville
c05d4bac2f
Merge branch 'saas-dev' into saas-stream-settings
2015-07-13 13:27:34 -04:00
Duncan Sommerville
6d883d2fa4
Fix Add Show button bug and update styling
2015-07-13 13:23:24 -04:00
drigato
55999a07ec
SAAS-940: Provide usability hints to user
2015-07-13 08:06:41 -04:00
Duncan Sommerville
37ed35f5b2
Merge branch 'saas-dev' into saas-stream-settings
...
Conflicts:
airtime_mvc/application/models/Preference.php
2015-07-10 10:29:38 -04:00
Duncan Sommerville
ac2e1a2d4b
SAAS-876 - More work on stream settings page
2015-07-08 16:04:09 -04:00
Duncan Sommerville
ad39174f57
Fix fieldset flow for Firefox
2015-07-08 14:19:50 -04:00
Duncan Sommerville
457230ba07
SAAS-876 - Initial commit
2015-07-03 13:32:41 -04:00
Duncan Sommerville
3c33cfd8b2
Remove min-width on showbuilder panel to fix add-content pane issue
2015-06-30 16:35:25 -04:00
Duncan Sommerville
7f9b54b006
SAAS-908 - Styles for new field layout
2015-06-30 12:15:15 -04:00
Duncan Sommerville
133f1b72ca
Remove min-height on datatables for now
2015-06-29 11:32:28 -04:00
Duncan Sommerville
9d60a3d130
Move Help Translate Airtime link to help menu
2015-06-26 14:27:27 -04:00
Duncan Sommerville
3a51e66b07
Add transifex link to login page
2015-06-26 13:25:19 -04:00
Duncan Sommerville
6497bc28c5
Show collapsible sections (other than 'dangerous settings') by default on preferences page
2015-06-25 17:43:15 -04:00
Albert Santoni
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
Albert Santoni
57d63ebb19
Backport some CSS fixes
2015-06-16 11:17:41 -04:00
Albert Santoni
f4ff00355d
Added Radio Page link
2015-06-12 17:21:46 -04:00
Albert Santoni
505d6fbc57
Fixed some issues with embedded schedule widget style
2015-06-11 15:04:59 -04:00
Albert Santoni
1efc47beb9
Tweaked layout of the embed widgets page
2015-06-11 14:30:52 -04:00
drigato
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
drigato
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
drigato
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
Duncan Sommerville
15bebc6267
Dangerous options subform on Preferences page and Delete all tracks button
2015-05-13 15:56:08 -04:00
Albert Santoni
be614415de
SAAS-757: metadata edit window goes under the header menu
2015-04-30 10:29:43 -04:00
Albert Santoni
c1af91bb9a
Suspension notice layout fix
2015-04-29 13:58:50 -04:00
Albert Santoni
49456318ff
Fix layout being too narrow sometimes
2015-04-29 13:22:22 -04:00
Duncan Sommerville
574fdf4b27
Merged 2.5.x into saas
2015-04-27 14:01:28 -04:00
Duncan Sommerville
4b307d6b47
Fix for vertical scrollbar issue
2015-04-27 13:52:55 -04:00
Albert Santoni
5d25fcea2d
Style tweaks to the suspension notice.
2015-04-17 12:58:05 -04:00
Albert Santoni
1964cbb75e
Merge branch 'saas' into saas-suspend
2015-04-17 12:18:56 -04:00
Albert Santoni
3695049a6c
Added Admin_Only decorator and greyed out read-only text-areas
2015-04-14 14:35:37 -04:00
Albert Santoni
088ada1d2c
Reformatted Bootstrap, added Station Suspended notice
2015-04-10 17:14:56 -04:00
duncan
3fe1a46c41
Fixed dropdown menus not behaving correctly
2015-03-26 12:50:53 -04:00
Duncan Sommerville
040eb1443d
CSS fixes to make page header more responsive
2015-03-25 17:29:28 -04:00
Albert Santoni
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
Albert Santoni
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
Duncan Sommerville
936d11b367
Merge branch '2.5.x-albertenhancements' into saas
2015-02-27 17:21:20 -05:00
Duncan Sommerville
78c7170c4e
Reformatted logo remove button to use Zend
2015-02-27 17:19:37 -05:00
Albert Santoni
e13e4413ea
Merge remote-tracking branch 'origin/2.5.x-albertenhancements' into saas
2015-02-24 15:03:06 -05:00
Duncan Sommerville
5e256df061
Added remove button for station logo on preferences page
2015-02-24 12:12:30 -05:00
Duncan Sommerville
69d588d2f6
Merge branch '2.5.x' into 2.5.x-albertenhancements
2015-02-24 10:45:52 -05:00
Albert Santoni
fd42c67b0b
Merge branch 'saas' of github.com:sourcefabric/Airtime into saas
2015-01-21 18:08:05 -05:00
Duncan Sommerville
345b2b5d26
Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas
2015-01-21 15:14:34 -05:00
drigato
2fadc8f8f1
Merge branch '2.5.x' into saas
...
Conflicts:
CREDITS
2015-01-20 11:44:53 -05:00
Albert Santoni
620029c04e
Stop Chrome from flashing white between page loads
2015-01-15 16:45:14 -05:00
