Commit Graph

784 Commits

Author SHA1 Message Date
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 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 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 4cf40d312a SAAS-1030 - fix bug where editing multiple tracks saves wrong metadata 2015-08-28 09:44:45 -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
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
Duncan Sommerville afe6ca7002 Cosmetic updates 2015-08-25 11:46:20 -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 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
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 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
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 9d30a26968 Text for show schedule toolbar buttons, Embedded Widgets page styling 2015-08-12 17:36:54 -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
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 2af5eb3314 Add Media page visual refresh, and use dropzone 2015-08-10 14:17:16 -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
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 e6609896a5 SAAS-948 - showbuilder styling 2015-08-07 16:49:05 -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 33d2fe0900 SAAS-989 - Move file metadata editor to right-hand showbuilder pane 2015-08-04 19:56:12 -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 59d89b0b9e SAAS-948 - ShowBuilder redesign editors and fixes 2015-07-27 15:37:55 -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
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 794a4a21d8 SAAS-940: Provide usability hints to user
Update hints after library table has changed
2015-07-14 10:39:58 -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 a8f214803b Fix javascript error on some browsers 2015-06-29 17:07:17 -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 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 b0b6e037ac CC-6046, CC-6045, CC-6047 - New SoundCloud implementation 2015-06-03 16:57:17 -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
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 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 b11e98ea24 Reduced the Now Playing screen AJAX on load from 9 to 2. 2015-04-10 19:52:06 -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
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 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
Albert Santoni fd39db2e24 Merge pull request #75 - Saas relder csrf delete file 2014-10-29 17:55:42 -04: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
Albert Santoni 9e9e676b54 CC-5709: Airtime Analyzer
* Make the Recent Uplods file actions a bit clearer
2014-03-25 15:35:50 -04:00
Albert Santoni db2b52a1bf CC-5709: Airtime Analyzer
* Some cleanup and refactoring for file deletion in the Media REST API
* Fix the refresh timer on the Add Media page when there's pending
  imports.
2014-03-24 17:14:04 -04:00
Albert Santoni 61c2c90b7e CC-5709: Airtime Analyzer
* Remove the "hidden" field from the REST blacklist, the analyzer needs to set it.
* Added import_status column messages in the recent uploads table
* Auto-refresh the recent uploads table while imports are pending
* Moved the file moving stuff to its own analyzer in airtime_analyzer
* Basic error reporting to the REST API in airtime_analyzer, needs
  hardeneing though
* Fixed a bug with the number of recent uploads
* Prevent airtime_analyzer from running if media_monitor is running
2014-03-22 02:12:03 -04:00
Albert Santoni 8f7ecafcf6 CC-5709: Airtime Analyzer
* A bunch of changes that somehow didn't make it into my last commit...
* confused
2014-03-21 14:03:17 -04:00
Albert Santoni 878dd11ccc CC-5709: Airtime Analyzer
* Overhauled Add Media screen, now shows state of recent uploads
* Dropped old unused "state" column, added new file_import column to cc_files
* New PluploadController methods
* Save the filename as the track title for unprocessed uploads
* Hide pending files from the library until they've been processed.
* Don't overwrite files with duplicate names, we rename them instead.
2014-03-21 13:22:00 -04:00
Albert Santoni e6cbbdff33 CC-5709: Airtime Analyzer
* Added session auth to the Media API (if you're logged in)
* Started reworking our Plupload interaction with the server to be less
  awkward.
* Basic uploading works with the Add Media page again, but messages
  aren't dispatched to airtime_analyzer yet (coming next...)
2014-03-13 11:14:30 -04:00
Naomi ecf363ccfe CC-5430 : sorting settings not saved on library datatable
default sorting set in incorrect place, overriding saved settings.
2013-10-16 18:14:07 -04:00
Naomi a5a99da21e Editing templates, strictly typing metadata for datatables (for unions) 2013-08-01 16:36:18 -04:00
Naomi 01f835c4c4 CC-4504 : Double scrollbars in Library view 2013-06-10 15:50:33 -04:00
Martin Konecny b18495a79e CC-5210: "Linked" Icon is missing after adding contents into linked show
-fixed
2013-06-07 15:15:52 -04:00
denise afda0c140b CC-5196: L10N: Smartblock only generate 1 file even multiple files are qualified, no matter which limitation is set. 2013-05-30 15:50:35 -04:00
denise 527b1eaf1d CC-5191: I18N: "items" is not translated when expanding dynamic Smartblock in playlist 2013-05-30 15:05:57 -04:00
Naomi Aro 4d1a15b7ca CC-3817 : Should use soundcloud icon for recorded & uploaded shows in timeline for past shows to match calendar 2013-05-28 14:27:59 -04:00
Naomi Aro 51573d36c9 CC-3817 : Should use soundcloud icon for recorded & uploaded shows in timeline for past shows to match calendar 2013-05-28 13:30:47 -04:00
Naomi Aro 69f6295553 CC-5108 : Waveform Editor UI
error check for if both tracks cannot be decoded.
2013-05-24 11:27:56 -04:00
Naomi Aro f5e03db9fe CC-5108 : Waveform Editor UI
making sure the correct li is activated when a track has a decoding error.
2013-05-24 11:23:08 -04:00
Naomi 75e6f21ce0 CC-5108 : Waveform Editor UI
putting on the timescale for time reference.

fade editor now has cursor playback info.
2013-05-23 18:33:40 -04:00
Naomi c57de650e8 CC-5172 : errors from setting cues in waveform editor not handled properly
Conflicts:
	airtime_mvc/application/models/Playlist.php
2013-05-23 13:01:38 -04:00
Naomi 3ad7c868e2 Merge branch 'SAAS-317-datatables-reorder' into 2.4.x 2013-05-21 17:44:25 -04:00
Naomi b720086a4b SAAS-317 : http://ryerson.airtime.pro/ is having issues with show/hide column in their library
missing single quote problem, updating column visible plugin.
2013-05-21 17:40:52 -04:00
denise fb605ccb71 Renamed 'Open Playlist Editor' button to 'Open Media Builder' on Library page 2013-05-21 09:30:35 -04:00
denise 5bf91d513d CC-5127: Library -> Scheduled and Playlist columns needs better icon
Changed icon
Renamed Playlist to Playlist / Block
2013-05-17 11:42:48 -04:00
Naomi 0dd8138c2b CC-5131 : Please give user a message that Browser other than Chrome can't use waveform 2013-05-14 14:15:54 -04:00
Naomi d9b6a15fb6 CC-5139 : WaveForm: Click save will cause problem when setting crossfading between track and Smart block 2013-05-13 18:21:24 -04:00
Naomi 872f68505b CC-5108 Waveform Editor UI 2013-05-13 16:01:06 -04:00
denise 27b79c2e91 CC-5128: Library -> Do not auto sort by scheduled 2013-05-10 16:17:30 -04:00
Martin Konecny d06b2f3f94 CC-5116:
Please add opus into the file name filter

-fixed
2013-05-08 17:06:50 -04:00
Naomi f64e99176e CC-510: Cue Editor: Please enable to preview the current cue in/out settings. 2013-05-07 12:46:44 -04:00
Naomi 3a74bb7ca5 CC-2301 : removing shift buttons since it's disabled for this release. 2013-05-06 17:47:35 -04:00
Naomi ce81691743 CC-2301 : not allowing any sliding with only global crossfade durations. 2013-05-03 15:32:07 -04:00
Naomi 75e4e0c9b6 CC-2301 : only showing waveform buttons if the browser supports the audio api. 2013-05-03 14:42:42 -04:00
Naomi f82659d582 CC-2301 : stopping playlist editor to make sure audio isn't stuck playing in the background. 2013-04-30 17:03:40 -04:00
Naomi 2a1ac0ddb9 CC-2301 : updating playlist offsets in playlist builder to reflect crossfade overlaps. 2013-04-30 16:27:31 -04:00
Naomi 0db557a570 CC-2301 : fades editor saving offset to database for playlists and smart blocks. 2013-04-30 15:32:43 -04:00
Naomi 410d298272 CC-2301 : creating an offset column to help create crossfades in the playlist.
changing default fade to be a separate default fade in/out
2013-04-29 16:55:08 -04:00
Naomi a4731d4af2 CC-2301 : automatically updating the fadein/fadeout for a track in the fadein/fadeout states.
Can enable states on a per track basis.
2013-04-26 15:57:02 -04:00
Naomi 2b22828e85 CC-2301 : destorying dialogs instead of just closing to free up resources. 2013-04-25 17:48:35 -04:00
Naomi 8fea97d580 CC-2301 : fade editor now loads currently set fades. Fixing some bugs in the waveform editor. 2013-04-25 17:10:37 -04:00
Naomi 0deaee4d0e CC-2301 : disallowing movement of first track in fade editor. 2013-04-24 15:32:48 -04:00
Naomi 179621d687 CC-2301 : fades editor is loading now with a leftoffset for the second track and the cues for both tracks. 2013-04-24 14:15:07 -04:00
Naomi 956bcccd24 CC-2301 : creating different states for the fade editor:
cursor, fadein, fadeout.
2013-04-23 16:36:35 -04:00
Naomi 04a0d9c54e CC-2301 : waveform editor
current cues being set.
2013-04-17 18:00:16 -04:00
Naomi 0d3c0912ba CC-2301 : Waveform Editor
Cue editor can save values to the playlist.
2013-04-17 17:17:39 -04:00
Naomi 0385285741 CC-2301 : waveform editors are now in their own separate pop up. controls working for fades/cues. should add more specific states for fade editor. 2013-04-16 17:24:30 -04:00
Naomi 13c8e5f146 CC-2301 : showing waveform cue/fade editors inside of a jquery dialog box. 2013-04-16 14:37:08 -04:00
denise 176e78632f Added a comment about referring to the wiki when adding a new datatable column 2013-02-19 16:43:47 -05:00
denise 959839e180 Renamed criteriaTypes to libraryColumnTypes for library advanced search 2013-02-19 15:09:24 -05:00
denise 32fc5eb758 CC-4951: Add cue in and cue out to library filter columns
Configured advanced search for these columns
2013-02-19 14:44:32 -05:00
denise 8bdf3508b0 CC-4951: Add cue in and cue out to library filter columns
Done
2013-02-19 13:38:35 -05:00
denise 49dc3140a8 CC-4962: Library -> Library and playlist editor have different heights sometimes
Fixed: needed to set height when we open the playlist editor
2013-02-19 11:59:17 -05:00
denise 14f1d5572f Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-02-19 10:59:03 -05:00
denise d1301ff676 CC-4954: Please make Library page remember the status per user
-done
2013-02-19 10:58:48 -05:00
Naomi 542553bbc1 Merge branch '2.3.x' into devel 2013-02-15 17:05:36 -05:00
Naomi 9a2b8af7b1 Revert "CC-4955: Datatables saves its parameters twice on every page load"
This reverts commit 39ec07e71c.
2013-02-15 16:50:43 -05:00
Martin Konecny 09baf3a47d remove unecessary file + better error handling 2013-02-15 14:19:04 -05:00
Martin Konecny 39ec07e71c CC-4955: Datatables saves its parameters twice on every page load
-fixed
2013-02-15 14:18:32 -05:00
denise e2e45b0160 CC-4948: Library -> library loses have its width when window is resized
-fixed
2013-02-14 15:34:11 -05:00
denise 1a36953d82 CC-4898: Pressing "Enter" from anywhere on the edit metadata popup should automatically Save and close the popup
-fixed
2013-02-14 14:52:48 -05:00
Martin Konecny bb7e56e39e CC-4943: Raspberry Pi optimization: don't create new background AJAX request until the previous one has returned
-fixed
2013-02-14 12:58:31 -05:00
denise cd5f1149af CC-4924: Calendar: "View Recorded File Metadata" for record show still uses old Metadata Editor
-fixed
2013-02-14 11:43:29 -05:00
denise 74291cc248 Merge branch 'cc-3627-close-playlist' into devel 2013-02-13 17:57:41 -05:00
denise ec159131a8 Merge branch '2.3.x' into devel 2013-02-13 16:09:53 -05:00
denise 6bbb603bcd CC-3627: PlaylistBuilder->Playlist Panel -> it would be very handy to have "Close playlist" functionality 2013-02-13 16:05:11 -05:00
denise 04ed640756 CC-3885: Deleted open playlist is not closed until a new item is added to it
-fixed
2013-02-13 15:44:52 -05:00
denise 2315e3473d CC-4935: Smart Block -> Error when saving sometimes
-fixed
2013-02-07 17:33:11 -05:00
denise 525b2dcb33 CC-4895: Remove all json die() statements from code
- removed json_encode
2013-02-07 15:41:47 -05:00
denise 517a58bc43 CC-4919: Library -> Search: Exception happens when switching back to simple search with some illegal input in Advanced Search
-fixed
2013-02-06 12:36:04 -05:00
denise 8309593a0f CC-4904: Library -> Sort by status doesn't work
- added 2 columns to cc_files (is_scheduled, is_playlist)
- split library status column into two columns (scheduled, playlist)
- is_scheduled gets updated when a track plays out, or when a file gets added/removed from/to a show
- is_playlist gets updated when a file gets added/removed from/to a playlist/block, when a playlist/block gets deleted, or when a playlist/block's contents is cleared
2013-02-01 17:47:07 -05:00
denise 384298f680 CC-4109: Playlist Builder: Add a button to remove all the items in the current editing playlist 2013-02-01 12:06:01 -05:00
denise 3bc2876f27 CC-4903: Library -> Show/hide columns -> Status Column needs label
-fixed
2013-01-31 11:41:00 -05:00
denise cf2ed25bfb CC-4900: Indicate in the library if a webstream is scheduled in the future or belongs to a playlist
-done
2013-01-30 16:53:59 -05:00
denise 4f5d7869d8 Removed html from Library/contents-feed and StoredFile model
Added new Library column to indicate if a file is scheduled in the future or belongs to a playlist/smart block
2013-01-30 15:38:25 -05:00
denise 043fbd1dfb CC-4886: Warn if track is part of a playlist when deleting from library.
-done
2013-01-30 10:55:24 -05:00
denise 9d99b8ae90 CC-4887: Show whether track is scheduled in the future on Library page 2013-01-30 10:33:26 -05:00
drigato c45440482a CC-4887: Show whether track is scheduled in the future on Library page 2013-01-30 08:57:59 -05:00
denise b818f1d46e CC-4866: Library -> Edit metadata -> table does not redraw after
-fixed
2013-01-18 16:40:31 -05:00
denise 2d76d76e2d Removed console.log 2013-01-18 14:49:13 -05:00
Martin Konecny 0dfd8acf7a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-14 16:00:46 -05:00
Martin Konecny fae3f3a03f CC-2184: Hardcoded CSS path should be relative path instead
-Make '/' the default root
2013-01-14 16:00:38 -05:00
James 0eb5fb51b6 CC-4836: Playlist length is wrong because wrong cue out setting.
- fixed
2013-01-14 14:49:06 -05:00
denise 1e6b0fe6ae CC-4833: I18N: Alert message "Please select a cursor posion from timeline." in Now playing page is not translated
-fixed
2013-01-14 13:47:41 -05:00
denise 8362860904 Block expansion ajax url was missing baseUrl 2013-01-11 14:11:01 -05:00
denise 9f857433fa CC-4817: I18N: "Playlist Shuffled" is not listed for translation
-fixed
2013-01-10 14:22:25 -05:00
denise cffad91840 CC-4800: Soundcloud icon qtips do not work and have wrong colour scheme
-fixed
2013-01-07 15:23:51 -05:00
Martin Konecny d6eb043899 CC-4765: Webstream of AAC type can't be previewed
-fixed
2013-01-02 16:09:32 -05:00
James f26778ee72 CC-4757: Duplicate playlist
- done
- we still need a icon for context menu
2012-12-28 16:17:58 -05:00
denise a4008aaef3 CC-4721: Library -> Context Menu -> 'Add to smart block' option only takes affect once the open smart block has been saved 2012-12-19 15:01:53 -05:00
denise 402950211a CC-4735: Library: Edit metadata selection should be a popup instead of going to a new page
-removed redundant 'Ok' button
2012-12-05 13:23:58 -05:00
denise adb966a734 CC-4735: Library: Edit metadata selection should be a popup instead of going to a new page
-cancel button does not reload the page anymore
2012-12-05 13:21:18 -05:00
denise 062740ef81 CC-4735: Library: Edit metadata selection should be a popup instead of going to a new page
-done
2012-12-05 13:16:25 -05:00
denise b2699fa914 merge from devel 2012-12-03 11:06:56 -05:00
denise 542434d9f0 CC-1960: Internationalize Airtime / Support translations
-got rid of spaces at beginning of strings
-removed empty string translations
-overwrote Zend_Validate_Between object error messages
2012-11-28 16:16:39 -05:00
denise b9b387fcd0 CC-1960: Internationalize Airtime / Support translations
-fixed typos
2012-11-27 11:59:55 -05:00
denise dd0e71efcc CC-1960: Internationalize Airtime / Support translations
-added gettext wrapper function to all strings missing it
-i18n of jquery timepicker and datepicker
-i18n of jquery datatables columnFilter input place holder labels
2012-11-22 17:32:24 -05:00
denise 96b87d23e0 CC-1960: Internationalize Airtime / Support translations
-added i18n for plupload
2012-11-22 14:37:54 -05:00
denise 10b6dd202e Merge branch 'devel' into cc-1960-internationalize-airtime
Conflicts:
	airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js
2012-11-21 11:44:40 -05:00
denise 10cd31fa56 CC-1960: Internationalize Airtime / Support translations
- channged all js strings with embedded variables to use sprintf
2012-11-20 17:42:26 -05:00
denise f40d1f8dd4 CC-1960: Internationalize Airtime / Support translations
-enabled i18n for datatables, colVis, columnFilter, and fullCalendar
-fixed typos in full-calendar-functions.js
2012-11-20 16:40:02 -05:00
James 4737232b21 CC-2401: Shuffle option in playlists
- add delayed removing of success message
2012-11-20 15:05:09 -05:00
denise 57fdab0ddf CC-1960: Internationalize Airtime / Support translations
-added i18n jquery library
-created a Locale controller that returns a js dictionary of translations needed in js
-added jquery i18n wrapper function to all strings in js
2012-11-20 11:33:37 -05:00
James 2b2a1db055 CC-2401: Shuffle option in playlists
- done
2012-11-13 17:32:10 -05:00
denise ccd6447696 - install failed due to wrong metadata key
- wrong controller action called
2012-11-07 12:05:20 -05:00
denise b817684972 Merge branch '2.2.x' into devel
Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
	airtime_mvc/application/models/StoredFile.php
	airtime_mvc/public/js/bootstrap/bootstrap.js
2012-11-07 11:21:36 -05:00
denise bf4f5fd699 CC-4607: Library: Please make the 'Add x items' following mouse's point
-fixed
2012-11-06 16:34:06 -05:00
denise a1a7396ec9 CC-4455: "Add to current smart block" context menu action should be disabled for dynamic smart blocks
-disabled this button in the library toolbar if dynamic blocks are open
2012-11-06 14:29:26 -05:00
Martin Konecny d467abe509 Merge branch 'cc-4585' of https://github.com/rgrinberg/Airtime into devel 2012-11-05 11:27:34 -05:00
denise 2854dd40e0 CC-4663: Smart Blocks -> Deleting a track in smart block from library gives error
-fixed
-tracks with undefined mime type were not handled properly
2012-11-02 16:54:49 -04:00
denise 135aadf16b Merge branch '2.2.x' into devel
Conflicts:
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/views/scripts/library/library.phtml
	airtime_mvc/public/js/airtime/showbuilder/builder.js
	airtime_mvc/public/js/airtime/showbuilder/main_builder.js
2012-11-02 12:28:21 -04:00
James 575400b4c2 CC-4623: Library: Preview button for Flac does not work
- fixed
2012-11-01 16:44:37 -04:00
denise dfd52eedf1 CC-4654: Library -> Simple search still has effects even if you are doing an advanced search
-fixed
2012-10-31 15:24:50 -04:00
james 2e4d5ec142 CC-4539: Advanced search: Sample rate searched on Hz, but search results
shown in kHz

- fixed
2012-10-31 12:32:40 -04:00
denise cabe583a3b CC-4649: Library -> Disable simple search if advanced search fields are open
-done
2012-10-30 15:01:46 -04:00
denise 695c0fa926 CC-4607: Library: Please make the 'Add x items' following mouse's point
-fixed
2012-10-30 11:45:53 -04:00
denise 7d8079f770 Merge branch '2.2.x' into devel
Conflicts:
	airtime_mvc/application/controllers/ShowbuilderController.php
	airtime_mvc/public/js/airtime/audiopreview/preview_jplayer.js
	airtime_mvc/public/js/airtime/common/common.js
2012-10-19 12:50:36 -04:00
denise d32495d100 CC-2184: Hardcoded CSS path should be relative path instead 2012-10-19 11:09:34 -04:00
James 67ca0db4c8 CC-4542: Playlists containing dynamic smart blocks cannot be previewed
- fixed
2012-10-16 14:09:34 -04:00
James 7796b23a58 CC-4506: Audio Preview in Playlist doesn't work
- fixed
2012-10-16 12:06:47 -04:00
James 03b32ea986 CC-4563
Library: Exception is found when remove a block by context menu

- fixed
2012-10-16 10:37:42 -04:00
denise 5f35336fd0 CC-2295 Improvements to playlist builder beha...CC-2303 Cue-in Cue-out inconsistency with time values:
-fixed
2012-10-11 11:49:04 -04:00
denise c9ac675a10 CC-4529: Playlist Builder: The panel of 'Adding n items' will be bigger than usual if there is a item in Playlist has expanded cue in/out setting
-fixed
2012-10-09 14:39:29 -04:00
denise 0d35056cd4 CC-4486: Library -> Advanced Search: Alignment is off sometimes
-added placeholders to input tags for format examples
2012-10-04 12:16:57 -04:00
denise eadde1c498 CC-4519: Advanced Search Option: Please use text search instead of scope search from Mime's type
-fixed
2012-10-03 11:29:16 -04:00
denise 3dd7e9767b CC-4481: Library -> Advanced Search -> Validation icon does not show up sometimes
-validation was missing for Encoded By filter
2012-10-02 13:57:36 -04:00
denise 2afc4183bb CC-4496: Library -> Contents-feed does not work if advanced search data is invalid
-fixed
2012-09-19 16:39:56 -04:00
denise b4277f1f17 CC-4495: Library -> Advanced Search: Some fields with ranges do not get validated
-fixed
2012-09-19 15:46:03 -04:00
denise 4b2d6caf0e CC-4485: Library -> Advanced Search -> Tooltip needed for invalid input
-done
2012-09-19 15:35:45 -04:00
denise 81620d4f94 CC-4481: Library -> Advanced Search -> Validation icon does not show up sometimes
-fixed
2012-09-19 12:41:54 -04:00
denise dc95ab1d00 CC-4155: Playlist Builder: Style static/dynamic expansion blocks in playlist contents
-changed null values to empty strings
2012-09-19 11:05:17 -04:00
denise 0c823af660 CC-4155: Playlist Builder: Style static/dynamic expansion blocks in playlist contents
-done
2012-09-19 10:49:17 -04:00
denise 8cae11d588 CC-4478: Library: audio preview check should be skipped if file does not exist
-fixed
2012-09-18 15:52:11 -04:00
James 98f0692b8d CC-4457: Media Library: The background of 'Adding items' is minimize to a point
- fixed
2012-09-18 14:40:18 -04:00
denise e00ff6367d CC-4458: Now Playing -> "+ Add to current playlist text" might be replaced by something more appropriate
-fixed
2012-09-18 11:22:37 -04:00
denise 1698aae251 CC-4466: Buttons on Now Playing page are clickable even though they are disabled
-fixed
2012-09-18 10:53:19 -04:00
denise 9b39ff93b4 -removed console.log 2012-09-17 15:49:22 -04:00
denise 43c336eb6d CC-4155: Playlist Builder: Style static/dynamic expansion blocks in playlist contents
-implemented css changes
-formatted playlist_builder.css
2012-09-17 15:41:22 -04:00
James 5e514b3b60 -UI alignment of input text element 2012-09-17 12:41:58 -04:00
Rudi Grinberg 990bcebfe8 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-17 11:58:18 -04:00
Rudi Grinberg b913b067c2 Added setColumnFilter(oTable) 2012-09-17 11:58:08 -04:00
James b3420984e2 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-17 11:27:52 -04:00
James 396b529162 - UI interation of advanced search 2012-09-17 11:23:38 -04:00