Commit Graph

5208 Commits

Author SHA1 Message Date
Duncan Sommerville 1fd7f0ea36 Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev 2015-09-02 11:22:32 -04:00
Duncan Sommerville 63f563f06d Fix calendar context menu word wrapping 2015-09-02 11:22:24 -04:00
Albert Santoni 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
Albert Santoni 6251fd62d5 Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev 2015-09-02 10:42:23 -04:00
Albert Santoni 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
Duncan Sommerville 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
Duncan Sommerville a99bc26715 Set autofocus on login username field 2015-09-01 16:07:16 -04:00
Duncan Sommerville f283d69481 Add vertical scrollbar to recent uploads table 2015-09-01 14:27:54 -04:00
Duncan Sommerville 46e126145e CC-6122 - change library behaviour for guest users 2015-09-01 13:53:59 -04:00
Duncan Sommerville f7a7d4c042 Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder 2015-08-31 15:25:27 -04:00
Duncan Sommerville f21e53b12e CC-6121 - Fix up user settings page 2015-08-31 15:25:17 -04:00
Albert Santoni e0cb33b89c Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder 2015-08-31 15:03:25 -04:00
Duncan Sommerville c1e2daaac4 CC-6114 - Remove New button from nav bar 2015-08-31 13:48:22 -04:00
drigato fa340c3e30 SAAS-976: September 1st: Undo the billing page changes for the August promotion 2015-08-31 13:37:20 -04:00
Duncan Sommerville 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
drigato 2748f223de CC-6092: Calendar add show form style issues 2015-08-31 12:32:07 -04:00
Albert Santoni 765211da39 Merge branch 'saas-showbuilder' into saas-showbuilder-colors 2015-08-28 21:11:26 -04:00
Albert Santoni e1d5126e8b Pick default colors for the calendar based on start time 2015-08-28 18:16:55 -04:00
drigato b312189a7b CC-6105: DJs can edit playlists, smartblocks, and webstreams they do not own 2015-08-28 17:46:03 -04:00
Albert Santoni 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 901ca54fd6 CC-6095 - placeholder div for empty library views; placeholder icons 2015-08-28 15:40:32 -04:00
Albert Santoni 6446c9e314 Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder 2015-08-28 14:28:18 -04:00
Albert Santoni 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
drigato 6811646aaa CC-6106: Permission problems with bulk and single edit in the Dashboard 2015-08-28 13:40:38 -04:00
Albert Santoni f36ff944c2 SAAS-1031: Can't add tracks to a new playlist 2015-08-28 13:22:08 -04:00
Albert Santoni 91cad81c4b Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder 2015-08-28 13:07:08 -04:00
Albert Santoni b2edaa8668 Merge branch 'saas' into saas-showbuilder 2015-08-28 13:07:00 -04:00
Albert Santoni 17074e5f70 SAAS-1032: Shows with missing show art on disk can't be edited 2015-08-28 12:28:34 -04:00
drigato c4cb856283 CC-6078: Help page updates
Added a 'File a Support Ticket' link
2015-08-28 12:18:44 -04:00
drigato f597ee075e CC-6078: Help page updates
Removed help center link
2015-08-28 11:55:22 -04:00
drigato eb2f7263c8 CC-6078: Help page updates 2015-08-28 11:45:00 -04:00
drigato e3b09e9aa9 Make widgets page accessible to all user types 2015-08-28 11:32:19 -04:00
Albert Santoni 8c90fbe4eb Added metadata editor title and ellipsis 2015-08-27 20:23:53 -04:00
Albert Santoni 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
Albert Santoni 099fc0107e Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder 2015-08-27 19:04:18 -04:00
Albert Santoni 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
Duncan Sommerville 294298c9bf CC-6096, CC-6093 - update calendar context menu and usability hint wording; bugfixes 2015-08-27 16:59:21 -04:00
Duncan Sommerville acc4ef0054 CC-6085, CC-6101 - uploader styling 2015-08-27 15:44:59 -04:00
Duncan Sommerville ef892bb565 Fix some small bugs with Dashboard navigation links 2015-08-26 17:02:01 -04:00
Duncan Sommerville 7d8c6dc90d Fix upload page styling 2015-08-26 16:11:49 -04:00
drigato c728be38ab CC-6078: Help page updates
Small text changes
Removed about page
2015-08-26 14:37:32 -04:00
Albert Santoni 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
drigato 706caa8458 SAAS-1025: Restyle the billing page
Fix header padding
Change current plan font
2015-08-26 11:27:00 -04:00
drigato 7e1fe030fe SAAS-1025: Restyle the billing page
Changed pricing grid header
Added paypal and 2checkout badges
2015-08-26 10:26:03 -04:00
drigato 9951abd897 SAAS-1025: Restyle the billing page
Make Account Plans the default view
2015-08-26 09:16:06 -04:00
drigato 6ecb208962 SAAS-1021: Billing page restyle 2015-08-26 09:11:25 -04:00
Duncan Sommerville afa3b47e42 Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder 2015-08-25 17:09:17 -04:00
Duncan Sommerville 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
Albert Santoni b6cf517d10 CC-6093: Review and fix the usability hints text 2015-08-25 16:48:31 -04:00
Albert Santoni 498b3243e0 Fix navbar highlights when navigating via usability hints 2015-08-25 16:43:10 -04:00