Commit Graph

127 Commits

Author SHA1 Message Date
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
Duncan Sommerville 17c2ec2fd4 Fix responsiveness bugs 2015-09-08 15:25:28 -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
drigato 34e7c09ab7 CC-6118: Playlist crossfade panel needs restyling
Started re-styling the playlist fade editor
2015-09-01 12:05:08 -04:00
drigato b312189a7b CC-6105: DJs can edit playlists, smartblocks, and webstreams they do not own 2015-08-28 17:46:03 -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
Albert Santoni f36ff944c2 SAAS-1031: Can't add tracks to a new playlist 2015-08-28 13:22:08 -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
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 3f25ab2647 CC-6079 - merge and remove underscore files 2015-08-18 15:23:42 -04:00
Duncan Sommerville 4adb9cc55a CC-6070 - standardize editor buttons 2015-08-17 18:34:39 -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 bf6244c835 SAAS-948 2015-08-07 19:20:29 -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 f138dc6b47 SAAS-948 - tab layout for right-hand pane 2015-07-31 18:28:16 -04:00
Duncan Sommerville fcbc37977f SAAS-948 - Frontend tweaks 2015-07-28 11:42:04 -04:00
Albert Santoni b4c9a77e7c CC-6055: Improved escaping 2015-06-12 13:48:54 -04:00
Albert Santoni 7b1cd5c908 CC-5354: Remove PHP short open tags for better compatibility 2013-10-04 14:15:23 -04:00
Naomi Aro 6d5531f341 CC-5310 : Playlist -> Crash happens on draging a song after a webstream into a playlist 2013-08-27 19:30:17 -04:00
drigato 033693721e CC-5302: Undefined variable in zend log 2013-08-13 16:36:04 -04:00
Naomi 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
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 2ba743a436 CC-5132 : Playlist Editor: Add file before Smart Block will cause exception 2013-05-13 12:23:05 -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 75e4e0c9b6 CC-2301 : only showing waveform buttons if the browser supports the audio api. 2013-05-03 14:42:42 -04:00
Naomi 2b5a8b0d4b CC-2301 : fixing changed function name after merging with master. 2013-05-01 11:41:07 -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 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 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 04a0d9c54e CC-2301 : waveform editor
current cues being set.
2013-04-17 18:00:16 -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 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 74bc485b4b XSS exploit prevention
- Calendar - Show Contents
- Playlist tooltip in Library page
- Adding track to a show
- Widgets
- Playlist/Webstream title and description
- Smart block expansion
2013-02-05 10:56:38 -05:00
denise b45f71e8f9 CC-4897: XSS exploit on library page 2013-02-04 12:44:14 -05:00
Martin Konecny 93ec4c001b Merge branch '2.3.x' into devel
Conflicts:
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/models/StoredFile.php
2013-02-02 21:07:34 -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
Martin Konecny b15c4569eb CC-4894: Need to filter output for potential XSS exploits
-fixed few areas
2013-01-29 15:17:29 -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
denise e5f67c8b05 CC-1960: Internationalize Airtime / Support translations
-added gettext wrapper functions for all strings in view/scripts, and forms
2012-11-20 11:33:37 -05:00
Rudi Grinberg a69ff167d4 mass string change to _ 2012-11-20 11:33:37 -05:00
Rudi Grinberg 15741bdfa9 renamed links 2012-11-20 11:29:56 -05:00