Commit Graph

14530 Commits

Author SHA1 Message Date
Duncan Sommerville 67c20630a3 UI revamp what's new dialog 2015-09-28 17:19:02 -04:00
Albert Santoni d3f5b046f3 Colour palette improved for the calendar 2015-09-25 17:56:29 -04:00
Albert Santoni 479153df17 Merge branch 'saas' into saas-dev
Conflicts:
	airtime_mvc/public/css/billing.css
2015-09-21 18:01:56 -04:00
Albert Santoni 2a79424a64 Increase the CSRF token timeout 2015-09-21 18:00:04 -04:00
Albert Santoni a810010448 Dropped percentage from educational discount 2015-09-18 14:01:30 -04:00
Albert Santoni 2cad7c1848 Added educational pricing page link 2015-09-18 13:59:55 -04:00
Albert Santoni 8308ce9cac October promo banner 2015-09-17 15:38:00 -04:00
Albert Santoni 3d07260a9d Small VAT checker bugfix 2015-09-17 15:17:18 -04:00
Albert Santoni e55e99365b SAAS-1068: Crossfade button broken when editing new smart block
* Shouldn't have been enabled in the first place.
2015-09-15 17:27:20 -04:00
Duncan Sommerville 893d60ed44 Revert "SAAS-1061 - implement podcast list view skeleton; small bugfixes"
This reverts commit 0fcf6a8dac.
2015-09-14 18:29:43 -04:00
Duncan Sommerville 0fcf6a8dac SAAS-1061 - implement podcast list view skeleton; small bugfixes 2015-09-14 18:26:28 -04:00
Localizer fe5db4761e updated translation resources 2015-09-14 10:01:23 +00:00
Albert Santoni 4851b01540 Force more tracks to be shown in the library view 2015-09-11 12:54:28 -04:00
Duncan Sommerville 2d2ed25fcc CC-6137 - datatables is the devil 2015-09-10 16:47:36 -04:00
Albert Santoni 3586845549 Merge branch 'saas' into saas-dev 2015-09-10 10:37:45 -04:00
Albert Santoni 32f5492e85 Merge branch 'saas' of github.com:sourcefabric/Airtime into saas 2015-09-09 18:59:44 -04:00
Albert Santoni c77749a096 SAAS: Show logo is deleted on disk when a show instance is deleted
* Default to returning the station logo in response if we can't find the
  show logo on disk (but it's in our DB).
2015-09-09 18:59:00 -04:00
Duncan Sommerville b26d4833fe Merge branch 'saas' into saas-dev 2015-09-09 18:47:53 -04:00
Duncan Sommerville 2296aab8d5 Fix bug where show logo was removed when deleting an instance of a repeating show 2015-09-09 18:47:43 -04:00
Duncan Sommerville 1649d9db77 Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev 2015-09-09 17:25:45 -04:00
Duncan Sommerville fb1ee2e284 Fix some issues with the users page 2015-09-09 17:25:40 -04:00
Albert Santoni 1f319f84a4 Two small radio page tweaks
* SAAS-1055: Radio Page About tab scales poorly with small viewport
heights
* Also fixed misaligned of currently playing track with mobile view
2015-09-09 16:03:25 -04:00
drigato bd4fc62e04 Merge branch 'saas-dev' of https://github.com/sourcefabric/Airtime into saas-dev
Conflicts:
	airtime_mvc/public/js/airtime/library/spl.js
2015-09-09 13:55:27 -04:00
drigato 2569ce4d0a CC-6136: Playlist fade values don't get or set properly
Fix smartblock design and fade out saving bug
2015-09-09 13:54:16 -04:00
Duncan Sommerville 03e23daba0 Apply highlight to active submenu item 2015-09-08 17:42:52 -04:00
Duncan Sommerville e6494e7ff0 Better way to disable and reenable xfade button in playlist/sb editors 2015-09-08 16:56:55 -04:00
Duncan Sommerville 8c3f1cf535 Fix some issues with playlist/smart-block fade buttons 2015-09-08 16:44:33 -04:00
Duncan Sommerville 5c7d9fe31c Change links for SoundCloud functionality to use same casing as navigation 2015-09-08 16:15:08 -04:00
Duncan Sommerville 17c2ec2fd4 Fix responsiveness bugs 2015-09-08 15:25:28 -04:00
drigato c2d1b788c5 Added missing opening php tag on billing - upgrades page 2015-09-08 11:03:33 -04:00
Localizer b80c18c288 updated translation resources 2015-09-07 10:34:19 +00:00
Localizer 57e3059c16 updated translation resources 2015-09-05 08:34:23 +00:00
Albert Santoni 84a1f9071b Merge branch 'saas-showbuilder-fade-editor-restyling' into saas-dev 2015-09-04 18:36:26 -04:00
Albert Santoni de322171df CC-6118: Playlist crossfade panel needs restyling
* Fixed it as much as possible. Unfortunately, the milliseconds are dropped
  by Propel so we should probably restrict the fade time to whole
  seconds....
2015-09-04 18:35:11 -04:00
Duncan Sommerville 65ffe43589 Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev 2015-09-04 16:11:48 -04:00
Duncan Sommerville 3dc8a5f98d CC-6135 - fix playlist bugs 2015-09-04 16:11:41 -04:00
Duncan Sommerville ba26adc904 CC-6130 - fix empty placeholders appearing when search returns no results 2015-09-04 15:37:04 -04:00
Albert Santoni 1db1af3f2e Merge branch 'saas-dev' into saas-showbuilder-fade-editor-restyling 2015-09-04 11:21:00 -04:00
Albert Santoni 68a22ccb49 Added a README_TRANSLATIONS file 2015-09-04 11:20:41 -04:00
Albert Santoni 8499fd989c Regenerate the translation files 2015-09-04 11:17:18 -04:00
Albert Santoni 274881c6e0 Add _pro macros to a bunch of billing page stuff 2015-09-04 11:17:01 -04:00
Localizer d4287e9abd updated translation resources 2015-09-04 14:47:15 +00:00
Localizer d257daa510 updated translation resources 2015-09-04 08:16:31 +00:00
Duncan Sommerville 53b835715a Fix responsiveness of upload page 2015-09-03 15:51:09 -04:00
Duncan Sommerville 83cd51de92 Reword usability hint text to match calendar context menu 2015-09-03 15:42:27 -04:00
Duncan Sommerville 56a8293be6 Fix plupload typo 2015-09-03 15:04:46 -04:00
Duncan Sommerville 363305fa8d Fix blank tracks view when no local session is set 2015-09-03 14:56:57 -04:00
Duncan Sommerville f396bb4390 CSS tweaks 2015-09-03 14:51:58 -04:00
Duncan Sommerville 4e0f3ddd99 SAAS-1046 - remove misplaced ) character; add some translation strings to LocaleController 2015-09-03 13:53:43 -04:00
Duncan Sommerville c928627d8b CC-6131 - add div to show when search is active; css tweaks 2015-09-03 13:41:29 -04:00