-
Notifications
You must be signed in to change notification settings - Fork 206
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
SAKIII-4875 - Content authoring #1706
Closed
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…en not in edit mode
* master: (33 commits) SAKIII-4588 - Changed naming to match convention SAKIII-4771 - Remove duplicate test NOJIRA - Various fixes SAKIII-4689 - When searching for 3E6, it turns into 3000000 SAKIII-3433 - Fix whitespaces SAKIII-4720 - Fix scrollbars on content in Safari SAKIII-4769 add check for parent title attribute when testing img tags SAKIII-4785 - Update README file SAKIII-4746 change event binding from keyup to keydown SAKIII-4766 - Add docs for RequireJS paths SAKIII-4769 removed search icon image and used css class instead SAKIII-4771 - Fix test failures in Template Renderer SAKIII-3433 - Check for unused keys SAKIII-3433 - Fix reporting for dev files SAKIII-4672 expand message thread when replying to a topic SAKIII-4652 remove unnecessary if statement SAKIII-4769 fixing unit test failure SAKIII-4770 fix util quint test SAKIII-4588 - Fix for the back link of a content item SAKIII-4588 - Fix back and forward buttons ...
…ntentauthoring * 'SAKIII-4806' of git://github.com/bp323/3akai-ux: SAKIII-4806 Implement settings dropdown for a row SAKIII-4810 Create hover and drag style for widgets SAKIII-4805 Update image for row reorder, margin tweaks, hide grid when not in edit mode SAKIII-4805 Add Grid view for edit mode SAKIII-4804 Add styling for row reordering SAKIII-4787 Sort out IE content authoring quirks
… in the system + make draggable
…ntentauthoring * 'SAKIII-4814' of git://github.com/bp323/3akai-ux: SAKIII-4810 Add icons to cell hover menu SAKIII-4810 Create cell hover dropdown menu SAKIII-4805 Make sure first grid cell is a full one SAKIII-4814 Make widget draggable, Add carousel and available widgets in the system + make draggable SAKIII-4814 Make widgets droppable inside of the sortables, add hover icons SAKIII-4814 Set up first row of the Inserter Bar widget SAKIII-4814 Set up the Inserter Bar widget Conflicts: devwidgets/contentauthoring/css/contentauthoring.css
if(column.elements.length) { | ||
$.each(column.elements, function(elIndex, element) { | ||
// Check designed to look at specific storage types | ||
if(element.type === 'htmlblock') { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Missing space after if
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed.
* 1.2.0: SAKIII-5035 Set the date correctly when the UTC clock rolls over SAKIII-5014 Use the API to get the user picture SAKIII-4990 Escape the content URL in the search macro SAKIII-4869 Use the API to get a user's name SAKIII-4995 Added a few safeOutputs to recentcontactsnew and recentmemberships SAKIII-4993 safeOutput group title in entity widget and in the mylibrary widget Conflicts: dev/javascript/user.js devwidgets/mylibrary/javascript/mylibrary.js
* versions: SAKIII-4902 - Page Revisions does not work NOJIRA - Fixing version URL SAKIII-4902 - Page Revisions does not work
Closing to issue a new request against 1.2.0 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
https://jira.sakaiproject.org/browse/SAKIII-4875