SAKIII-4875, SAKIII-5027, SAKIII-5040, SAKIII-5058, SAKIII-5070 #1705

Closed
wants to merge 324 commits into
from
This pull request is big! We’re only showing the most recent 100 commits.
Commits on Feb 5, 2012
  1. Merge remote-tracking branch 'nicolaas/contentauthoring' into SAKIII-…

    Bert Pareyn committed Feb 5, 2012
    …4844
  2. SAKIII-4724 - Fix bug in embedcontent widget

    Nicolaas Matthijs committed Feb 5, 2012
  3. Merge remote-tracking branch 'nicolaas/contentauthoring' into SAKIII-…

    Bert Pareyn committed Feb 5, 2012
    …4844
  4. SAKIII-4851 Update cell hover icons to real icons

    Bert Pareyn committed Feb 5, 2012
Commits on Feb 6, 2012
  1. SAKIII-4862 - HTMLBlock widget shows scroll bars in Chrome

    Nicolaas Matthijs committed Feb 6, 2012
  2. SAKIII-4724 - Storing edited text

    Nicolaas Matthijs committed Feb 6, 2012
  3. Merge remote-tracking branch 'nicolaas/contentauthoring' into SAKIII-…

    Bert Pareyn committed Feb 6, 2012
    …4844
  4. SAKIII-4724 - Fixing image rendering in content profile

    Nicolaas Matthijs committed Feb 6, 2012
  5. Merge remote-tracking branch 'nicolaas/contentauthoring' into SAKIII-…

    Bert Pareyn committed Feb 6, 2012
    …4844
  6. SAKIII-4724 - Fixing content migration bug

    Nicolaas Matthijs committed Feb 6, 2012
  7. Merge remote-tracking branch 'nicolaas/contentauthoring' into SAKIII-…

    Bert Pareyn committed Feb 6, 2012
    …4844
  8. SAKIII-4724 - Finishing the HTMLBlock widget

    Nicolaas Matthijs committed Feb 6, 2012
  9. Merge branch 'SAKIII-4844' of git://github.com/bp323/3akai-ux into SA…

    Nicolaas Matthijs committed Feb 6, 2012
    …KIII-4844
    
    * 'SAKIII-4844' of git://github.com/bp323/3akai-ux:
      SAKIII-4847 Adjust template generator to work with new page structure
      SAKIII-4850 Adjust width of cell hover for htmlblock and pagetitle
      SAKIII-4851 Update cell hover icons to real icons
      SAKIII-4846 Allow dragging of content from the inserter into a page
      SAKIII-4845 Display thumbnails for multiple content items added through drag and drop
      SAKIII-4845 Allow dragging of files from the desktop into a page
      SAKIII-4844 Create API function to set permissions on item that are the same as its parent
      SAKIII-4844 Allow drag and drop of external links inside of the content authoring widget
  10. SAKIII-4724 - Problem on pages with no htmlblock widgets

    Nicolaas Matthijs committed Feb 6, 2012
  11. SAKIII-4724 - Bug fix for htmlblock widget

    Nicolaas Matthijs committed Feb 6, 2012
  12. SAKIII-4724 - Migration changes

    Nicolaas Matthijs committed Feb 6, 2012
  13. SAKIII-4849 Adjust the pagesviewer widget to work with new pages stru…

    Bert Pareyn committed Feb 6, 2012
    …cture
  14. SAKIII-4724 - Migration work

    Nicolaas Matthijs committed Feb 6, 2012
  15. SAKIII-4849 Fix bug where 2 or more tinymce bars show up at the same …

    Bert Pareyn committed Feb 6, 2012
    …time
Commits on Feb 7, 2012
  1. Merge branch 'SAKIII-4849' of git://github.com/bp323/3akai-ux into SA…

    Nicolaas Matthijs committed Feb 7, 2012
    …KIII-4849
    
    * 'SAKIII-4849' of git://github.com/bp323/3akai-ux:
      SAKIII-4849 Fix bug where 2 or more tinymce bars show up at the same time
      SAKIII-4848 Style tinyMCE buttons to match the content authoring designs
      SAKIII-4849 Adjust the pagesviewer widget to work with new pages structure
  2. SAKIII-4724 - Fixing row remove bug

    Nicolaas Matthijs committed Feb 7, 2012
  3. SAKIII-4724 - Some format bar fixes

    Nicolaas Matthijs committed Feb 7, 2012
  4. SAKIII-4871 Add "Empty page" images to the new content authoring fram…

    Bert Pareyn committed Feb 7, 2012
    …ework
  5. Merge remote-tracking branch 'nicolaas/contentauthoring' into SAKIII-…

    Bert Pareyn committed Feb 7, 2012
    …4849
  6. SAKIII-4872 Implement empty row placeholder

    Bert Pareyn committed Feb 7, 2012
  7. SAKIII-4724 - Migration fixes

    Nicolaas Matthijs committed Feb 7, 2012
  8. SAKIII-4724 - Finishing migration

    Nicolaas Matthijs committed Feb 7, 2012
  9. SAKIII-4724 - Improving tinyMCE hovering

    Nicolaas Matthijs committed Feb 7, 2012
  10. SAKIII-4724 - Fixing migration problem

    Nicolaas Matthijs committed Feb 7, 2012
Commits on Feb 8, 2012
  1. Merge remote-tracking branch 'nicolaas/contentauthoring' into SAKIII-…

    Bert Pareyn committed Feb 8, 2012
    …4871
  2. SAKIII-4878 Text edit controls display incorrectly after dragging tex…

    Bert Pareyn committed Feb 8, 2012
    …t element
  3. Merge remote-tracking branch 'nicolaas/contentauthoring' into SAKIII-…

    Bert Pareyn committed Feb 8, 2012
    …4871
  4. SAKIII-4724 - Cancel and save problem

    Nicolaas Matthijs committed Feb 8, 2012
  5. Merge remote-tracking branch 'nicolaas/contentauthoring' into SAKIII-…

    Bert Pareyn committed Feb 8, 2012
    …4871
  6. Merge branch 'SAKIII-4871' of git://github.com/bp323/3akai-ux into SA…

    Nicolaas Matthijs committed Feb 8, 2012
    …KIII-4871
    
    * 'SAKIII-4871' of git://github.com/bp323/3akai-ux:
      SAKIII-4878 Text edit controls display incorrectly after dragging text element
      SAKIII-4873 Replace styles in formatselect dropdown by sakai styles
      SAKIII-4872 Implement empty row placeholder
      SAKIII-4871 Add "Empty page" images to the new content authoring framework
  7. SAKIII-4889 The last row should not be deletable

    Bert Pareyn committed Feb 8, 2012
  8. SAKIII-4724 - Fixing the empty pageholder bugs

    Nicolaas Matthijs committed Feb 8, 2012
  9. Merge branch 'SAKIII-4871' of git://github.com/bp323/3akai-ux into SA…

    Nicolaas Matthijs committed Feb 8, 2012
    …KIII-4871
    
    * 'SAKIII-4871' of git://github.com/bp323/3akai-ux:
      SAKIII-4889 The last row should not be deletable
      SAKIII-4877 Widget drop placeholder is visible in view mode
  10. SAKIII-4883 Inserter Bar does not float well when browser window is r…

    Bert Pareyn committed Feb 8, 2012
    …esized
  11. Merge remote-tracking branch 'nicolaas/contentauthoring' into SAKIII-…

    Bert Pareyn committed Feb 8, 2012
    …4871
  12. SAKIII-4889 Tweak implementation of last row deletion

    Bert Pareyn committed Feb 8, 2012
  13. SAKIII-4724 - Changing default content

    Nicolaas Matthijs committed Feb 8, 2012
  14. Merge branch 'SAKIII-4871' of git://github.com/bp323/3akai-ux into SA…

    Nicolaas Matthijs committed Feb 8, 2012
    …KIII-4871
    
    * 'SAKIII-4871' of git://github.com/bp323/3akai-ux:
      SAKIII-4889 Tweak implementation of last row deletion
      SAKIII-4883 Inserter Bar does not float well when browser window is resized
  15. SAKIII-4724 - Fixing the min-height

    Nicolaas Matthijs committed Feb 8, 2012
  16. SAKIII-4893 Empty row placeholder does not disappear when adding in a…

    Bert Pareyn committed Feb 8, 2012
    … title
  17. Merge remote-tracking branch 'nicolaas/contentauthoring' into SAKIII-…

    Bert Pareyn committed Feb 8, 2012
    …4871
  18. SAKIII-4724 - Changing min height

    Nicolaas Matthijs committed Feb 8, 2012
  19. SAKIII-4882 - Google Maps widget - map size option is displayed on re…

    Nicolaas Matthijs committed Feb 8, 2012
    …ndered page
Commits on Feb 10, 2012
  1. SAKIII-4893 Empty row placeholder does not disappear when adding in a…

    Bert Pareyn committed Feb 10, 2012
    … title
  2. SAKIII-4881 - Cancelling page edit appears to save all Inserted objec…

    Nicolaas Matthijs committed Feb 10, 2012
    …ts until page is refreshed
  3. SAKIII-4905 - Top nav drop down menus display behind inserter bar in …

    Nicolaas Matthijs committed Feb 10, 2012
    …editing mode
  4. SAKIII-4724 - Fixing problem with row resizing after delete

    Nicolaas Matthijs committed Feb 10, 2012
  5. Merge remote-tracking branch 'nicolaas/contentauthoring' into SAKIII-…

    Bert Pareyn committed Feb 10, 2012
    …4884
  6. Merge branch 'master' into camaster

    Nicolaas Matthijs committed Feb 10, 2012
    * master: (24 commits)
      SAKIII-4696 - Fix search for long tags
      SAKIII-4794 Add padding, fix retrieval of username
      SAKIII-4906 fix problem with icons not aligned in search grid view
      SAKIII-4741 Fixing formatting issue, was causing a JSHint error
      SAKIII-4741 fix issue with caching group roles and updating participants widget
      SAKIII-4716 - Replace getTotalCount method with Underscore.js
      SAKIII-4755 - Remove shortenString method
      SAKIII-4830 fix image max width for document viewer
      SAKIII-4864 dont validate on keyup in add link form
      SAKIII-4754 - Fix global variables
      NOJIRA fixing some dependency issues, and removing the jisccontent widget from the test widget definitions
      SAKIII-4866 fix mimetype error
      SAKIII-4833 assign default value to el
      SAKIII-4833 position dialog in some widgets
      SAKIII-4833 position sendmessage dialog at users scroll position
      SAKIII-4833 position addtocontacts dialog at users scroll position with new api function
      SAKIII-4708 added hidden placeholder text where test was failing
      SAKIII-4749 Added missing rootel on form
      SAKIII-4708 only checking widgets, and added test to check first node for text
      SAKIII-4708 work on IE8 bug unit test and fix some areas where this bug was occurring
      ...
    
    Conflicts:
    	devwidgets/embedcontent/css/embedcontent.css
  7. SAKIII-4913 Landing page title has line height problem

    Bert Pareyn committed Feb 10, 2012
  8. Merge remote-tracking branch 'nicolaas/contentauthoring' into SAKIII-…

    Bert Pareyn committed Feb 10, 2012
    …4884
  9. SAKIII-4909 Dragging widget into row and cancelling the add removes D…

    Bert Pareyn committed Feb 10, 2012
    …ouble click to start typing...
  10. SAKIII-4900 Webkit Browsers have strange highlight of row when using …

    Bert Pareyn committed Feb 10, 2012
    …double-click to start typing
  11. SAKIII-4898 Collector is not aware of collection deletions until a pa…

    Bert Pareyn committed Feb 10, 2012
    …ge refresh
  12. SAKIII-4903 - Cannot add pages to Sakai Documents

    Nicolaas Matthijs committed Feb 10, 2012
  13. SAKIII-4724 - Fixing timing issue

    Nicolaas Matthijs committed Feb 10, 2012
  14. SAKIII-4724 - Widget data loading fixes

    Nicolaas Matthijs committed Feb 10, 2012
  15. SAKIII-4917 - Converted blank sakai-docs cannot have widgets added to…

    Nicolaas Matthijs committed Feb 10, 2012
    … them
  16. SAKIII-4724 - Widget storing issue

    Nicolaas Matthijs committed Feb 10, 2012
  17. SAKIII-4919 - Strings longer than width of column continue off screen…

    Nicolaas Matthijs committed Feb 10, 2012
    … and do not wrap
Commits on Feb 11, 2012
  1. Merge branch 'SAKIII-4884' of git://github.com/bp323/3akai-ux into SA…

    Nicolaas Matthijs committed Feb 11, 2012
    …KIII-4884
    
    * 'SAKIII-4884' of git://github.com/bp323/3akai-ux:
      SAKIII-4898 Collector is not aware of collection deletions until a page refresh
      SAKIII-4900 Webkit Browsers have strange highlight of row when using double-click to start typing
      SAKIII-4909 Dragging widget into row and cancelling the add removes Double click to start typing...
      SAKIII-4913 Landing page title has line height problem
      SAKIII-4899 Font Size menu displays wraps and overlaps font size 7
      SAKIII-4893 Empty row placeholder does not disappear when adding in a title
      SAKIII-4884 No keyboard accessible way to add widgets to the page
    
    Conflicts:
    	devwidgets/contentauthoring/javascript/contentauthoring.js
    	devwidgets/inserterbar/inserterbar.html
  2. SAKIII-4879 - Page Title element cannot be edited once dragged onto t…

    Nicolaas Matthijs committed Feb 11, 2012
    …he page
  3. SAKIII-4910 - Clicking Name of Content Item in Files and Documents wi…

    Nicolaas Matthijs committed Feb 11, 2012
    …dget does not open content item
Commits on Feb 12, 2012
  1. Merge branch 'master' into contentauthoring

    Nicolaas Matthijs committed Feb 12, 2012
    * master:
      SAKIII-4813 disable select boxes and roles the user doesnt have permission to change
      SAKIII-4789 update users name in entity and topnav when profile updated
      SAKIII-4111 fix some issues with the ggadget widget
      SAKIII-4332 - hide loading spinner initially on list load and on error
      SAKIII-4671 grey out library selection that collection is already in
      SAKIII-4673 Most popular tags widget should be normalized
      SAKIII-4264 - FF: Unresponsive script
      SAKIII-4841 - Fix switch collectionview error
      SAKIII-4688 - Fix & issue in library and search
      SAKIII-4659 - Fix tags issue in Chrome
      SAKIII-4788 - Enable search for a userid
      SAKIII-4719 - Clean up coverage button code
    
    Conflicts:
    	devwidgets/mylibrary/mylibrary.html
Commits on Feb 13, 2012
  1. SAKIII-4926 - Adding page to SakaiDoc area within world does not add …

    Nicolaas Matthijs committed Feb 13, 2012
    …the page to SakaiDoc
  2. SAKIII-4931 Default message styling has changed

    Bert Pareyn committed Feb 13, 2012
  3. SAKIII-4922 - Pages added to worlds have no rows and cannot have widg…

    Nicolaas Matthijs committed Feb 13, 2012
    …ets added
  4. SAKIII-4896 - Horizontal scroll bar on search results page in WebKit …

    Nicolaas Matthijs committed Feb 13, 2012
    …browsers
  5. SAKIII-4900 Webkit Browsers have strange highlight of row when using …

    Bert Pareyn committed Feb 13, 2012
    …double-click to start typing
  6. SAKIII-4915 Hide search from inserter until backend feed has been cre…

    Bert Pareyn committed Feb 13, 2012
    …ated
  7. SAKIII-4931 Fix regression

    Bert Pareyn committed Feb 13, 2012
  8. SAKIII-4884 Add focus styles to icons and links

    Bert Pareyn committed Feb 13, 2012
  9. SAKIII-4901 - Content does not auto-save

    Nicolaas Matthijs committed Feb 13, 2012
  10. SAKIII-4724 - Bind to save event once

    Nicolaas Matthijs committed Feb 13, 2012
  11. SAKIII-4933 contentauthoring_row_edit menu displays behing PDF insert…

    Bert Pareyn committed Feb 13, 2012
    …ed into row
  12. Version history work

    Nicolaas Matthijs committed Feb 13, 2012
Commits on Feb 14, 2012
  1. Merge remote-tracking branch 'nicolaas/contentauthoring' into SAKIII-…

    Bert Pareyn committed Feb 14, 2012
    …4925
  2. SAKIII-4931 Restore line-height to normal

    Bert Pareyn committed Feb 14, 2012
  3. SAKIII-4915 Add search style to inserter

    Bert Pareyn committed Feb 14, 2012
  4. SAKIII-4900 Webkit Browsers have strange highlight of row when using …

    Bert Pareyn committed Feb 14, 2012
    …double-click to start typing
  5. SAKIII-4978 When hover to Add row above/below submenu, submenu disapp…

    Bert Pareyn committed Feb 14, 2012
    …ears before can be clicked on it