479153df17
Merge branch 'saas' into saas-dev
...
Conflicts:
airtime_mvc/public/css/billing.css
2015-09-21 18:01:56 -04:00
2a79424a64
Increase the CSRF token timeout
2015-09-21 18:00:04 -04:00
ad2e26a1c3
IN-1956 Update Transifex project link
2015-09-21 17:44:00 +01:00
a810010448
Dropped percentage from educational discount
2015-09-18 14:01:30 -04:00
2cad7c1848
Added educational pricing page link
2015-09-18 13:59:55 -04:00
8308ce9cac
October promo banner
2015-09-17 15:38:00 -04:00
3d07260a9d
Small VAT checker bugfix
2015-09-17 15:17:18 -04:00
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
893d60ed44
Revert "SAAS-1061 - implement podcast list view skeleton; small bugfixes"
...
This reverts commit 0fcf6a8dac
2015-09-14 18:29:43 -04:00
0fcf6a8dac
SAAS-1061 - implement podcast list view skeleton; small bugfixes
2015-09-14 18:26:28 -04:00
fe5db4761e
updated translation resources
2015-09-14 10:01:23 +00:00
4851b01540
Force more tracks to be shown in the library view
2015-09-11 12:54:28 -04:00
2d2ed25fcc
CC-6137 - datatables is the devil
2015-09-10 16:47:36 -04:00
3586845549
Merge branch 'saas' into saas-dev
2015-09-10 10:37:45 -04:00
32f5492e85
Merge branch 'saas' of github.com:sourcefabric/Airtime into saas
2015-09-09 18:59:44 -04:00
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
b26d4833fe
Merge branch 'saas' into saas-dev
2015-09-09 18:47:53 -04:00
2296aab8d5
Fix bug where show logo was removed when deleting an instance of a repeating show
2015-09-09 18:47:43 -04:00
1649d9db77
Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev
2015-09-09 17:25:45 -04:00
fb1ee2e284
Fix some issues with the users page
2015-09-09 17:25:40 -04:00
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
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
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
03e23daba0
Apply highlight to active submenu item
2015-09-08 17:42:52 -04:00
e6494e7ff0
Better way to disable and reenable xfade button in playlist/sb editors
2015-09-08 16:56:55 -04:00
8c3f1cf535
Fix some issues with playlist/smart-block fade buttons
2015-09-08 16:44:33 -04:00
5c7d9fe31c
Change links for SoundCloud functionality to use same casing as navigation
2015-09-08 16:15:08 -04:00
17c2ec2fd4
Fix responsiveness bugs
2015-09-08 15:25:28 -04:00
c2d1b788c5
Added missing opening php tag on billing - upgrades page
2015-09-08 11:03:33 -04:00
b80c18c288
updated translation resources
2015-09-07 10:34:19 +00:00
57e3059c16
updated translation resources
2015-09-05 08:34:23 +00:00
84a1f9071b
Merge branch 'saas-showbuilder-fade-editor-restyling' into saas-dev
2015-09-04 18:36:26 -04:00
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
65ffe43589
Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev
2015-09-04 16:11:48 -04:00
3dc8a5f98d
CC-6135 - fix playlist bugs
2015-09-04 16:11:41 -04:00
ba26adc904
CC-6130 - fix empty placeholders appearing when search returns no results
2015-09-04 15:37:04 -04:00
1db1af3f2e
Merge branch 'saas-dev' into saas-showbuilder-fade-editor-restyling
2015-09-04 11:21:00 -04:00
8499fd989c
Regenerate the translation files
2015-09-04 11:17:18 -04:00
274881c6e0
Add _pro macros to a bunch of billing page stuff
2015-09-04 11:17:01 -04:00
d4287e9abd
updated translation resources
2015-09-04 14:47:15 +00:00
d257daa510
updated translation resources
2015-09-04 08:16:31 +00:00
53b835715a
Fix responsiveness of upload page
2015-09-03 15:51:09 -04:00
83cd51de92
Reword usability hint text to match calendar context menu
2015-09-03 15:42:27 -04:00
56a8293be6
Fix plupload typo
2015-09-03 15:04:46 -04:00
363305fa8d
Fix blank tracks view when no local session is set
2015-09-03 14:56:57 -04:00
f396bb4390
CSS tweaks
2015-09-03 14:51:58 -04:00
4e0f3ddd99
SAAS-1046 - remove misplaced ) character; add some translation strings to LocaleController
2015-09-03 13:53:43 -04:00
c928627d8b
CC-6131 - add div to show when search is active; css tweaks
2015-09-03 13:41:29 -04:00
888762739e
SAAS-1050 - fix track remove buttons in playlist/smart block editors
2015-09-03 12:09:55 -04:00
9071c8d4b6
Update the translations
2015-09-03 10:26:33 -04:00
4b5980d898
Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev
2015-09-02 18:17:19 -04:00
daf854af04
Fix some issues with search, hack to always display options buttons in library view
2015-09-02 18:17:11 -04:00
65fd40bd6e
CC-6115: Redesign the navbar upload button
2015-09-02 17:39:00 -04:00
7a91677d01
Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev
2015-09-02 16:25:35 -04:00
01b3ae1bf0
Allow smart blocks with no criteria
2015-09-02 16:25:30 -04:00
ab11974799
Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev
2015-09-02 15:28:44 -04:00
63ce022a8d
SAAS-1040 - station logo functionality improvements
2015-09-02 15:28:36 -04:00
f05157c376
Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev
2015-09-02 15:07:31 -04:00
6046f8843b
CC-6129: Static smart block errors don't appear
2015-09-02 15:07:17 -04:00
8d0cfdc202
Fix empty-name playlist bug
2015-09-02 13:58:38 -04:00
80d78e9fc5
SAAS-1043 - fix flexbox settings for editors to work in firefox
2015-09-02 13:08:16 -04:00
c020e3449d
SAAS-1044 - fix links in usability hints
2015-09-02 12:55:36 -04:00
69293703f2
SAAS-1041 - add confirmation window when deleting a user
2015-09-02 12:53:24 -04:00
0722225211
Front end tweaks and fixes
2015-09-02 12:45:37 -04:00
9d373791c0
SAAS-1038 - fix bug where 403's weren't being redirected properly
2015-09-02 12:23:23 -04:00
c45f1ddd1c
SAAS-1039 - add processing overlay to listener stats screen
2015-09-02 11:52:43 -04:00
3e29ecad79
CC-6128 - open placeholder 'Learn more' links in new tab
2015-09-02 11:41:51 -04:00
1fd7f0ea36
Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev
2015-09-02 11:22:32 -04:00
63f563f06d
Fix calendar context menu word wrapping
2015-09-02 11:22:24 -04:00
a17001a90a
Merge branch 'saas' into saas-dev
...
Conflicts:
airtime_mvc/application/views/scripts/billing/upgrade.phtml
airtime_mvc/public/css/billing.css
2015-09-02 10:47:37 -04:00
6251fd62d5
Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev
2015-09-02 10:42:23 -04:00
6959c459cd
Scheduler transaction improvement and preferences transaction removal
...
* Added a transaction to createAndFillShowInstancesPastPopulatedUntilDate
to ensure two requests don't trigger duplicate repeated show instances
in the calendar.
* Removed the transaction from setValue() in Preference and opt for
a row-level lock instead.
2015-09-02 10:40:38 -04:00
37df86723d
CC-6127 - Add 'Use station default' option to user settings timezone, don't set user timezone by default when creating the admin user
2015-09-01 16:10:33 -04:00
a99bc26715
Set autofocus on login username field
2015-09-01 16:07:16 -04:00
92f722452a
Adjust user settings form widths to be consistent
2015-09-01 16:05:59 -04:00
f283d69481
Add vertical scrollbar to recent uploads table
2015-09-01 14:27:54 -04:00
46e126145e
CC-6122 - change library behaviour for guest users
2015-09-01 13:53:59 -04:00
34e7c09ab7
CC-6118: Playlist crossfade panel needs restyling
...
Started re-styling the playlist fade editor
2015-09-01 12:05:08 -04:00
c7d926f8e8
Merge branch 'saas-dev' into saas-showbuilder
2015-08-31 17:11:07 -04:00
bfa01e45aa
Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev
2015-08-31 17:10:51 -04:00
f7a7d4c042
Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder
2015-08-31 15:25:27 -04:00
f21e53b12e
CC-6121 - Fix up user settings page
2015-08-31 15:25:17 -04:00
b0e9b41b0c
Nudge the Airtime logo over a bit to center it better
2015-08-31 15:07:13 -04:00
e0cb33b89c
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
2015-08-31 15:03:25 -04:00
109a336504
CC-6124 - Fix Add to Current Playlist button
2015-08-31 14:36:44 -04:00
7c9f0a09ae
Fix button styling bugs
2015-08-31 14:21:35 -04:00
f64d7096d1
Fix button styling bugs
2015-08-31 14:21:09 -04:00
cd7d07e5f5
CC-6119 - Fix New button styling
2015-08-31 14:01:31 -04:00
c1e2daaac4
CC-6114 - Remove New button from nav bar
2015-08-31 13:48:22 -04:00
fa340c3e30
SAAS-976: September 1st: Undo the billing page changes for the August promotion
2015-08-31 13:37:20 -04:00
d2f46882c1
CC-6113 - Remove select dropdown from library pane
2015-08-31 13:35:46 -04:00
c6a6a97c55
CC-6117 - Change submit button text for file metadata editor so behaviour is consistent with button text
2015-08-31 13:33:23 -04:00
e06f88cd49
CC-6116 - Library new buttons keep colour when disabled
2015-08-31 13:30:00 -04:00
e633bc8899
CC-6112 - Remove button labels at small screen resolutions
2015-08-31 13:25:29 -04:00
5e024023eb
CC-6110 - Change header to be more responsive
2015-08-31 13:10:16 -04:00
34a7019c5b
updated translation resources
2015-08-31 17:07:52 +00:00
d7d27d3c36
Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder
2015-08-31 12:35:27 -04:00
2611766498
CC-6109 - Fix display of long usernames in header panel
2015-08-31 12:35:20 -04:00
2748f223de
CC-6092: Calendar add show form style issues
2015-08-31 12:32:07 -04:00
e349c3013c
CC-6107: Webstreams datatable should refresh when new webstream is created
2015-08-31 10:03:26 -04:00
Albert Santoni
Daniel James
Duncan Sommerville
Localizer
drigato
Duncan Sommerville