Commit Graph

5430 Commits

Author SHA1 Message Date
Duncan Sommerville a75a9676f2 More robust solution for not showing what's new popup to new users 2015-09-29 11:28:20 -04:00
Albert Santoni f1c5a8b244 Fix the timezone/language picker and fix the What's New dialog popping up for new users 2015-09-29 09:19:33 -04:00
Albert Santoni 6658fca10b Some polish for the What's New popup 2015-09-28 22:17:34 -04:00
Albert Santoni 943048dd87 Hacky fix for SAAS-1090 - Allow airtime-system to work with session optimizations 2015-09-28 17:48:04 -04:00
Duncan Sommerville 67c20630a3 UI revamp what's new dialog 2015-09-28 17:19:02 -04:00
Duncan Sommerville d09941dffa Set TaskManager run interval back to 30 seconds 2015-09-28 14:15:08 -04:00
Duncan Sommerville c1a16d7973 Add filter string to generic Table object; add call to refetch podcast episode table data 2015-09-28 14:14:01 -04:00
Duncan Sommerville 375d83ab43 Update to podcast frontend 2015-09-28 10:40:04 -04:00
Albert Santoni d3f5b046f3 Colour palette improved for the calendar 2015-09-25 17:56:29 -04:00
Albert Santoni e03428327c Fixed missing return statement 2015-09-25 15:54:26 -04:00
Albert Santoni 8b6833180d Refactored double Set-Cookie prevention code, and session reopening code 2015-09-25 12:03:10 -04:00
Albert Santoni 91c584ba16 Test alternate session reopening code to alleviate double Set-Cookie header 2015-09-25 11:37:36 -04:00
Albert Santoni c03e9cbe9a SAAS-1085: Optimization - Don't start sessions unless we actually need them. 2015-09-25 10:41:51 -04:00
Duncan Sommerville 43e9fb59ce SAAS-1071 - more work on celery backend for podcasts; add upgrade to make file_id field in third_party_track_references nullable 2015-09-24 15:57:38 -04:00
Duncan Sommerville ca51dcf3ae SAAS-1071 - more work on backend podcast implementation 2015-09-24 12:58:02 -04:00
Duncan Sommerville dcb30b3aa7 Move file extension check to before database object insertion 2015-09-24 12:57:19 -04:00
Duncan Sommerville 778b67982b Remove duplicate imports and add new table imports to ScheduleController 2015-09-24 12:56:32 -04:00
drigato c587dcf4e4 Added extra fields to podcast table 2015-09-24 10:32:16 -04:00
Albert Santoni a86e3ed4a8 Improvements to the preferences screen 2015-09-23 18:21:30 -04:00
drigato 07b63abfe1 Small Podcast API fix 2015-09-23 15:54:42 -04:00
drigato e610ce8af7 Fix for switching to simplepie 2015-09-23 15:35:24 -04:00
drigato 4de42ada6e Disable simplepie caching 2015-09-23 14:50:32 -04:00
drigato 727abac0b8 Switch Podcast reader to use simplepie 2015-09-23 14:47:40 -04:00
Duncan Sommerville 827a83392f Remove unnecessary fields from bulk get, add explicit casting back to podcast item array for testing 2015-09-22 20:24:53 -04:00
Duncan Sommerville 55d5fc62a2 SAAS-1071 - more work on celery backend 2015-09-22 20:22:06 -04:00
Duncan Sommerville ee1ceb9281 Update TaskManager to be a bit easier to extend 2015-09-22 20:21:19 -04:00
Albert Santoni 3790b0fa81 Merge branch 'saas-dev-publishing' of github.com:sourcefabric/Airtime into saas-dev-publishing
Conflicts:
	airtime_mvc/public/js/airtime/library/podcast.js
2015-09-22 18:37:41 -04:00
Albert Santoni ed33714340 SAAS-1064: Publish action for library context menu 2015-09-22 18:33:27 -04:00
Duncan Sommerville 44a5e5a240 Improve tabs functionality and add comments 2015-09-22 17:34:24 -04:00
Duncan Sommerville 50996a081f Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing 2015-09-22 15:27:18 -04:00
Duncan Sommerville 4238d5a201 Refactor tabs functionality 2015-09-22 15:27:08 -04:00
Duncan Sommerville cf1de5fb66 SAAS-1071 - initial work on podcast celery backend; tweak SoundCloud service 2015-09-22 15:26:08 -04:00
Duncan Sommerville 79db208cd4 Refactor SoundCloud/Third party controllers to fit new service architecture 2015-09-22 14:18:48 -04:00
Albert Santoni 13d1534042 Merge pull request #124 from danielhjames/saas
IN-1956 Update Transifex project link
2015-09-22 11:47:33 -04:00
drigato d86b00c53e SAAS-1077: REST API for podcast episodes
Empty PUT action
2015-09-22 11:19:39 -04:00
drigato 0fc324f3ba SAAS-1077: REST API for podcast episodes 2015-09-22 11:13:18 -04:00
Albert Santoni 5bd8a508b1 Merge branch 'saas-dev' into saas-dev-publishing
Conflicts:
	airtime_mvc/public/js/airtime/library/spl.js
2015-09-21 18:12:27 -04:00
Albert Santoni 479153df17 Merge branch 'saas' into saas-dev
Conflicts:
	airtime_mvc/public/css/billing.css
2015-09-21 18:01:56 -04:00
Albert Santoni 2a79424a64 Increase the CSRF token timeout 2015-09-21 18:00:04 -04:00
Albert Santoni a21c4612c9 Renamed a podcast.js function for clarity 2015-09-21 17:59:31 -04:00
Duncan Sommerville f9ace20075 Simplify third-party/celery/soundcloud implementation 2015-09-21 17:03:46 -04:00
Albert Santoni b721545c68 Stub publish action for context menu 2015-09-21 16:54:00 -04:00
Duncan Sommerville 4115f4939e Frontend tweaks 2015-09-21 15:37:57 -04:00
drigato 77a53491b0 Merge branch 'saas-dev-publishing' of https://github.com/sourcefabric/Airtime into saas-dev-publishing 2015-09-21 14:51:55 -04:00
drigato 3198d822bf SAAS-1058: Podcast table schema
Remove not null constraint on podcast_episodes file_id column
2015-09-21 14:51:32 -04:00
Daniel James ad2e26a1c3 IN-1956 Update Transifex project link 2015-09-21 17:44:00 +01:00
Duncan Sommerville 373ff55923 Frontend tweaks to podcasting + new abstract datatables functionality 2015-09-21 12:40:05 -04:00
drigato 3db20bd3b5 Merge branch 'saas-dev-publishing' of https://github.com/sourcefabric/Airtime into saas-dev-publishing 2015-09-21 07:08:55 -04:00
drigato 1445e85795 SAAS-1058: Podcast table schema
Changed podcast table column sizes
Added some podcast table column size validation
2015-09-20 12:06:51 -04:00
Duncan Sommerville 0710accbe2 SAAS-1062 - more work on podcasting frontend 2015-09-18 18:29:50 -04:00
Duncan Sommerville a6450353e5 Add missing phtml file 2015-09-18 15:52:54 -04:00
Duncan Sommerville 7da1f86659 Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing 2015-09-18 15:39:19 -04:00
Duncan Sommerville 6de6e2767c SAAS-1062 - Podcast skeleton work; slight rework to backend functionality 2015-09-18 15:39:12 -04:00
Duncan Sommerville be39b6b7c0 * Initial podcast skeleton functionality
* Rename SoundCloud/Celery classes to fit conventions
* Small fixes to Table class functionality
2015-09-18 15:34:55 -04:00
drigato 11f3aa7b76 Fix typo 2015-09-18 14:36:54 -04:00
Albert Santoni a810010448 Dropped percentage from educational discount 2015-09-18 14:01:30 -04:00
Albert Santoni 2cad7c1848 Added educational pricing page link 2015-09-18 13:59:55 -04:00
drigato d95b5a9034 SAAS-1063: REST API for podcasts
Update composer.json with rss reader library
2015-09-18 09:52:24 -04:00
drigato 9a2e9d1b3b SAAS-1058: Podcast table schema
Renamed podcast_contents to podcast_episodes
Added new columns to podcast_episodes table
2015-09-18 09:51:44 -04:00
drigato f6f23864ce SAAS-1063: REST API for podcasts
/rest/podcast mostly done
2015-09-18 08:15:48 -04:00
Albert Santoni 8308ce9cac October promo banner 2015-09-17 15:38:00 -04:00
Albert Santoni 3d07260a9d Small VAT checker bugfix 2015-09-17 15:17:18 -04:00
drigato d31e0f950d Fix podcast api permission 2015-09-17 13:19:11 -04:00
Albert Santoni 71919ad529 Basic integration of table widget into Dashboard podcasts view 2015-09-16 18:32:16 -04:00
Duncan Sommerville dc840bf25f Fix bad file extension 2015-09-16 15:31:59 -04:00
Duncan Sommerville cce18ec911 Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing 2015-09-16 15:29:18 -04:00
Duncan Sommerville 9ed3145473 Create oauth controller interface for oauth-specific actions; small refactoring on tabs.js 2015-09-16 15:29:10 -04:00
drigato c1899f18af remove comment 2015-09-16 15:07:38 -04:00
drigato 2ede56c26d Merge branch 'saas-dev-publishing' of https://github.com/sourcefabric/Airtime into saas-dev-publishing 2015-09-16 14:22:34 -04:00
drigato 67db2c1d25 SAAS-1063: REST API for podcasts
Hierarchy routing is working
Basic implentation of podcast INDEX and POST actions done
2015-09-16 14:22:13 -04:00
Duncan Sommerville 8dcea06077 * Move tab functionality to a separate module
* Fix broken library placeholders
* Restrict tab width and add text panning to tab name
* General bugfixing and cleanup of tab functionality
2015-09-15 18:53:25 -04:00
Duncan Sommerville 0d80f857d3 Fix broken import 2015-09-15 16:08:19 -04:00
Duncan Sommerville 7b76c8d6d3 Rename CeleryService to avoid confusion; fix wording and reduce redundancy in task functions 2015-09-15 15:06:03 -04:00
Duncan Sommerville a444751397 Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing 2015-09-15 14:21:27 -04:00
Albert Santoni f6a33802db Merge branch 'saas-dev-tablerefactor' into saas-dev-publishing 2015-09-15 14:21:53 -04:00
Duncan Sommerville ff24976bed Fix up celery downloads a bit 2015-09-15 14:21:19 -04:00
Albert Santoni ffdc83dc26 Reusable datatable control that hooks up to any of our REST APIs
* Implements item selection (single, shift, ctrl), pagination, and
  sorting. To be used in the future.
* Added example code for how to use the table widget
* Temporarily added a table test page to the DashboardController
2015-09-15 14:18:35 -04:00
drigato 73d154ba17 Merge branch 'saas-dev-publishing' of https://github.com/sourcefabric/Airtime into saas-dev-publishing 2015-09-15 14:07:59 -04:00
Duncan Sommerville c8baa6e4b3 Merge branch 'saas-dev-publishing' into soundcloud
Conflicts:
	airtime_mvc/application/views/scripts/playlist/playlist.phtml
	airtime_mvc/application/views/scripts/playlist/smart-block.phtml
	airtime_mvc/public/js/airtime/library/spl.js
2015-09-15 14:03:11 -04:00
drigato 1a26679357 SAAS-1058: Podcast table schema
Add additional podcast table column - type
2015-09-15 14:00:26 -04:00
Duncan Sommerville dd09676f88 Hide celery user 2015-09-15 13:59:48 -04:00
Duncan Sommerville 893d60ed44 Revert "SAAS-1061 - implement podcast list view skeleton; small bugfixes"
This reverts commit 0fcf6a8dac.
2015-09-14 18:29:43 -04:00
Duncan Sommerville 8c65ba8f66 SAAS-1061 - implement podcast list view skeleton; small bugfixes
Conflicts:
	airtime_mvc/public/js/airtime/library/library.js
2015-09-14 18:29:13 -04:00
Duncan Sommerville 0fcf6a8dac SAAS-1061 - implement podcast list view skeleton; small bugfixes 2015-09-14 18:26:28 -04:00
drigato 28493497fd SAAS-1058: Podcast table schema
SAAS-1059: Add description field to cc_files
2015-09-14 17:00:54 -04:00
Albert Santoni 3586845549 Merge branch 'saas' into saas-dev 2015-09-10 10:37:45 -04:00
Albert Santoni 32f5492e85 Merge branch 'saas' of github.com:sourcefabric/Airtime into saas 2015-09-09 18:59:44 -04:00
Albert Santoni 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
Duncan Sommerville b26d4833fe Merge branch 'saas' into saas-dev 2015-09-09 18:47:53 -04:00
Duncan Sommerville 2296aab8d5 Fix bug where show logo was removed when deleting an instance of a repeating show 2015-09-09 18:47:43 -04:00
drigato 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
drigato 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
Duncan Sommerville e6494e7ff0 Better way to disable and reenable xfade button in playlist/sb editors 2015-09-08 16:56:55 -04:00
Duncan Sommerville 8c3f1cf535 Fix some issues with playlist/smart-block fade buttons 2015-09-08 16:44:33 -04:00
Duncan Sommerville 63784d4e6b Fix some behaviour with playlist/smartblock fade button 2015-09-08 16:39:33 -04:00
Duncan Sommerville d18d52a37a Merge branch 'saas-dev' into soundcloud 2015-09-08 16:15:24 -04:00
Duncan Sommerville 5c7d9fe31c Change links for SoundCloud functionality to use same casing as navigation 2015-09-08 16:15:08 -04:00
Duncan Sommerville f243014d9f Merge branch 'saas-dev' into soundcloud 2015-09-08 16:01:06 -04:00
Duncan Sommerville 17c2ec2fd4 Fix responsiveness bugs 2015-09-08 15:25:28 -04:00
drigato c2d1b788c5 Added missing opening php tag on billing - upgrades page 2015-09-08 11:03:33 -04:00
Albert Santoni 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
Albert Santoni 1db1af3f2e Merge branch 'saas-dev' into saas-showbuilder-fade-editor-restyling 2015-09-04 11:21:00 -04:00
Albert Santoni 274881c6e0 Add _pro macros to a bunch of billing page stuff 2015-09-04 11:17:01 -04:00
Duncan Sommerville 53b835715a Fix responsiveness of upload page 2015-09-03 15:51:09 -04:00
Duncan Sommerville 83cd51de92 Reword usability hint text to match calendar context menu 2015-09-03 15:42:27 -04:00
Duncan Sommerville f396bb4390 CSS tweaks 2015-09-03 14:51:58 -04:00
Duncan Sommerville 4e0f3ddd99 SAAS-1046 - remove misplaced ) character; add some translation strings to LocaleController 2015-09-03 13:53:43 -04:00
Duncan Sommerville c928627d8b CC-6131 - add div to show when search is active; css tweaks 2015-09-03 13:41:29 -04:00
Duncan Sommerville 4b5980d898 Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev 2015-09-02 18:17:19 -04:00
Duncan Sommerville daf854af04 Fix some issues with search, hack to always display options buttons in library view 2015-09-02 18:17:11 -04:00
Albert Santoni 65fd40bd6e CC-6115: Redesign the navbar upload button 2015-09-02 17:39:00 -04:00
Albert Santoni 7a91677d01 Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev 2015-09-02 16:25:35 -04:00
Albert Santoni 01b3ae1bf0 Allow smart blocks with no criteria 2015-09-02 16:25:30 -04:00
Duncan Sommerville ab11974799 Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev 2015-09-02 15:28:44 -04:00
Duncan Sommerville 63ce022a8d SAAS-1040 - station logo functionality improvements 2015-09-02 15:28:36 -04:00
Albert Santoni f05157c376 Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev 2015-09-02 15:07:31 -04:00
Albert Santoni 6046f8843b CC-6129: Static smart block errors don't appear 2015-09-02 15:07:17 -04:00
Duncan Sommerville 8d0cfdc202 Fix empty-name playlist bug 2015-09-02 13:58:38 -04:00
Duncan Sommerville c020e3449d SAAS-1044 - fix links in usability hints 2015-09-02 12:55:36 -04:00
Duncan Sommerville 9d373791c0 SAAS-1038 - fix bug where 403's weren't being redirected properly 2015-09-02 12:23:23 -04:00
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
drigato 34e7c09ab7 CC-6118: Playlist crossfade panel needs restyling
Started re-styling the playlist fade editor
2015-09-01 12:05:08 -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