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
901ca54fd6
CC-6095 - placeholder div for empty library views; placeholder icons
2015-08-28 15:40:32 -04:00
6446c9e314
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
2015-08-28 14:28:18 -04:00
e743c3589e
More smart block and playlist editor improvements
...
* Fixed smart block/playlist form validation error messages not showing up.
* Improved styling of all save/error messages across the application.
* Removed broken fade editors
2015-08-28 14:27:18 -04:00
6811646aaa
CC-6106: Permission problems with bulk and single edit in the Dashboard
2015-08-28 13:40:38 -04:00
f36ff944c2
SAAS-1031: Can't add tracks to a new playlist
2015-08-28 13:22:08 -04:00
91cad81c4b
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
2015-08-28 13:07:08 -04:00
b2edaa8668
Merge branch 'saas' into saas-showbuilder
2015-08-28 13:07:00 -04:00
17074e5f70
SAAS-1032: Shows with missing show art on disk can't be edited
2015-08-28 12:28:34 -04:00
c4cb856283
CC-6078: Help page updates
...
Added a 'File a Support Ticket' link
2015-08-28 12:18:44 -04:00
f597ee075e
CC-6078: Help page updates
...
Removed help center link
2015-08-28 11:55:22 -04:00
eb2f7263c8
CC-6078: Help page updates
2015-08-28 11:45:00 -04:00
e3b09e9aa9
Make widgets page accessible to all user types
2015-08-28 11:32:19 -04:00
8c90fbe4eb
Added metadata editor title and ellipsis
2015-08-27 20:23:53 -04:00
a08d5b71cf
Calendar colour adjustments
...
* CC-6099: Improve default show colour
* CC-6100: Choose show background colours randomly from a predefined palette
2015-08-27 20:02:32 -04:00
099fc0107e
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
2015-08-27 19:04:18 -04:00
b6f33f6083
Completed smart block, playlist, and webstream editor form overhauls
...
* CC-6088: Smart Block form needs to have a form layout
* CC-6089: Editor view name fields must be made <input> fields
* CC-6103: Cannot create webstreams
* Reworked a big chunk of the smart block editor flow to send only the
playlist contents back rather than the entire HTML fragment for the
editor.
* Keep more of the playlist/smartblock editor view persistent across
saves, generates, and shuffles.
2015-08-27 19:00:23 -04:00
294298c9bf
CC-6096, CC-6093 - update calendar context menu and usability hint wording; bugfixes
2015-08-27 16:59:21 -04:00
acc4ef0054
CC-6085, CC-6101 - uploader styling
2015-08-27 15:44:59 -04:00
ef892bb565
Fix some small bugs with Dashboard navigation links
2015-08-26 17:02:01 -04:00
7d8c6dc90d
Fix upload page styling
2015-08-26 16:11:49 -04:00
c728be38ab
CC-6078: Help page updates
...
Small text changes
Removed about page
2015-08-26 14:37:32 -04:00
98ac8fd851
Major layout work on the smartblock and playlist editors
...
* CC-6088: Smart Block form needs to have a form layout
* CC-6089: Editor view name fields must be made <input> fields
2015-08-26 13:10:51 -04:00
706caa8458
SAAS-1025: Restyle the billing page
...
Fix header padding
Change current plan font
2015-08-26 11:27:00 -04:00
7e1fe030fe
SAAS-1025: Restyle the billing page
...
Changed pricing grid header
Added paypal and 2checkout badges
2015-08-26 10:26:03 -04:00
9951abd897
SAAS-1025: Restyle the billing page
...
Make Account Plans the default view
2015-08-26 09:16:06 -04:00
6ecb208962
SAAS-1021: Billing page restyle
2015-08-26 09:11:25 -04:00
afa3b47e42
Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder
2015-08-25 17:09:17 -04:00
84baef1996
CC-6097, CC-6091, CC-6080, CC-6066 - css fixes and more work on add/remove content screen
2015-08-25 17:09:05 -04:00
b6cf517d10
CC-6093: Review and fix the usability hints text
2015-08-25 16:48:31 -04:00
498b3243e0
Fix navbar highlights when navigating via usability hints
2015-08-25 16:43:10 -04:00
b99ec51863
CC-6102: Can't upload M4A and FLAC anymore - rejected by dropzone
2015-08-25 15:15:03 -04:00
700c3c4005
Merge branch 'saas-dev' into saas-showbuilder
2015-08-25 13:27:40 -04:00
161746fbae
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
2015-08-25 13:16:11 -04:00
d4527a0460
CC-6091: Settings->General doesn't highlight when you click Settings
2015-08-25 13:15:57 -04:00
0c50247909
SAAS-1022: Re-implement disk quota status on side nav bar
...
Small css fix
2015-08-25 13:09:07 -04:00
a41793666d
Merge branch 'saas-showbuilder' of https://github.com/sourcefabric/Airtime into saas-showbuilder
2015-08-25 12:43:15 -04:00
2da431895f
SAAS-1022: Re-implement disk quota status on side nav bar
...
Changed "upload" page layout - panels are side by side and storage
status is at bottom of left panel
2015-08-25 12:43:08 -04:00
371a26ff97
Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder
2015-08-25 11:46:30 -04:00
afe6ca7002
Cosmetic updates
2015-08-25 11:46:20 -04:00
3592eceb22
Merge branch 'saas' into saas-dev
2015-08-24 17:11:52 -04:00
e188fcde32
Merge branch 'saas-dev' into saas-showbuilder
2015-08-24 16:53:32 -04:00
e6761b54da
CC-6066 - more work on add/remove content screen
2015-08-24 12:05:57 -04:00
6cfc2db0ca
CC-6086 - fix logout button redirecting to a 404 from certain pages when no baseurl is set
2015-08-21 14:29:00 -04:00
812dca9409
CC-6066 - initial work on add/remove content dialog; some selection fixes
2015-08-21 14:19:28 -04:00
604b81071c
CC-6084 - fix calendar drag and drop
2015-08-21 11:09:45 -04:00
48f1c5b9a4
Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder
...
Conflicts:
airtime_mvc/application/layouts/scripts/page-sub-menu.phtml
2015-08-21 11:09:07 -04:00
277a066534
Layout and styling fixes for sub-menu layout pages
2015-08-21 10:43:20 -04:00
6f0b7f6d32
SAAS-1022: Re-implement disk quota status on side nav bar
...
Layout tweak
2015-08-21 10:06:40 -04:00
38d9963a8d
SAAS-1024: Merge layout.phtml and page-sub-menu.phtml
2015-08-21 09:25:01 -04:00
f48c7186ca
SAAS-1022: Re-implement disk quota status on side nav bar
2015-08-21 09:08:36 -04:00
d9455f86ea
Change menu item order and change trial box position
2015-08-20 10:56:11 -04:00
beb0eed1c8
Make muses 'pixel' invisible, remove scrollbar from player widget page
2015-08-19 17:33:55 -04:00
a8955e2ea1
Fix side-menu position
2015-08-19 17:18:42 -04:00
cfa543e835
Small adjustment to logo
2015-08-19 16:59:04 -04:00
93d2d8ad67
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
...
Conflicts:
airtime_mvc/application/layouts/scripts/page-sub-menu.phtml
2015-08-19 15:00:35 -04:00
f82558a5c0
Navigation sidebar finalization
2015-08-19 14:59:33 -04:00
42bbfc3834
Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder
2015-08-19 13:02:16 -04:00
ae66b2272b
Fix editor styling and layout issues
2015-08-19 13:02:14 -04:00
8dcd0a2595
CC-6071: Icons for navigation bar
2015-08-19 12:58:31 -04:00
59a9862ba3
CC-6072: Wrapper has weird positioning during page load
2015-08-19 10:56:41 -04:00
8afc652ff1
Submenu and body background color tweaks
2015-08-18 18:40:09 -04:00
504a720ff2
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
2015-08-18 17:52:26 -04:00
2c443bd27a
Some navbar and page title fixes
2015-08-18 17:52:23 -04:00
0ad51dae09
Fix add/remove content dialog, try to increase speed of selection/deselection
2015-08-18 17:46:16 -04:00
a84c33f0ed
Cleanup and fix media type selector highlight in calendar page
2015-08-18 17:29:23 -04:00
a04f5afcbd
More navbar and submenu layout fixes
2015-08-18 17:13:17 -04:00
13a60c39b9
Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder
2015-08-18 15:30:31 -04:00
3f25ab2647
CC-6079 - merge and remove underscore files
2015-08-18 15:23:42 -04:00
ac974e56a9
Fixed ColReorder includes in ScheduleController.php
2015-08-18 15:08:03 -04:00
a271b53c2e
CC-6077: Implement actions menu for library view
2015-08-18 14:55:32 -04:00
4bfb8fa0cb
CC-6067 - deselect when adding library items
2015-08-18 12:01:23 -04:00
d30e32c2d3
Merge branch 'saas-showbuilder' of https://github.com/sourcefabric/Airtime into saas-showbuilder
2015-08-18 07:46:39 -04:00
4adb9cc55a
CC-6070 - standardize editor buttons
2015-08-17 18:34:39 -04:00
38022f4ff0
SAAS-1019: Re-work Navigation Menu
...
Added user settings to the Settings sub-menu
2015-08-17 16:22:55 -04:00
e5f5ff4c88
SAAS-1019: Re-work Navigation Menu
...
Created Widget sub menu and moved widgets into separate controller
actions
2015-08-17 16:15:26 -04:00
74a1e0929d
Fixed styling on Listener Stats page
2015-08-17 16:08:58 -04:00
3aee9a49bc
SAAS-1019: Re-work Navigation Menu
2015-08-17 12:46:32 -04:00
8aa39ae28d
Moved datatables translation stuff to PHP for consistency
2015-08-14 20:00:05 -04:00
7ce9dfa1b3
SAAS-948 - add title to library pane
2015-08-14 15:33:45 -04:00
fb1f22b913
SAAS-948 - css tweaks
2015-08-14 13:29:26 -04:00
Duncan Sommerville
Albert Santoni
drigato
Duncan Sommerville