Commit Graph

14018 Commits

Author SHA1 Message Date
Duncan Sommerville 9d60a3d130 Move Help Translate Airtime link to help menu 2015-06-26 14:27:27 -04:00
Duncan Sommerville 881471c6b8 SAAS-793 - Prevent show image upload when editing single instance of a repeating show 2015-06-26 14:23:45 -04:00
Duncan Sommerville 7e0b6ac7ba Add transifex link constant 2015-06-26 13:28:05 -04:00
Duncan Sommerville 3a51e66b07 Add transifex link to login page 2015-06-26 13:25:19 -04:00
Duncan Sommerville 6b9899d11c SAAS-882 - Switch edit user page to use new-style csrf generation 2015-06-26 10:45:26 -04:00
Duncan Sommerville 79f51f77cb Merge branch '2.5.x-installer' into saas-dev 2015-06-25 18:21:40 -04:00
Duncan Sommerville c59f401eb1 Fix shift selection in library and builder views 2015-06-25 18:21:22 -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
Duncan Sommerville 87bdc01318 Merge branch 'saas-dev' of https://github.com/sourcefabric/Airtime into saas-dev 2015-06-25 14:13:25 -04:00
Duncan Sommerville 6fb9c6a30c SAAS-885, SAAS-857, SAAS-878 - Cosmetic fixes, remove js widget box in preferences 2015-06-25 14:13:09 -04:00
Albert Santoni d54eb37317 Merge branch 'saas' into saas-dev 2015-06-24 15:19:38 -04:00
Duncan Sommerville 616cf143d5 SAAS-877 - Fix live-info-v2 behaviour 2015-06-24 14:28:04 -04:00
Duncan Sommerville ef957fe0aa SAAS-877 - Fix errors 2015-06-24 13:07:13 -04:00
Duncan Sommerville fd8194e7d8 Fix error getting media 2015-06-24 12:40:51 -04:00
Duncan Sommerville ffc3ef1bc9 SAAS-877 - Update live-info-v2 api 2015-06-24 12:31:32 -04:00
Duncan Sommerville 7645f67515 SAAS-877 - Update live-info-v2 api 2015-06-24 12:18:52 -04:00
Albert Santoni 195935cccf Slightly better exception handling and logging to help with SAAS-884 2015-06-22 15:49:23 -04:00
Duncan Sommerville a3f1cf1d56 CC-6060 - Fix breaking tooltips when viewing context menu in library 2015-06-22 10:47:34 -04:00
Duncan Sommerville e36c8a16d4 CC-6060 - Fix breaking tooltips when viewing context menu in library 2015-06-22 10:46:29 -04:00
Albert Santoni 1bb6ee63dc SAAS-867: Embedded player spins in endless loop if connection is refused 2015-06-19 15:30:51 -04:00
Albert Santoni 74b403897d Merge branch 'saas' of github.com:sourcefabric/Airtime into saas 2015-06-19 14:23:46 -04:00
Albert Santoni 19adb062cf SAAS-879 and add FAQ to Help menu
* SAAS-879: When trying to save changes in the user setting pages
  changes do not save and goes to a "an error hass occured page"
2015-06-19 14:22:58 -04:00
Duncan Sommerville 62b4de5162 Merge branch 'saas' into saas-dev
Conflicts:
	airtime_mvc/application/views/scripts/systemstatus/index.phtml
2015-06-18 10:24:44 -04:00
Duncan Sommerville 298ee30e9d Move misplaced tag 2015-06-18 10:03:12 -04:00
Duncan Sommerville 88bd3c9bc2 SAAS-872 - Load disk information statically 2015-06-18 10:03:05 -04:00
Duncan Sommerville 080c2c43b5 Add soundcloud callback file for saas routing 2015-06-17 17:39:37 -04:00
Duncan Sommerville f7dc349995 Merge branch '2.5.x-installer' into saas-dev 2015-06-17 16:42:29 -04:00
Duncan Sommerville 9ba6ab3ef7 Add modrewrite conditions to apache 2.4 vhost template 2015-06-17 14:53:31 -04:00
Duncan Sommerville 6e520f3bc0 Add fields to airtime.example.conf for compatibility, remove /etc/init scripts to prevent duplicate processes on startup 2015-06-17 14:52:41 -04:00
Duncan Sommerville af2f757985 Move misplaced tag 2015-06-17 14:52:04 -04:00
Duncan Sommerville 92ad5bde6d Add fields to airtime.example.conf for compatibility, remove /etc/init scripts to prevent duplicate processes on startup 2015-06-17 14:49:12 -04:00
Duncan Sommerville 8f59d18f34 Merge branch '2.5.x-installer' into saas-dev 2015-06-17 14:11:30 -04:00
Duncan Sommerville 4b3b3b5b93 SAAS-872 - Load disk information statically 2015-06-17 13:44:14 -04:00
Duncan Sommerville ece81c3419 Fix bug where /airtime* named vhosts could break installation 2015-06-17 13:12:47 -04:00
Albert Santoni 627343a626 Fixed the status page 2015-06-16 18:18:34 -04:00
Albert Santoni 8d114c7d6e Merge branch '2.5.x' into 2.5.x-installer 2015-06-16 16:34:22 -04:00
Albert Santoni 0f58e315e6 Merge branch 'saas-cc-6055' into saas 2015-06-16 16:13:40 -04:00
Albert Santoni 0b6fb9882a Fix provisioning 2015-06-16 16:04:20 -04:00
drigato a338616aca Add max-width to logo on radio page 2015-06-16 15:38:21 -04:00
Albert Santoni 61272cd42c Handle 404s with the correct error page, and don't log them 2015-06-16 14:58:27 -04:00
Albert Santoni 90bd0a1ab4 Attempt at fixing Sentry error logging 2015-06-16 14:35:29 -04:00
drigato 709b9bbeec CC-6059: Default station logo broken in Audio Preview popup 2015-06-16 13:37:05 -04:00
drigato 68a02e3c95 Radio page background scrolling issue on small screens 2015-06-16 12:53:07 -04:00
drigato 4bebe1e0fb Radio page fixes 2015-06-16 12:50:40 -04:00
Albert Santoni 91d391c80c Merge branch '2.5.x-installer' into saas-dev
Conflicts:
	airtime_mvc/public/.htaccess
2015-06-16 11:32:45 -04:00
Albert Santoni 674d748149 CC-6058: htaccess should be combined into apache site config 2015-06-16 11:32:09 -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 8c9981a155 Merge branch '2.5.x' into 2.5.x-installer
Conflicts:
	airtime_mvc/public/index.php
2015-06-16 10:37:06 -04:00
Albert Santoni aa286efee4 Testing htaccess fix and fixed background cover scrolling issue in Chrome on Android 2015-06-15 17:54:28 -04:00