Commit graph

1861 commits

Author SHA1 Message Date
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
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
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
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
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
a78a0d0cc8 * Fix track number bug in analyzer
* Move library search bar out of header
2015-09-16 17:50:21 -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
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
Albert Santoni
f6a33802db Merge branch 'saas-dev-tablerefactor' into saas-dev-publishing 2015-09-15 14:21:53 -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
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
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
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
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
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
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
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