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
79f51f77cb
Merge branch '2.5.x-installer' into saas-dev
2015-06-25 18:21:40 -04:00
c59f401eb1
Fix shift selection in library and builder views
2015-06-25 18:21:22 -04:00
67155b136a
Add downgrade action to UpgradeController, fix SoundCloud schema and bugs
2015-06-24 18:38:04 -04:00
8fcaf7fc74
Merge branch 'saas-dev' into soundcloud
...
Conflicts:
airtime_mvc/application/configs/constants.php
2015-06-24 16:35:06 -04:00
a3f1cf1d56
CC-6060 - Fix breaking tooltips when viewing context menu in library
2015-06-22 10:47:34 -04:00
e36c8a16d4
CC-6060 - Fix breaking tooltips when viewing context menu in library
2015-06-22 10:46:29 -04:00
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
b0b6e037ac
CC-6046, CC-6045, CC-6047 - New SoundCloud implementation
2015-06-03 16:57:17 -04:00
8b380086c3
Merge branch 'saas-dev' into saas-speedy
2015-05-04 13:09:51 -04:00
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
f382b1338f
Layout fixes for library and Now Playing screens
2015-04-29 13:41:52 -04:00
6dc8837aff
Removed unused status page stuff for Pro and cleanup for code review
2015-04-17 11:17:35 -04:00
b1ea1f27a3
Fixed empty show Showbuilder bug and started making checkboxes work like cursors used to
2015-04-14 11:30:18 -04:00
b11e98ea24
Reduced the Now Playing screen AJAX on load from 9 to 2.
2015-04-10 19:52:06 -04:00
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
2e2c3d6276
Merge of cc-5709-airtime-analyzer-saas-refactor into saas
2015-02-20 14:27:16 -05:00
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
68cd5b027a
CC-5998: Prevent users from spamming the delete button in the library
2015-02-18 15:56:28 -05:00
af8c6c2f48
Merged 2.5.x into saas
2014-11-10 09:08:03 -05:00
4dab2abf4e
Replaced reoccurring strings with string formatting to aid dynamic translations
2014-11-06 18:40:19 -05:00
fd39db2e24
Merge pull request #75 - Saas relder csrf delete file
2014-10-29 17:55:42 -04:00
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
feff7f4343
tokens for multipart data upload.
2014-10-02 02:04:03 +00:00
9e9e676b54
CC-5709: Airtime Analyzer
...
* Make the Recent Uplods file actions a bit clearer
2014-03-25 15:35:50 -04:00
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
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
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
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
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
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
a5a99da21e
Editing templates, strictly typing metadata for datatables (for unions)
2013-08-01 16:36:18 -04:00
01f835c4c4
CC-4504 : Double scrollbars in Library view
2013-06-10 15:50:33 -04:00
b18495a79e
CC-5210: "Linked" Icon is missing after adding contents into linked show
...
-fixed
2013-06-07 15:15:52 -04:00
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
527b1eaf1d
CC-5191: I18N: "items" is not translated when expanding dynamic Smartblock in playlist
2013-05-30 15:05:57 -04:00
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
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
69f6295553
CC-5108 : Waveform Editor UI
...
error check for if both tracks cannot be decoded.
2013-05-24 11:27:56 -04:00
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
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
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
3ad7c868e2
Merge branch 'SAAS-317-datatables-reorder' into 2.4.x
2013-05-21 17:44:25 -04:00
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
fb605ccb71
Renamed 'Open Playlist Editor' button to 'Open Media Builder' on Library page
2013-05-21 09:30:35 -04:00
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
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
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
872f68505b
CC-5108 Waveform Editor UI
2013-05-13 16:01:06 -04:00
27b79c2e91
CC-5128: Library -> Do not auto sort by scheduled
2013-05-10 16:17:30 -04:00
d06b2f3f94
CC-5116:
...
Please add opus into the file name filter
-fixed
2013-05-08 17:06:50 -04:00
f64e99176e
CC-510: Cue Editor: Please enable to preview the current cue in/out settings.
2013-05-07 12:46:44 -04:00
3a74bb7ca5
CC-2301 : removing shift buttons since it's disabled for this release.
2013-05-06 17:47:35 -04:00
ce81691743
CC-2301 : not allowing any sliding with only global crossfade durations.
2013-05-03 15:32:07 -04:00
75e4e0c9b6
CC-2301 : only showing waveform buttons if the browser supports the audio api.
2013-05-03 14:42:42 -04:00
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
2a1ac0ddb9
CC-2301 : updating playlist offsets in playlist builder to reflect crossfade overlaps.
2013-04-30 16:27:31 -04:00
0db557a570
CC-2301 : fades editor saving offset to database for playlists and smart blocks.
2013-04-30 15:32:43 -04:00
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
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
2b22828e85
CC-2301 : destorying dialogs instead of just closing to free up resources.
2013-04-25 17:48:35 -04:00
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
0deaee4d0e
CC-2301 : disallowing movement of first track in fade editor.
2013-04-24 15:32:48 -04:00
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
956bcccd24
CC-2301 : creating different states for the fade editor:
...
cursor, fadein, fadeout.
2013-04-23 16:36:35 -04:00
04a0d9c54e
CC-2301 : waveform editor
...
current cues being set.
2013-04-17 18:00:16 -04:00
0d3c0912ba
CC-2301 : Waveform Editor
...
Cue editor can save values to the playlist.
2013-04-17 17:17:39 -04:00
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
13c8e5f146
CC-2301 : showing waveform cue/fade editors inside of a jquery dialog box.
2013-04-16 14:37:08 -04:00
176e78632f
Added a comment about referring to the wiki when adding a new datatable column
2013-02-19 16:43:47 -05:00
959839e180
Renamed criteriaTypes to libraryColumnTypes for library advanced search
2013-02-19 15:09:24 -05:00
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
8bdf3508b0
CC-4951: Add cue in and cue out to library filter columns
...
Done
2013-02-19 13:38:35 -05:00
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
14f1d5572f
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-02-19 10:59:03 -05:00
d1301ff676
CC-4954: Please make Library page remember the status per user
...
-done
2013-02-19 10:58:48 -05:00
542553bbc1
Merge branch '2.3.x' into devel
2013-02-15 17:05:36 -05:00
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
09baf3a47d
remove unecessary file + better error handling
2013-02-15 14:19:04 -05:00
39ec07e71c
CC-4955: Datatables saves its parameters twice on every page load
...
-fixed
2013-02-15 14:18:32 -05:00
e2e45b0160
CC-4948: Library -> library loses have its width when window is resized
...
-fixed
2013-02-14 15:34:11 -05:00
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
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
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
74291cc248
Merge branch 'cc-3627-close-playlist' into devel
2013-02-13 17:57:41 -05:00
ec159131a8
Merge branch '2.3.x' into devel
2013-02-13 16:09:53 -05:00
6bbb603bcd
CC-3627: PlaylistBuilder->Playlist Panel -> it would be very handy to have "Close playlist" functionality
2013-02-13 16:05:11 -05:00
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
2315e3473d
CC-4935: Smart Block -> Error when saving sometimes
...
-fixed
2013-02-07 17:33:11 -05:00
525b2dcb33
CC-4895: Remove all json die() statements from code
...
- removed json_encode
2013-02-07 15:41:47 -05:00
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
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
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
3bc2876f27
CC-4903: Library -> Show/hide columns -> Status Column needs label
...
-fixed
2013-01-31 11:41:00 -05:00
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
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
043fbd1dfb
CC-4886: Warn if track is part of a playlist when deleting from library.
...
-done
2013-01-30 10:55:24 -05:00
9d99b8ae90
CC-4887: Show whether track is scheduled in the future on Library page
2013-01-30 10:33:26 -05:00
c45440482a
CC-4887: Show whether track is scheduled in the future on Library page
2013-01-30 08:57:59 -05:00
b818f1d46e
CC-4866: Library -> Edit metadata -> table does not redraw after
...
-fixed
2013-01-18 16:40:31 -05:00
Duncan Sommerville
Albert Santoni
drigato
Robert Elder
Naomi
Martin Konecny
denise