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
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
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
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
1db1af3f2e
Merge branch 'saas-dev' into saas-showbuilder-fade-editor-restyling
2015-09-04 11:21:00 -04:00
274881c6e0
Add _pro macros to a bunch of billing page stuff
2015-09-04 11:17:01 -04: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
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
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
c020e3449d
SAAS-1044 - fix links in usability hints
2015-09-02 12:55:36 -04:00
9d373791c0
SAAS-1038 - fix bug where 403's weren't being redirected properly
2015-09-02 12:23:23 -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
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
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
e0cb33b89c
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
2015-08-31 15:03:25 -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
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
2748f223de
CC-6092: Calendar add show form style issues
2015-08-31 12:32:07 -04:00
765211da39
Merge branch 'saas-showbuilder' into saas-showbuilder-colors
2015-08-28 21:11:26 -04:00
e1d5126e8b
Pick default colors for the calendar based on start time
2015-08-28 18:16:55 -04:00
b312189a7b
CC-6105: DJs can edit playlists, smartblocks, and webstreams they do not own
2015-08-28 17:46:03 -04:00
311956eb74
CC-6069: Pick consistent design for New buttons
...
* First shot at blue New buttons
2015-08-28 16:21:20 -04:00
Duncan Sommerville
drigato
Duncan Sommerville
Albert Santoni