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
Duncan Sommerville
Albert Santoni
drigato
Duncan Sommerville
Localizer