Commit graph

6958 commits

Author SHA1 Message Date
Duncan Sommerville
8cc5e5835c Fix double processing icon when adding/removing tracks from playlists 2015-09-29 12:00:02 -04:00
Albert Santoni
a9eb3f737d Merge branch 'saas-dev' of https://github.com/sourcefabric/Airtime into saas-dev 2015-09-29 11:50:18 -04:00
Albert Santoni
6f185d094b SAAS-1095: Unknown schedule type: array 2015-09-29 11:49:53 -04:00
Duncan Sommerville
99a5f7facb Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev
Conflicts:
	airtime_mvc/build/sql/defaultdata.sql
2015-09-29 11:37:53 -04:00
Duncan Sommerville
f5afc0957f SAAS-1087 - fix DJ list overflow + styling 2015-09-29 11:36:00 -04:00
Duncan Sommerville
7a44a05cb2 Style tweaks 2015-09-29 11:28:30 -04:00
Duncan Sommerville
a75a9676f2 More robust solution for not showing what's new popup to new users 2015-09-29 11:28:20 -04:00
Albert Santoni
41cf4b389a Cleanup for defaultdata.sql 2015-09-29 11:03:19 -04:00
Duncan Sommerville
477708ecc9 Style tweaks 2015-09-29 10:29:21 -04:00
Albert Santoni
f1c5a8b244 Fix the timezone/language picker and fix the What's New dialog popping up for new users 2015-09-29 09:19:33 -04:00
Albert Santoni
6658fca10b Some polish for the What's New popup 2015-09-28 22:17:34 -04:00
Albert Santoni
943048dd87 Hacky fix for SAAS-1090 - Allow airtime-system to work with session optimizations 2015-09-28 17:48:04 -04:00
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
e03428327c Fixed missing return statement 2015-09-25 15:54:26 -04:00
Albert Santoni
8b6833180d Refactored double Set-Cookie prevention code, and session reopening code 2015-09-25 12:03:10 -04:00
Albert Santoni
91c584ba16 Test alternate session reopening code to alleviate double Set-Cookie header 2015-09-25 11:37:36 -04:00
Albert Santoni
c03e9cbe9a SAAS-1085: Optimization - Don't start sessions unless we actually need them. 2015-09-25 10:41:51 -04:00
Albert Santoni
a86e3ed4a8 Improvements to the preferences screen 2015-09-23 18:21:30 -04:00
Albert Santoni
13d1534042 Merge pull request #124 from danielhjames/saas
IN-1956 Update Transifex project link
2015-09-22 11:47:33 -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
Daniel James
ad2e26a1c3 IN-1956 Update Transifex project link 2015-09-21 17:44:00 +01: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