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
98d565ff3d
SAAS-1101 - add workaround for pages obstructed by livechat box
2015-09-30 14:24:21 -04:00
c0372c1745
Fix webstream tab change behaviour
2015-09-30 12:07:31 -04:00
2ee7e4bf71
SAAS-1088 - move 'All My Shows' checkbox to dropdown instead
2015-09-30 11:38:33 -04:00
258500f650
SAAS-1102 - fix datatables pagination layout issues
2015-09-30 11:24:29 -04:00
70e538ebb4
SAAS-1069 - disable add button when track metadata tab is open
2015-09-29 16:39:54 -04:00
d3e9665063
Fix bug where switching to a webstream tab would throw an error
2015-09-29 16:26:39 -04:00
3df1081c60
SAAS-1088 - fix broken 'all my shows' checkbox
2015-09-29 15:51:09 -04:00
3fcc3c507a
Fix tabs bug
2015-09-29 15:09:09 -04:00
f25457d1eb
SAAS-1098: Max filesize restricted by new uploader
2015-09-29 13:29:06 -04:00
c2cd768398
SAAS-1094 - fix selector for scheduled show selection + context menu
2015-09-29 12:27:45 -04:00
f4fad13eb8
SAAS-1086 - centre cursor when dragging
2015-09-29 12:07:24 -04:00
c1a16d7973
Add filter string to generic Table object; add call to refetch podcast episode table data
2015-09-28 14:14:01 -04:00
375d83ab43
Update to podcast frontend
2015-09-28 10:40:04 -04:00
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
a24565669b
Fix bug where library would sometimes reference wrong table
2015-09-24 15:55:37 -04:00
ca51dcf3ae
SAAS-1071 - more work on backend podcast implementation
2015-09-24 12:58:02 -04:00
c5b00e56bb
Fix bug that prevented multiple podcast tabs from being opened
2015-09-23 12:38:08 -04:00
576a457fdb
Small tweaks to tabs, fix merge conflicts in podcast
2015-09-22 20:19:57 -04:00
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
ed33714340
SAAS-1064: Publish action for library context menu
2015-09-22 18:33:27 -04:00
44a5e5a240
Improve tabs functionality and add comments
2015-09-22 17:34:24 -04:00
4238d5a201
Refactor tabs functionality
2015-09-22 15:27:08 -04:00
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
a21c4612c9
Renamed a podcast.js function for clarity
2015-09-21 17:59:31 -04:00
f9ace20075
Simplify third-party/celery/soundcloud implementation
2015-09-21 17:03:46 -04:00
b721545c68
Stub publish action for context menu
2015-09-21 16:54:00 -04:00
73e489fdc8
Cleanup a comment
2015-09-21 15:41:24 -04:00
4115f4939e
Frontend tweaks
2015-09-21 15:37:57 -04:00
373ff55923
Frontend tweaks to podcasting + new abstract datatables functionality
2015-09-21 12:40:05 -04:00
18fb0f3509
Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing
2015-09-18 18:29:54 -04:00
0710accbe2
SAAS-1062 - more work on podcasting frontend
2015-09-18 18:29:50 -04:00
515d892f6e
Fixed small table widget ctrl-selection bug
2015-09-18 16:11:49 -04:00
6934bcfdab
Update tabs functionality
2015-09-18 15:38:00 -04:00
6900af8d47
Fix bug where switching from #podcast to other media view would not work as intended
2015-09-18 15:37:41 -04:00
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
ea0121f5c1
Cleanup and capitalisation for the Table widget
2015-09-17 15:09:50 -04:00
8a7a97f48e
Updated the podcast table widget columns
2015-09-17 15:06:51 -04:00
0826c64719
Refactor table widget to use prototype inheritance better
2015-09-17 14:52:32 -04:00
9f03115ee5
Custom button event handlers for new table widget
2015-09-17 13:07:22 -04:00
71919ad529
Basic integration of table widget into Dashboard podcasts view
2015-09-16 18:32:16 -04:00
39b2bd6a86
Actually move library search bar out of header; add angular.js to libs
2015-09-16 17:58:16 -04:00
a78a0d0cc8
* Fix track number bug in analyzer
...
* Move library search bar out of header
2015-09-16 17:50:21 -04:00
9ed3145473
Create oauth controller interface for oauth-specific actions; small refactoring on tabs.js
2015-09-16 15:29:10 -04:00
7006b55818
js tweaks
2015-09-16 11:26:11 -04:00
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
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
f6a33802db
Merge branch 'saas-dev-tablerefactor' into saas-dev-publishing
2015-09-15 14:21:53 -04:00
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
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
Albert Santoni