Commit graph

437 commits

Author SHA1 Message Date
Duncan Sommerville
15bebc6267 Dangerous options subform on Preferences page and Delete all tracks button 2015-05-13 15:56:08 -04:00
drigato
10ca987a51 SAAS-762: Implement schedule widget design 2015-05-12 11:56:35 -04:00
drigato
4941ae1a6d Separated weekly schedule widget css into separate file 2015-05-07 14:27:59 -04:00
drigato
f375115825 Merge branch 'saas' into saas-landing-page 2015-05-04 09:40:26 -04:00
Albert Santoni
d1dfa9d3be Fixed add/remove content dialog being too low 2015-04-30 10:50:23 -04:00
Albert Santoni
be614415de SAAS-757: metadata edit window goes under the header menu 2015-04-30 10:29:43 -04:00
Duncan Sommerville
950dd22697 Fix for add remove media popup layout 2015-04-29 14:45:14 -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
drigato
7d1b112db9 Stopped redirecting to /login if no valid session 2015-04-21 11:26:48 -04:00
drigato
9cee7bcc86 Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas 2015-04-20 10:05:55 -04:00
drigato
926d1704bf SAAS-723: Add compatibility chart to player page 2015-04-20 09:59:17 -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
drigato
caa591bd5e Player - set fixed height for metadata area 2015-04-10 11:07:42 -04:00
drigato
4d7d48d6fb Player - fix height 2015-04-10 10:55:39 -04:00
drigato
f238faa937 SAAS-712: UI Improvements 2015-04-09 14:22:50 -04:00
drigato
4429117f6a SAAS-712: UI Improvements 2015-04-09 09:43:15 -04:00
drigato
23bf866211 SAAS-712: UI Improvements 2015-04-08 14:01:57 -04:00
drigato
4ab4fe5cb9 Fixed player css so long artist and track names don't overflow 2015-04-02 15:00:46 -04:00
drigato
fdd8cdfaea Fixed Airtime badge spacing 2015-04-02 14:35:13 -04:00
drigato
06f43ef2d7 CSS modifications
Added fixed width and height to player.
Floated Airtime badge to the right
2015-04-02 12:45:05 -04:00
drigato
0bffa07ed9 SAAS-669: Long station names overlap with link to airtime.pro 2015-04-01 12:59:31 -04:00
drigato
eaeed9be77 SAAS-669: Long station names overlap with link to airtime.pro 2015-04-01 12:50:49 -04:00
drigato
c1038cd92f SAAS-706: Remove volume bar from player 2015-04-01 11:25:58 -04:00
drigato
220f21ab22 Merge branch 'saas' into saas-embed-player
Conflicts:
	airtime_mvc/application/configs/ACL.php
2015-03-31 17:44:14 -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
drigato
17358a761f SAAS-663: Integrate player design 2015-03-25 11:44: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
drigato
5a373ac604 Merge branch 'saas' into saas-embed-player 2015-03-23 15:46:03 -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
drigato
ed891fb145 Committing lots of trial and error embed player code changes 2015-03-18 14:23:38 -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
d46f4a52eb Installer tweaks and a pypo bugfix
* Moved all the remaining DEB requirements into the requirements files
* The installer should now be distro agnostic (unless you ask it to
  install third-party deps for you)
* Fixed pypo not being able to find replaygainupdater
* Tweaked a bunch of styling for the installer
2015-02-10 18:06:46 -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
c03dd38c00 Merge branch '2.5.x' into 2.5.x-installer
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/models/Show.php
2015-01-16 17:27:52 -05:00
Duncan Sommerville
44018b2cbf Changed status page to use config-check (tentative) and removed time-intensive check in index routing 2015-01-16 16:15:16 -05:00
Albert Santoni
620029c04e Stop Chrome from flashing white between page loads 2015-01-15 16:45:14 -05:00
Albert Santoni
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