Commit Graph

7068 Commits

Author SHA1 Message Date
Duncan Sommerville c0372c1745 Fix webstream tab change behaviour 2015-09-30 12:07:31 -04:00
Duncan Sommerville 2ee7e4bf71 SAAS-1088 - move 'All My Shows' checkbox to dropdown instead 2015-09-30 11:38:33 -04:00
Duncan Sommerville 258500f650 SAAS-1102 - fix datatables pagination layout issues 2015-09-30 11:24:29 -04:00
Duncan Sommerville efa3999041 SAAS-1016 - fix some stream settings not being saved correctly 2015-09-30 10:30:32 -04:00
drigato bdab0f7b1a Revert medatdata editor fix 2015-09-30 10:03:34 -04:00
drigato f91d28e3f2 Css fix for playlist editor 2015-09-30 09:02:35 -04:00
drigato 2e024bcfdd Css fixes for metadata and playlist editors 2015-09-30 08:58:39 -04:00
drigato c7dd2e7256 Working on changing schema 2015-09-30 08:53:13 -04:00
Localizer 4b882064f2 updated translation resources 2015-09-30 11:32:44 +00:00
Albert Santoni 8b33acacd3 Merge branch 'saas-sessionoptimizations' into saas-3.x-sessionoptimizations
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/configs/constants.php
	airtime_mvc/application/controllers/LoginController.php
	airtime_mvc/application/controllers/UserController.php
	airtime_mvc/public/js/airtime/preferences/preferences.js
2015-09-29 18:58:55 -04:00
Duncan Sommerville 70e538ebb4 SAAS-1069 - disable add button when track metadata tab is open 2015-09-29 16:39:54 -04:00
Duncan Sommerville c08994a60b Fix bug where user could open mutiple copies of same webstream tab 2015-09-29 16:34:23 -04:00
Duncan Sommerville 80515ef263 Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev 2015-09-29 16:26:47 -04:00
Duncan Sommerville d3e9665063 Fix bug where switching to a webstream tab would throw an error 2015-09-29 16:26:39 -04:00
drigato 81bf601a12 SAAS-1099: Dashboard messed up in Safari 2015-09-29 16:03:14 -04:00
Duncan Sommerville 3df1081c60 SAAS-1088 - fix broken 'all my shows' checkbox 2015-09-29 15:51:09 -04:00
Duncan Sommerville 3fcc3c507a Fix tabs bug 2015-09-29 15:09:09 -04:00
Duncan Sommerville 0029844fa7 Fix layout of schedule tracks dialog 2015-09-29 13:54:43 -04:00
Albert Santoni f25457d1eb SAAS-1098: Max filesize restricted by new uploader 2015-09-29 13:29:06 -04:00
drigato b00ac6750c Testing 2015-09-29 13:04:22 -04:00
Albert Santoni eb5fcec485 SAAS-1096: Tabs layout in Schedule Tracks broken in Firefox, sometimes Chrome 2015-09-29 13:02:22 -04:00
Albert Santoni 4c52bd99f6 Temporarily fix the Help video label breaking the Help page layout 2015-09-29 12:36:56 -04:00
Duncan Sommerville c2cd768398 SAAS-1094 - fix selector for scheduled show selection + context menu 2015-09-29 12:27:45 -04:00
Duncan Sommerville f4fad13eb8 SAAS-1086 - centre cursor when dragging 2015-09-29 12:07:24 -04:00
Duncan Sommerville db1e69c00f Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev 2015-09-29 12:00:07 -04:00
Duncan Sommerville 8cc5e5835c Fix double processing icon when adding/removing tracks from playlists 2015-09-29 12:00:02 -04:00
Albert Santoni a9eb3f737d Merge branch 'saas-dev' of https://github.com/sourcefabric/Airtime into saas-dev 2015-09-29 11:50:18 -04:00
Albert Santoni 6f185d094b SAAS-1095: Unknown schedule type: array 2015-09-29 11:49:53 -04:00
Duncan Sommerville 99a5f7facb Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev
Conflicts:
	airtime_mvc/build/sql/defaultdata.sql
2015-09-29 11:37:53 -04:00
Duncan Sommerville f5afc0957f SAAS-1087 - fix DJ list overflow + styling 2015-09-29 11:36:00 -04:00
Duncan Sommerville 7a44a05cb2 Style tweaks 2015-09-29 11:28:30 -04:00
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 41cf4b389a Cleanup for defaultdata.sql 2015-09-29 11:03:19 -04:00
Duncan Sommerville 477708ecc9 Style tweaks 2015-09-29 10:29:21 -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
Duncan Sommerville febc5fa99d SAAS-1089 - fix scrolling in metadata editor 2015-09-28 10:17:40 -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 a24565669b Fix bug where library would sometimes reference wrong table 2015-09-24 15:55:37 -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
Duncan Sommerville e5deae89a4 Generalize datatables style fixes 2015-09-24 12:54:24 -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 c5b00e56bb Fix bug that prevented multiple podcast tabs from being opened 2015-09-23 12:38:08 -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
Duncan Sommerville 576a457fdb Small tweaks to tabs, fix merge conflicts in podcast 2015-09-22 20:19:57 -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
Albert Santoni 73e489fdc8 Cleanup a comment 2015-09-21 15:41:24 -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 18fb0f3509 Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing 2015-09-18 18:29:54 -04:00
Duncan Sommerville 0710accbe2 SAAS-1062 - more work on podcasting frontend 2015-09-18 18:29:50 -04:00
Albert Santoni 515d892f6e Fixed small table widget ctrl-selection bug 2015-09-18 16:11:49 -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 6934bcfdab Update tabs functionality 2015-09-18 15:38:00 -04:00
Duncan Sommerville 6900af8d47 Fix bug where switching from #podcast to other media view would not work as intended 2015-09-18 15:37:41 -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