Commit Graph

2334 Commits

Author SHA1 Message Date
Duncan Sommerville c3c4abdd0c Merge branch 'saas-dev' into saas-dev-publishing
Conflicts:
	airtime_mvc/public/css/dashboard.css
	airtime_mvc/public/css/styles.css
	airtime_mvc/public/js/airtime/library/library.js
	airtime_mvc/public/js/airtime/library/spl.js
2015-09-30 16:26:02 -04:00
Duncan Sommerville 98d565ff3d SAAS-1101 - add workaround for pages obstructed by livechat box 2015-09-30 14:24:21 -04:00
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
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
Duncan Sommerville 70e538ebb4 SAAS-1069 - disable add button when track metadata tab is open 2015-09-29 16:39:54 -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
Albert Santoni eb5fcec485 SAAS-1096: Tabs layout in Schedule Tracks broken in Firefox, sometimes Chrome 2015-09-29 13:02:22 -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 8cc5e5835c Fix double processing icon when adding/removing tracks from playlists 2015-09-29 12:00:02 -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 477708ecc9 Style tweaks 2015-09-29 10:29:21 -04:00
Albert Santoni 6658fca10b Some polish for the What's New popup 2015-09-28 22:17:34 -04:00
Duncan Sommerville 67c20630a3 UI revamp what's new dialog 2015-09-28 17:19:02 -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
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 e5deae89a4 Generalize datatables style fixes 2015-09-24 12:54:24 -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 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 4238d5a201 Refactor tabs functionality 2015-09-22 15:27:08 -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 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
Duncan Sommerville 373ff55923 Frontend tweaks to podcasting + new abstract datatables functionality 2015-09-21 12:40:05 -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