Commit Graph

7020 Commits

Author SHA1 Message Date
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
Albert Santoni ea0121f5c1 Cleanup and capitalisation for the Table widget 2015-09-17 15:09:50 -04:00
Albert Santoni 8a7a97f48e Updated the podcast table widget columns 2015-09-17 15:06:51 -04:00
Albert Santoni 0826c64719 Refactor table widget to use prototype inheritance better 2015-09-17 14:52:32 -04:00
drigato d31e0f950d Fix podcast api permission 2015-09-17 13:19:11 -04:00
Albert Santoni 9f03115ee5 Custom button event handlers for new table widget 2015-09-17 13:07:22 -04:00
Albert Santoni 71919ad529 Basic integration of table widget into Dashboard podcasts view 2015-09-16 18:32:16 -04:00
Duncan Sommerville 39b2bd6a86 Actually move library search bar out of header; add angular.js to libs 2015-09-16 17:58:16 -04:00
Duncan Sommerville a78a0d0cc8 * Fix track number bug in analyzer
* Move library search bar out of header
2015-09-16 17:50:21 -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 7006b55818 js tweaks 2015-09-16 11:26:11 -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
Albert Santoni e55e99365b SAAS-1068: Crossfade button broken when editing new smart block
* Shouldn't have been enabled in the first place.
2015-09-15 17:27:20 -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
Localizer fe5db4761e updated translation resources 2015-09-14 10:01:23 +00:00
Albert Santoni 4851b01540 Force more tracks to be shown in the library view 2015-09-11 12:54:28 -04:00
Duncan Sommerville 2d2ed25fcc CC-6137 - datatables is the devil 2015-09-10 16:47:36 -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
Duncan Sommerville 1649d9db77 Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev 2015-09-09 17:25:45 -04:00
Duncan Sommerville fb1ee2e284 Fix some issues with the users page 2015-09-09 17:25:40 -04:00
Albert Santoni 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
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 03e23daba0 Apply highlight to active submenu item 2015-09-08 17:42:52 -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
Localizer b80c18c288 updated translation resources 2015-09-07 10:34:19 +00:00
Localizer 57e3059c16 updated translation resources 2015-09-05 08:34:23 +00:00
Albert Santoni 84a1f9071b Merge branch 'saas-showbuilder-fade-editor-restyling' into saas-dev 2015-09-04 18:36:26 -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
Duncan Sommerville 65ffe43589 Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev 2015-09-04 16:11:48 -04:00
Duncan Sommerville 3dc8a5f98d CC-6135 - fix playlist bugs 2015-09-04 16:11:41 -04:00
Duncan Sommerville ba26adc904 CC-6130 - fix empty placeholders appearing when search returns no results 2015-09-04 15:37:04 -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 8499fd989c Regenerate the translation files 2015-09-04 11:17:18 -04:00
Albert Santoni 274881c6e0 Add _pro macros to a bunch of billing page stuff 2015-09-04 11:17:01 -04:00
Localizer d4287e9abd updated translation resources 2015-09-04 14:47:15 +00:00
Localizer d257daa510 updated translation resources 2015-09-04 08:16:31 +00: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 56a8293be6 Fix plupload typo 2015-09-03 15:04:46 -04:00
Duncan Sommerville 363305fa8d Fix blank tracks view when no local session is set 2015-09-03 14:56:57 -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 888762739e SAAS-1050 - fix track remove buttons in playlist/smart block editors 2015-09-03 12:09:55 -04:00
Albert Santoni 9071c8d4b6 Update the translations 2015-09-03 10:26:33 -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 80d78e9fc5 SAAS-1043 - fix flexbox settings for editors to work in firefox 2015-09-02 13:08:16 -04:00
Duncan Sommerville c020e3449d SAAS-1044 - fix links in usability hints 2015-09-02 12:55:36 -04:00
Duncan Sommerville 69293703f2 SAAS-1041 - add confirmation window when deleting a user 2015-09-02 12:53:24 -04:00
Duncan Sommerville 0722225211 Front end tweaks and fixes 2015-09-02 12:45:37 -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 c45f1ddd1c SAAS-1039 - add processing overlay to listener stats screen 2015-09-02 11:52:43 -04:00
Duncan Sommerville 3e29ecad79 CC-6128 - open placeholder 'Learn more' links in new tab 2015-09-02 11:41:51 -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 92f722452a Adjust user settings form widths to be consistent 2015-09-01 16:05:59 -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
Albert Santoni c7d926f8e8 Merge branch 'saas-dev' into saas-showbuilder 2015-08-31 17:11:07 -04:00
Albert Santoni bfa01e45aa Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev 2015-08-31 17:10:51 -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 b0e9b41b0c Nudge the Airtime logo over a bit to center it better 2015-08-31 15:07:13 -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 109a336504 CC-6124 - Fix Add to Current Playlist button 2015-08-31 14:36:44 -04:00
Duncan Sommerville 7c9f0a09ae Fix button styling bugs 2015-08-31 14:21:35 -04:00
Duncan Sommerville f64d7096d1 Fix button styling bugs 2015-08-31 14:21:09 -04:00
Duncan Sommerville cd7d07e5f5 CC-6119 - Fix New button styling 2015-08-31 14:01:31 -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 d2f46882c1 CC-6113 - Remove select dropdown from library pane 2015-08-31 13:35:46 -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
Duncan Sommerville e06f88cd49 CC-6116 - Library new buttons keep colour when disabled 2015-08-31 13:30:00 -04:00
Duncan Sommerville e633bc8899 CC-6112 - Remove button labels at small screen resolutions 2015-08-31 13:25:29 -04:00
Duncan Sommerville 5e024023eb CC-6110 - Change header to be more responsive 2015-08-31 13:10:16 -04:00
Localizer 34a7019c5b updated translation resources 2015-08-31 17:07:52 +00:00
Duncan Sommerville d7d27d3c36 Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder 2015-08-31 12:35:27 -04:00
Duncan Sommerville 2611766498 CC-6109 - Fix display of long usernames in header panel 2015-08-31 12:35:20 -04:00
drigato 2748f223de CC-6092: Calendar add show form style issues 2015-08-31 12:32:07 -04:00
drigato e349c3013c CC-6107: Webstreams datatable should refresh when new webstream is created 2015-08-31 10:03:26 -04:00
drigato 582bc292aa CC-6108: Manage User table layout is messed up 2015-08-31 09:26:22 -04:00
Albert Santoni 765211da39 Merge branch 'saas-showbuilder' into saas-showbuilder-colors 2015-08-28 21:11:26 -04:00
Albert Santoni f8d1ee09b2 Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder 2015-08-28 20:09:11 -04:00
Albert Santoni 21eb3c502e Fixed New Show button sliding when you clicked on the calendar 2015-08-28 20:08:52 -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 13f62cc118 Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder 2015-08-28 16:21:53 -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 8a3f36dea3 Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder 2015-08-28 16:09:26 -04:00
Duncan Sommerville 005eec5aa5 CC-6095 - better styling for learn about x links 2015-08-28 16:09:18 -04:00
Albert Santoni 71f149f95f Unbreak the playlist form during reordering 2015-08-28 15:57:57 -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