Commit Graph

1906 Commits

Author SHA1 Message Date
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
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 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 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 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 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
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 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 f64d7096d1 Fix button styling bugs 2015-08-31 14:21:09 -04:00
Duncan Sommerville c1e2daaac4 CC-6114 - Remove New button from nav bar 2015-08-31 13:48:22 -04:00
Duncan Sommerville d2f46882c1 CC-6113 - Remove select dropdown from library pane 2015-08-31 13:35:46 -04:00
drigato e349c3013c CC-6107: Webstreams datatable should refresh when new webstream is created 2015-08-31 10:03:26 -04:00
Albert Santoni 765211da39 Merge branch 'saas-showbuilder' into saas-showbuilder-colors 2015-08-28 21:11:26 -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
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
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 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
Duncan Sommerville 88a9594aca CC-6090 - restyle editor processing divs 2015-08-28 10:50:10 -04:00
Duncan Sommerville ec9b98c48c CC-6090 - restyle datatables processing divs 2015-08-28 10:34:49 -04:00
Duncan Sommerville 4cf40d312a SAAS-1030 - fix bug where editing multiple tracks saves wrong metadata 2015-08-28 09:44:45 -04:00
Albert Santoni a08d5b71cf Calendar colour adjustments
* CC-6099: Improve default show colour
* CC-6100: Choose show background colours randomly from a predefined  palette
2015-08-27 20:02:32 -04:00
Albert Santoni 099fc0107e Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder 2015-08-27 19:04:18 -04:00
Albert Santoni b6f33f6083 Completed smart block, playlist, and webstream editor form overhauls
* CC-6088: Smart Block form needs to have a form layout
* CC-6089: Editor view name fields must be made <input> fields
* CC-6103: Cannot create webstreams
* Reworked a big chunk of the smart block editor flow to send only the
  playlist contents back rather than the entire HTML fragment for the
  editor.
* Keep more of the playlist/smartblock editor view persistent across
  saves, generates, and shuffles.
2015-08-27 19:00:23 -04:00
Duncan Sommerville 294298c9bf CC-6096, CC-6093 - update calendar context menu and usability hint wording; bugfixes 2015-08-27 16:59:21 -04:00
Duncan Sommerville acc4ef0054 CC-6085, CC-6101 - uploader styling 2015-08-27 15:44:59 -04:00
Duncan Sommerville 0ebe7a85e1 CC-6066 - Add/Remove content screen update 2015-08-26 17:56:17 -04:00
Duncan Sommerville ef892bb565 Fix some small bugs with Dashboard navigation links 2015-08-26 17:02:01 -04:00
Albert Santoni 98ac8fd851 Major layout work on the smartblock and playlist editors
* CC-6088: Smart Block form needs to have a form layout
* CC-6089: Editor view name fields must be made <input> fields
2015-08-26 13:10:51 -04:00
Duncan Sommerville afa3b47e42 Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder 2015-08-25 17:09:17 -04:00
Duncan Sommerville 84baef1996 CC-6097, CC-6091, CC-6080, CC-6066 - css fixes and more work on add/remove content screen 2015-08-25 17:09:05 -04:00
Albert Santoni b99ec51863 CC-6102: Can't upload M4A and FLAC anymore - rejected by dropzone 2015-08-25 15:15:03 -04:00
Albert Santoni 700c3c4005 Merge branch 'saas-dev' into saas-showbuilder 2015-08-25 13:27:40 -04:00
Duncan Sommerville afe6ca7002 Cosmetic updates 2015-08-25 11:46:20 -04:00
Duncan Sommerville e6761b54da CC-6066 - more work on add/remove content screen 2015-08-24 12:05:57 -04:00
Duncan Sommerville b15160d0fb Fix more selection bugs 2015-08-21 14:39:30 -04:00
Duncan Sommerville 812dca9409 CC-6066 - initial work on add/remove content dialog; some selection fixes 2015-08-21 14:19:28 -04:00
Albert Santoni f7733757f6 Fixed select menu styling and eliminated ColVis fade time 2015-08-21 13:14:20 -04:00
Duncan Sommerville 604b81071c CC-6084 - fix calendar drag and drop 2015-08-21 11:09:45 -04:00
Duncan Sommerville 277a066534 Layout and styling fixes for sub-menu layout pages 2015-08-21 10:43:20 -04:00
Duncan Sommerville a8955e2ea1 Fix side-menu position 2015-08-19 17:18:42 -04:00
Duncan Sommerville ae66b2272b Fix editor styling and layout issues 2015-08-19 13:02:14 -04:00
Duncan Sommerville ff930549db Fix broken sortable placeholders 2015-08-19 11:32:41 -04:00
drigato 59a9862ba3 CC-6072: Wrapper has weird positioning during page load 2015-08-19 10:56:41 -04:00
Duncan Sommerville 63f9403b11 Fix more selection bugs, implement new selection on schedule table 2015-08-18 18:45:55 -04:00
Duncan Sommerville e7367c3374 Fix more selection bugs 2015-08-18 18:01:12 -04:00
Duncan Sommerville 5f4935481a Fix selection bug 2015-08-18 17:51:41 -04:00
Duncan Sommerville 0ad51dae09 Fix add/remove content dialog, try to increase speed of selection/deselection 2015-08-18 17:46:16 -04:00
Albert Santoni a84c33f0ed Cleanup and fix media type selector highlight in calendar page 2015-08-18 17:29:23 -04:00
Duncan Sommerville a9d30fec15 Fix error when trying to preview playlists/smart blocks 2015-08-18 16:22:14 -04:00
Duncan Sommerville 1f8e8f85b9 Fix bug where success banner for saving playlist can appear for other open playlists 2015-08-18 15:58:09 -04:00
Duncan Sommerville 884e51291c CC-6083 - ctrl clicking a selected item deselects 2015-08-18 15:30:24 -04:00
Duncan Sommerville 3f25ab2647 CC-6079 - merge and remove underscore files 2015-08-18 15:23:42 -04:00
Albert Santoni 5ab0850d9a Partially revert datatables strings 2015-08-18 15:00:25 -04:00
Albert Santoni a271b53c2e CC-6077: Implement actions menu for library view 2015-08-18 14:55:32 -04:00
Albert Santoni b645f1c2ed Merge branch 'saas-showbuilder' into saas-showbuilder-contextmenus 2015-08-18 13:11:17 -04:00
Duncan Sommerville cee2fe5a63 CC-6082 - add y-scrollbar to file metadata editor at small resolutions 2015-08-18 12:58:34 -04:00
Duncan Sommerville 263c2709bf CC-6067 - implement hybrid selection 2015-08-18 12:20:06 -04:00
Duncan Sommerville 4bfb8fa0cb CC-6067 - deselect when adding library items 2015-08-18 12:01:23 -04:00
Albert Santoni a3a3d0a635 Merge branch 'saas-showbuilder' into saas-showbuilder-contextmenus 2015-08-18 09:53:47 -04:00
Duncan Sommerville 4adb9cc55a CC-6070 - standardize editor buttons 2015-08-17 18:34:39 -04:00
Albert Santoni 07752dd9a5 Break the context menus 2015-08-17 18:13:37 -04:00
Duncan Sommerville 096c96b1b6 CC-6075 - fix error 2015-08-17 17:39:16 -04:00
Albert Santoni 74a1e0929d Fixed styling on Listener Stats page 2015-08-17 16:08:58 -04:00
drigato 3aee9a49bc SAAS-1019: Re-work Navigation Menu 2015-08-17 12:46:32 -04:00
Albert Santoni 68523d9e02 Specialize the datatables string for playout history, users, and recent uploads tables 2015-08-14 20:20:30 -04:00
Albert Santoni 31982a7238 Merge branch 'saas-showbuilder' of https://github.com/sourcefabric/Airtime into saas-showbuilder 2015-08-14 20:00:17 -04:00
Albert Santoni 8aa39ae28d Moved datatables translation stuff to PHP for consistency 2015-08-14 20:00:05 -04:00
Duncan Sommerville cb2d0bd444 SAAS-948 - js fixes for dashboard nav, change logo image in master panel 2015-08-14 16:42:39 -04:00
Duncan Sommerville fb1f22b913 SAAS-948 - css tweaks 2015-08-14 13:29:26 -04:00
Duncan Sommerville 12c4e4a374 Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder
Conflicts:
	airtime_mvc/public/js/airtime/common/common.js
2015-08-14 10:54:53 -04:00
Duncan Sommerville 809b743785 SAAS-948 - Add livechat event listeners 2015-08-14 10:24:49 -04:00
drigato 3e66363cdd SAAS-1017: Move top nav bar to side
Reload datatable if user clicks the browser's back button
2015-08-14 08:43:47 -04:00
drigato e90fe728a2 SAAS-1017: Move top nav bar to side 2015-08-14 08:30:52 -04:00
Albert Santoni 0c83b62545 Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder 2015-08-12 17:37:01 -04:00
Albert Santoni 9d30a26968 Text for show schedule toolbar buttons, Embedded Widgets page styling 2015-08-12 17:36:54 -04:00
Duncan Sommerville 32100e2d9b SAAS-948 - frontend tweaks 2015-08-12 16:54:45 -04:00
Albert Santoni 61d1e6bb50 Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder 2015-08-12 16:45:07 -04:00
Albert Santoni 409e9e2a78 Stream settings, Add Show form CSS revamp, etc. 2015-08-12 16:44:45 -04:00
Duncan Sommerville 32e1e70418 SAAS-948 - update tab functionality 2015-08-12 15:50:32 -04:00
Duncan Sommerville c931b81b35 SAAS-948 - library datatable header tweaks 2015-08-12 15:10:56 -04:00
Duncan Sommerville 1957c7827f SAAS-948, SAAS-983 - Showbuilder editor redesign, look and feel fixes 2015-08-12 14:35:27 -04:00
Albert Santoni 0cfc55116d Colour tweaks 2015-08-12 13:50:42 -04:00
Albert Santoni 2a1d09bc08 Factor out default show background colour and fix some style issues 2015-08-12 12:55:39 -04:00
Albert Santoni f63ce23c9f Flatten datatable headers and restyled Manage Users screen 2015-08-12 10:53:14 -04:00
Duncan Sommerville c9f9bed2d6 SAAS-948 - fix smartblock save and tab close functionality, implement 'super' checkbox 2015-08-10 18:46:12 -04:00
Albert Santoni 849b8038ce Mostly new graphics for the calendar page 2015-08-10 17:11:40 -04:00
Albert Santoni a28df91c56 Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder 2015-08-10 14:17:24 -04:00
Albert Santoni 2af5eb3314 Add Media page visual refresh, and use dropzone 2015-08-10 14:17:16 -04:00
Duncan Sommerville c2d1556cfd Showbuilder css changes 2015-08-10 12:37:21 -04:00
Albert Santoni 974f979bef Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder 2015-08-10 12:23:30 -04:00
Albert Santoni fc7a700654 Consolidated some CSS 2015-08-10 12:23:22 -04:00
Albert Santoni 75914b791c Merge branch 'saas-dev' into saas
Conflicts:
	airtime_mvc/application/common/FileDataHelper.php
2015-08-10 09:00:54 -04:00
Duncan Sommerville bf6244c835 SAAS-948 2015-08-07 19:20:29 -04:00
Albert Santoni cdc9f88c1c Big style update for the new show builder screen
* Restyled the tables
* Blue currently playing track
* Labels for library view buttons
2015-08-07 19:08:17 -04:00
Duncan Sommerville 133db1c6a6 Merge branch 'saas-dev' into saas-showbuilder 2015-08-07 16:50:28 -04:00
Duncan Sommerville e6609896a5 SAAS-948 - showbuilder styling 2015-08-07 16:49:05 -04:00
Albert Santoni ea2a6b3f68 Clean up and bugfixes for password reset (SAAS-1009) 2015-08-07 13:57:42 -04:00
Duncan Sommerville 02d96d7bd0 SAAS-991 - initial playlist editor redesign 2015-08-06 19:16:04 -04:00
Duncan Sommerville cc36fcd37b Showbuilder checkboxes and style fixes 2015-08-06 16:01:44 -04:00
Duncan Sommerville 83902ebbbe Fix small showbuilder bugs 2015-08-06 10:40:50 -04:00
Duncan Sommerville 4cbc49391b Reintroduce checkboxes 2015-08-05 18:14:56 -04:00
Duncan Sommerville 36f2e1844f Merge branch 'saas-dev' into saas-showbuilder 2015-08-05 15:32:04 -04:00
Albert Santoni e49d337db0 Merge remote-tracking branch 'origin/saas-stream-settings' into saas-dev 2015-08-05 14:50:31 -04:00
Albert Santoni eef61a65fc Cleanup and comments for the timezone/language popup 2015-08-05 14:49:43 -04:00
Duncan Sommerville 33d2fe0900 SAAS-989 - Move file metadata editor to right-hand showbuilder pane 2015-08-04 19:56:12 -04:00
Albert Santoni c934866063 Two small code improvements 2015-08-04 17:42:53 -04:00
Duncan Sommerville 57c1d74286 SAAS-985 - Port sandwich menu to showbuilder branch 2015-08-04 16:37:45 -04:00
Duncan Sommerville 4200f56265 SAAS-999 - Change Advanced Search Options to dropdown 2015-08-04 15:38:48 -04:00
Duncan Sommerville f138dc6b47 SAAS-948 - tab layout for right-hand pane 2015-07-31 18:28:16 -04:00
Duncan Sommerville 8f5f0eb5fe SAAS-948 - CSS overhaul for new show builder page 2015-07-29 20:28:54 -04:00
Duncan Sommerville 661a87dfbc SAAS-948 - Frontend tweaks and fixes 2015-07-29 13:35:01 -04:00
Duncan Sommerville fcbc37977f SAAS-948 - Frontend tweaks 2015-07-28 11:42:04 -04:00
Duncan Sommerville 5e58403c7f Merge branch 'saas-dev' into saas-showbuilder 2015-07-27 15:38:30 -04:00
Duncan Sommerville 59d89b0b9e SAAS-948 - ShowBuilder redesign editors and fixes 2015-07-27 15:37:55 -04:00
drigato 989b4994aa SAAS-945: Language + Timezone Setup Popup
forgot to auto detect user's timezone
2015-07-27 14:38:42 -04:00
drigato ee2bfe7664 SAAS-945: Language + Timezone Setup Popup 2015-07-27 07:06:22 -04:00
drigato ce7765a8cb Merge branch 'saas' into saas-dev 2015-07-21 11:03:31 -04:00
drigato 3e60713590 SAAS-962: "Now" option should not be available for linked shows
Also added fix for SAAS-957
2015-07-20 15:20:50 -04:00
Duncan Sommerville ba90b1f1eb Merge branch 'saas-dev' into saas-showbuilder
Conflicts:
	airtime_mvc/public/css/styles.css
2015-07-20 12:23:11 -04:00
Duncan Sommerville 0324c59100 Don't reload datatable when selecting same media type 2015-07-18 17:28:17 -04:00
drigato a6854ea507 SAAS-957: Error on "update show" 2015-07-17 16:28:33 -04:00
Duncan Sommerville 1816be156f SAAS-922 - change file extensions in pypo based on mime-type, update lists of accepted mime types 2015-07-16 16:26:52 -04:00
Duncan Sommerville d7d9a994d5 SAAS-948 - ShowBuilder redesign initial commit 2015-07-15 18:53:19 -04:00
drigato b37b574cea Real fix for calendar context menu width problem 2015-07-15 10:30:59 -04:00
drigato dddc6e6591 Fix for context menu on calendar being too small sometimes 2015-07-15 07:19:48 -04:00
drigato 8309289356 Merge branch 'saas-dev-usability-hints' of https://github.com/sourcefabric/Airtime into saas-dev-usability-hints 2015-07-14 11:52:10 -04:00
drigato e5c574229f SAAS-940: Provide usability hints to user
fix hint message transitions
2015-07-14 11:51:50 -04:00
Albert Santoni 2693c9f02c Small bugfix for CC-6064 2015-07-14 11:25:11 -04:00
Albert Santoni 30b8ada622 Merge branch 'saas-dev-usability-hints' of github.com:sourcefabric/Airtime into saas-dev-usability-hints 2015-07-14 10:56:18 -04:00
Albert Santoni 45b09a0d24 Merge branch 'saas-dev' into saas-dev-usability-hints
Conflicts:
	airtime_mvc/public/js/airtime/schedule/add-show.js
2015-07-14 10:56:12 -04:00
drigato e24307180c Merge branch 'saas-dev-usability-hints' of https://github.com/sourcefabric/Airtime into saas-dev-usability-hints 2015-07-14 10:40:10 -04:00
drigato 794a4a21d8 SAAS-940: Provide usability hints to user
Update hints after library table has changed
2015-07-14 10:39:58 -04:00
Albert Santoni 5a2ef8d3db Merge branch 'saas-dev-usability-hints' of github.com:sourcefabric/Airtime into saas-dev-usability-hints 2015-07-14 10:35:47 -04:00
Albert Santoni 66caf2574a CC-6064: Allow shows to be started "now" 2015-07-14 10:35:21 -04:00
drigato 71e8909365 SAAS-940: Provide usability hints to user
Fixed bug where hints were not showing up sometimes
2015-07-14 10:08:56 -04:00
drigato 25ef70767b SAAS-940: Provide usability hints to user
Customized hints depending on what page the user is on and what action
they just completed.
2015-07-13 17:02:31 -04:00
Duncan Sommerville 755ec79e7d SAAS-876 - frontend tweaks 2015-07-13 15:17:47 -04:00
Duncan Sommerville c05d4bac2f Merge branch 'saas-dev' into saas-stream-settings 2015-07-13 13:27:34 -04:00
Duncan Sommerville 6d883d2fa4 Fix Add Show button bug and update styling 2015-07-13 13:23:24 -04:00
Duncan Sommerville c99165a8dd SAAS-876 - better implementation of toggle between Airtime Pro/Custom streaming options 2015-07-10 13:17:20 -04:00
Duncan Sommerville ac2e1a2d4b SAAS-876 - More work on stream settings page 2015-07-08 16:04:09 -04:00
Duncan Sommerville 6b9d9e8063 Merge branch 'saas-dev' into saas-stream-settings 2015-07-08 12:47:24 -04:00
Duncan Sommerville 31ce52b857 CC-6062 - Fix stretching last column after adding show in calendar view 2015-07-06 11:52:04 -04:00
Duncan Sommerville 457230ba07 SAAS-876 - Initial commit 2015-07-03 13:32:41 -04:00
Duncan Sommerville e3101e90b2 Resize player windows to correct dimensions on open 2015-07-02 16:07:49 -04:00
Duncan Sommerville a8f214803b Fix javascript error on some browsers 2015-06-29 17:07:17 -04:00
Duncan Sommerville 19fb67c8d6 Fix broken delete button 2015-06-29 11:28:27 -04:00
Duncan Sommerville 5cc8774e56 Merge branch 'saas-dev' into soundcloud
Conflicts:
	airtime_mvc/application/configs/constants.php
2015-06-29 10:02:58 -04:00
Duncan Sommerville ca9c805ce4 SAAS-906 - Change wording on Add to Show button 2015-06-26 15:25:58 -04:00
Duncan Sommerville c79e4fb9ea CC-4922 2015-06-26 15:12:52 -04:00
Duncan Sommerville c44bae8140 Merge branch 'saas-dev' into soundcloud
Conflicts:
	airtime_mvc/application/views/scripts/form/preferences.phtml
	airtime_mvc/public/js/airtime/preferences/preferences.js
2015-06-26 10:37:30 -04:00
Duncan Sommerville 79f51f77cb Merge branch '2.5.x-installer' into saas-dev 2015-06-25 18:21:40 -04:00
Duncan Sommerville c59f401eb1 Fix shift selection in library and builder views 2015-06-25 18:21:22 -04:00
Duncan Sommerville 6497bc28c5 Show collapsible sections (other than 'dangerous settings') by default on preferences page 2015-06-25 17:43:15 -04:00
Duncan Sommerville 6fb9c6a30c SAAS-885, SAAS-857, SAAS-878 - Cosmetic fixes, remove js widget box in preferences 2015-06-25 14:13:09 -04:00
Duncan Sommerville 67155b136a Add downgrade action to UpgradeController, fix SoundCloud schema and bugs 2015-06-24 18:38:04 -04:00
Duncan Sommerville 8fcaf7fc74 Merge branch 'saas-dev' into soundcloud
Conflicts:
	airtime_mvc/application/configs/constants.php
2015-06-24 16:35:06 -04:00
Duncan Sommerville a3f1cf1d56 CC-6060 - Fix breaking tooltips when viewing context menu in library 2015-06-22 10:47:34 -04:00
Duncan Sommerville e36c8a16d4 CC-6060 - Fix breaking tooltips when viewing context menu in library 2015-06-22 10:46:29 -04:00
Duncan Sommerville 76a7aa9a24 Fix SoundCloud and TaskManager bugs, switch tasks to use acks_late, and provide feedback from SoundCloud context menu items 2015-06-18 18:18:48 -04:00
Duncan Sommerville 3902c8c746 Add SoundCloud delete functionality and fixes; implement TaskManager to run background jobs 2015-06-15 15:12:37 -04:00
Duncan Sommerville 459f9494c3 Merge saas-dev into soundcloud 2015-06-10 16:08:52 -04:00
Duncan Sommerville 626489bb3b SAAS-853 - Celery backend for SoundCloud uploads 2015-06-10 15:04:49 -04:00
Duncan Sommerville b0b6e037ac CC-6046, CC-6045, CC-6047 - New SoundCloud implementation 2015-06-03 16:57:17 -04:00
Albert Santoni e86e1cb4ac Merge branch 'saas-dev' into saas-speedy 2015-05-21 15:10:01 -04:00
drigato a2a9e54553 Merge branch 'saas-dev' into saas-tunein
Conflicts:
	airtime_mvc/application/views/scripts/form/preferences.phtml
2015-05-19 15:50:16 -04:00
drigato b023f191e3 SAAS-772: Send metadata to Tunein
Added form validation by making a test request to the TuneIn API with
the user-entered values
2015-05-14 13:13:33 -04:00
drigato cf24c141fd SAAS-772: Send metadata to Tunein
This is pretty much working for scheduled metadata - just to need to
test with a TuneIn account.
2015-05-13 16:05:37 -04:00
Duncan Sommerville 15bebc6267 Dangerous options subform on Preferences page and Delete all tracks button 2015-05-13 15:56:08 -04:00
Duncan Sommerville 8b380086c3 Merge branch 'saas-dev' into saas-speedy 2015-05-04 13:09:51 -04:00
Duncan Sommerville 8aea86b451 SAAS-744 - Updated double click and Add button functionality on Now Playing and Add/Remove content screens 2015-04-30 16:23:52 -04:00
Albert Santoni f382b1338f Layout fixes for library and Now Playing screens 2015-04-29 13:41:52 -04:00
Duncan Sommerville 574fdf4b27 Merged 2.5.x into saas 2015-04-27 14:01:28 -04:00
Duncan Sommerville 4b307d6b47 Fix for vertical scrollbar issue 2015-04-27 13:52:55 -04:00
Albert Santoni 6dc8837aff Removed unused status page stuff for Pro and cleanup for code review 2015-04-17 11:17:35 -04:00
Albert Santoni 8449194ca1 Merge branch 'saas' into saas-speedy 2015-04-15 16:44:43 -04:00
Albert Santoni f3c8f40183 Tweaks to fix up my optimizatinos
* Fixed a rendering glitch with empty shows in the Now Playing screen
* Changed drag and drop placeholder to show the track name. Reverted it
  from the default DataTables placeholder, which unfortunately gets the
  column widths wrong.
2015-04-14 17:39:52 -04:00
Albert Santoni a48ae75907 Merge branch 'saas' of github.com:sourcefabric/Airtime into saas 2015-04-14 11:36:22 -04:00
Albert Santoni a606fef5af Gracefully handle bad ColReorder deserialization 2015-04-14 11:36:13 -04:00
Albert Santoni b1ea1f27a3 Fixed empty show Showbuilder bug and started making checkboxes work like cursors used to 2015-04-14 11:30:18 -04:00
Albert Santoni 1194a0f959 Some big performance optimizations to Now Playing JavaScript.
* Big decrease in page load time
* Big decrease in load time during schedule operations (drag and drop)
2015-04-10 22:53:39 -04:00
Albert Santoni b11e98ea24 Reduced the Now Playing screen AJAX on load from 9 to 2. 2015-04-10 19:52:06 -04:00
drigato f238faa937 SAAS-712: UI Improvements 2015-04-09 14:22:50 -04:00
Albert Santoni 1734cc35c8 Refactored session_write_close() optimization and dashboard preloading
hack
2015-04-09 13:03:06 -04:00
Albert Santoni 3e255bfd37 Merge branch 'saas' into saas-speedy 2015-04-09 12:20:23 -04:00
drigato 4429117f6a SAAS-712: UI Improvements 2015-04-09 09:43:15 -04:00
drigato 23bf866211 SAAS-712: UI Improvements 2015-04-08 14:01:57 -04:00
drigato 220f21ab22 Merge branch 'saas' into saas-embed-player
Conflicts:
	airtime_mvc/application/configs/ACL.php
2015-03-31 17:44:14 -04:00
drigato 778df97d3c SAAS-662: Make player auto-connect if there is a problem with the stream
Kind of working in HTML5 mode
2015-03-31 16:51:14 -04:00
Albert Santoni dab9cc775c Hide the show form after updating a show because it was broken at that point anyways 2015-03-31 15:39:06 -04:00
drigato 17358a761f SAAS-663: Integrate player design 2015-03-25 11:44:28 -04:00
drigato e32744668f SAAS-661: Add mobile stream identifier on Stream Settings page 2015-03-23 16:06:35 -04:00
drigato e2ca218ac2 Merge remote-tracking branch 'stash/saas-four-streams' into saas-embed-player 2015-03-23 15:54:04 -04:00
drigato 2ae4d6c1c3 Embed Player
Added stream modes
Unhardcoded some values
Disabled opus streams
2015-03-23 12:37:22 -04:00
drigato 5c4533d785 SAAS-644: Embed Player -> Update embed src code and preview when an option changes 2015-03-23 10:11:33 -04:00
drigato 0764ca60e6 Delete muses skin files 2015-03-20 09:09:09 -04:00
drigato 16ddf09d6d SAAS-655: Extract muses player events into our own js object 2015-03-19 16:59:05 -04:00
drigato 875ed0e41e Got muses working without a skin
Had to leave the skin visible but "hide" it by setting the width and
height to 1px
2015-03-19 13:42:19 -04:00
drigato bafd9eeb6f Cleaning up player code 2015-03-18 15:03:34 -04:00
drigato ed891fb145 Committing lots of trial and error embed player code changes 2015-03-18 14:23:38 -04:00
Albert Santoni 34de6da2c7 Major performance improvements to the Dashboard and Calendar views
* Close the PHP session for writing as early as possible in most AJAX
  calls for those views
* Reduce the number of roundtrips to the server in both the Dashboard
  and Calendar views by putting the data in our HTML response (this
  makes a massive difference)
* Eliminated a couple of unneccessary AJAX calls
* Use lazy loading in full calendar
* Fixed a bug in the week view that only occurs near the end of the
  week (date->gmdate bug!)
2015-03-13 18:22:27 -04:00
drigato ac2181a52d Merge branch 'saas' into saas-embed-player 2015-03-11 17:13:04 -04:00
drigato 6c46f0a156 Added player preview to view
Everything is hardcoded right now
2015-03-10 16:32:35 -04:00
Albert Santoni d61b75f105 Added a working 4th stream 2015-03-03 16:08:53 -05:00
Duncan Sommerville 6082738439 Merge branch 'saas' into saas-media-refactor 2015-03-02 16:02:34 -05:00
Duncan Sommerville 17d51eb0f9 Added csrf verification to show image upload and deletion 2015-03-02 16:00:11 -05:00
Duncan Sommerville 936d11b367 Merge branch '2.5.x-albertenhancements' into saas 2015-02-27 17:21:20 -05:00
Duncan Sommerville 78c7170c4e Reformatted logo remove button to use Zend 2015-02-27 17:19:37 -05:00
Albert Santoni 3a1141d4c8 Merge branch 'saas' into saas-media-refactor
Conflicts:
	airtime_mvc/application/cloud_storage/ProxyStorageBackend.php
	airtime_mvc/application/controllers/ApiController.php
2015-02-25 13:02:11 -05:00
Albert Santoni 562c2f0100 Remove widget JS snippet animation because it's bugged 2015-02-24 15:18:39 -05:00
Albert Santoni e13e4413ea Merge remote-tracking branch 'origin/2.5.x-albertenhancements' into saas 2015-02-24 15:03:06 -05:00
Duncan Sommerville 5e256df061 Added remove button for station logo on preferences page 2015-02-24 12:12:30 -05:00
Duncan Sommerville 69d588d2f6 Merge branch '2.5.x' into 2.5.x-albertenhancements 2015-02-24 10:45:52 -05:00
Albert Santoni 2e2c3d6276 Merge of cc-5709-airtime-analyzer-saas-refactor into saas 2015-02-20 14:27:16 -05:00
Albert Santoni 3c064b13a9 Merge branch '2.5.x' into saas
Conflicts:
	airtime_mvc/locale/hy/LC_MESSAGES/airtime.po
	airtime_mvc/locale/ja_JP/LC_MESSAGES/airtime.po
2015-02-18 16:03:14 -05:00
Albert Santoni 68cd5b027a CC-5998: Prevent users from spamming the delete button in the library 2015-02-18 15:56:28 -05:00
Duncan Sommerville 826ae17552 SAAS-580 - Fixed routing issue causing show art to not upload; changed ShowController to be more RESTful 2015-02-04 15:09:27 -05:00
Albert Santoni fd42c67b0b Merge branch 'saas' of github.com:sourcefabric/Airtime into saas 2015-01-21 18:08:05 -05:00
Duncan Sommerville 7e2cc65f32 Merge branch '2.5.x' into saas 2015-01-21 15:15:58 -05:00
Duncan Sommerville 6492128ce9 Hide Now Playing toolbar for Guest users 2015-01-21 15:15:22 -05:00
Albert Santoni 7c28b66ce9 Merge branch '2.5.x-albertenhancements' into saas
Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
	airtime_mvc/application/forms/Preferences.php
	airtime_mvc/application/views/scripts/form/preferences.phtml
	airtime_mvc/application/views/scripts/form/support-setting.phtml
2015-01-15 16:32:29 -05:00
Albert Santoni f9bf71a349 Moved the Station Logo field to GeneralPreferences, and stopped using
AJAX on the general prefs form
2015-01-15 16:28:18 -05:00
Albert Santoni d5b969f94f Merge branch '2.5.x' into saas
Conflicts:
	airtime_mvc/application/forms/GeneralPreferences.php
	airtime_mvc/application/views/scripts/form/preferences_general.phtml
	airtime_mvc/application/views/scripts/form/support-setting.phtml
2015-01-13 21:31:57 -05:00
Albert Santoni ad56d6cafb Show the plan and station URL in Live Chat 2014-12-11 17:40:34 -05:00
Duncan Sommerville af8c6c2f48 Merged 2.5.x into saas 2014-11-10 09:08:03 -05:00
Duncan Sommerville 4dab2abf4e Replaced reoccurring strings with string formatting to aid dynamic translations 2014-11-06 18:40:19 -05:00
Duncan Sommerville 4d263ce897 Merged 2.5.x into saas 2014-11-05 17:36:58 -05:00
Duncan Sommerville 3046003a1b Removed unnecessary cookie declaration for default locale 2014-11-05 17:27:41 -05:00
Duncan Sommerville 3b588dcce8 Removed unnecessary call to set locale data on the Login page 2014-11-05 17:27:08 -05:00
Duncan Sommerville 00e85de3c8 Updated preEditShowValidationCheck to behave properly when dealing with shows with cc_show_days rows in the past, updated serialized form data in add-show to accommodate the change 2014-11-05 10:06:59 -05:00
Albert Santoni 359727fc66 Merge branch 'saas' of github.com:sourcefabric/Airtime into saas
Conflicts:
	airtime_mvc/application/modules/rest/controllers/MediaController.php
2014-10-29 18:01:31 -04:00
Albert Santoni ceb51100ec Merge branch 'cc-5709-airtime-analyzer' into saas 2014-10-29 17:58:56 -04:00
Albert Santoni fd39db2e24 Merge pull request #75 - Saas relder csrf delete file 2014-10-29 17:55:42 -04:00
Duncan Sommerville 275ca5eed6 Resolved differences merging 2.5.x into saas 2014-10-27 16:25:42 -04:00
Duncan Sommerville d467714f84 Fixed bug where timezone wasn't adjusting correctly when adding or editing a show 2014-10-27 15:42:30 -04:00
Robert Elder 9fb35c448e Resolved merge conflicts for merging cc-5709-airtime-analyzer into saas. 2014-10-10 19:57:22 +00:00
drigato c4692cc0d7 Merge branch '2.5.x' into cc-5709-airtime-analyzer
Conflicts:
	airtime_mvc/application/controllers/PluploadController.php
	airtime_mvc/application/views/scripts/plupload/index.phtml
2014-10-08 11:46:08 -04:00
Robert Elder feff7f4343 tokens for multipart data upload. 2014-10-02 02:04:03 +00:00