d6796ade97
changed wording on displayed message to be more understandable
2018-12-10 15:24:18 -05:00
bfe88efdf3
fixed grammar
2018-12-10 15:11:26 -05:00
6bae72345f
removed dangling else statement
2018-12-03 20:27:45 -05:00
618ca4a559
fixed update.phtml to simplify code and show properly on 0 case
2018-12-03 16:48:16 -05:00
641ba717cf
redid refactor to pluralize output
2018-12-01 09:42:02 -05:00
3d3391bea7
adding part of previous PR that was mistakenly lost
2018-12-01 09:21:52 -05:00
0b3405b1f6
This adds an additional check to prevent calling a non-existent function
2018-01-19 13:59:25 -05:00
b7b581e6ec
Merge remote-tracking branch 'robbt/fix/show_files_meet_criteria' into dev/merge-testing
2018-01-09 21:51:30 +01:00
c8ba866484
Removing carriage return to attempt to try to avoid merge conflict in github UI
2018-01-08 18:47:21 -05:00
25066afb37
Resolve variable name for isSmartBlock vs. isStaticSmartblock to avoid conflict
2018-01-08 18:45:27 -05:00
b958aae77b
Resolve variable name for isSmartBlock vs. isStaticSmartblock to avoid conflict
2018-01-08 18:45:14 -05:00
325f99c169
Merge changes from playlist preview to avoid conflicts
2018-01-08 18:42:55 -05:00
927fcbc42d
Pluralized file criteria, cleaned up CSS and removed dead code
2018-01-03 18:57:02 -05:00
91906e5b5d
Moved files that meet criteria to top of track listing
2017-11-26 14:48:41 -05:00
6bdb570338
Modified smartblock form to allow preview of tracks meeting criteria for dynamic smartblocks
2017-11-21 21:22:06 -05:00
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
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
e6494e7ff0
Better way to disable and reenable xfade button in playlist/sb editors
2015-09-08 16:56:55 -04:00
8c3f1cf535
Fix some issues with playlist/smart-block fade buttons
2015-09-08 16:44:33 -04:00
17c2ec2fd4
Fix responsiveness bugs
2015-09-08 15:25:28 -04:00
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
34e7c09ab7
CC-6118: Playlist crossfade panel needs restyling
...
Started re-styling the playlist fade editor
2015-09-01 12:05:08 -04:00
b312189a7b
CC-6105: DJs can edit playlists, smartblocks, and webstreams they do not own
2015-08-28 17:46:03 -04:00
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
f36ff944c2
SAAS-1031: Can't add tracks to a new playlist
2015-08-28 13:22:08 -04:00
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
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
3f25ab2647
CC-6079 - merge and remove underscore files
2015-08-18 15:23:42 -04:00
4adb9cc55a
CC-6070 - standardize editor buttons
2015-08-17 18:34:39 -04:00
1957c7827f
SAAS-948, SAAS-983 - Showbuilder editor redesign, look and feel fixes
2015-08-12 14:35:27 -04:00
bf6244c835
SAAS-948
2015-08-07 19:20:29 -04:00
e6609896a5
SAAS-948 - showbuilder styling
2015-08-07 16:49:05 -04:00
02d96d7bd0
SAAS-991 - initial playlist editor redesign
2015-08-06 19:16:04 -04:00
cc36fcd37b
Showbuilder checkboxes and style fixes
2015-08-06 16:01:44 -04:00
f138dc6b47
SAAS-948 - tab layout for right-hand pane
2015-07-31 18:28:16 -04:00
fcbc37977f
SAAS-948 - Frontend tweaks
2015-07-28 11:42:04 -04:00
b4c9a77e7c
CC-6055: Improved escaping
2015-06-12 13:48:54 -04:00
7b1cd5c908
CC-5354: Remove PHP short open tags for better compatibility
2013-10-04 14:15:23 -04:00
6d5531f341
CC-5310 : Playlist -> Crash happens on draging a song after a webstream into a playlist
2013-08-27 19:30:17 -04:00
033693721e
CC-5302: Undefined variable in zend log
2013-08-13 16:36:04 -04:00
809d5a35b9
CC-5108 : Waveform Editor UI
...
changing colour to be less dark. can better see highlights/drawn fades.
2013-05-14 15:49:13 -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
2ba743a436
CC-5132 : Playlist Editor: Add file before Smart Block will cause exception
2013-05-13 12:23:05 -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
75e4e0c9b6
CC-2301 : only showing waveform buttons if the browser supports the audio api.
2013-05-03 14:42:42 -04:00
2b5a8b0d4b
CC-2301 : fixing changed function name after merging with master.
2013-05-01 11:41:07 -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
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
Robbt
Lucas Bickel
Robb Ebright
drigato
Duncan Sommerville
Duncan Sommerville
Albert Santoni
Naomi Aro