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

Closed
wants to merge 324 commits into
from

Conversation

Projects
None yet
5 participants
Member

bp323 commented Feb 23, 2012

SAKIII-4875 Fixes per code review in inserter and inserterbar widget
https://jira.sakaiproject.org/browse/SAKIII-4875

SAKIII-5027 Line height in htmlblock widget is too cramped
https://jira.sakaiproject.org/browse/SAKIII-5027

SAKIII-5040 Format and Font size dropdown have blue text
https://jira.sakaiproject.org/browse/SAKIII-5040

SAKIII-5058 Clean up pageviewer
https://jira.sakaiproject.org/browse/SAKIII-5058

SAKIII-5070 Inserter looks odd after resize
https://jira.sakaiproject.org/browse/SAKIII-5070

Bert Pareyn and others added some commits Feb 5, 2012

Bert Pareyn Merge remote-tracking branch 'nicolaas/contentauthoring' into SAKIII-…
…4844
93b0bf3
Nicolaas Matthijs SAKIII-4724 - Fix bug in embedcontent widget bfbfaaf
Bert Pareyn Merge remote-tracking branch 'nicolaas/contentauthoring' into SAKIII-…
…4844
c8f6c97
Bert Pareyn SAKIII-4846 Allow dragging of content from the inserter into a page d72f0ee
Bert Pareyn SAKIII-4851 Update cell hover icons to real icons 45e23b5
Bert Pareyn SAKIII-4850 Adjust width of cell hover for htmlblock and pagetitle cc65cc0
Bert Pareyn SAKIII-4847 Adjust template generator to work with new page structure cf7856a
Nicolaas Matthijs SAKIII-4862 - HTMLBlock widget shows scroll bars in Chrome 1fd2bef
Nicolaas Matthijs SAKIII-4724 - Storing edited text 2926d0b
Bert Pareyn Merge remote-tracking branch 'nicolaas/contentauthoring' into SAKIII-…
…4844
2b48ad5
Nicolaas Matthijs SAKIII-4724 - Fixing image rendering in content profile eaaea96
Bert Pareyn Merge remote-tracking branch 'nicolaas/contentauthoring' into SAKIII-…
…4844
7640ead
Nicolaas Matthijs SAKIII-4724 - Fixing content migration bug 85c42b7
Bert Pareyn Merge remote-tracking branch 'nicolaas/contentauthoring' into SAKIII-…
…4844
5540805
Nicolaas Matthijs SAKIII-4724 - Finishing the HTMLBlock widget b73fe2a
Nicolaas Matthijs Merge branch 'SAKIII-4844' of git://github.com/bp323/3akai-ux into SA…
…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
b57010d
Nicolaas Matthijs SAKIII-4724 - Problem on pages with no htmlblock widgets 2deb3b8
Nicolaas Matthijs SAKIII-4724 - Bug fix for htmlblock widget 8981571
Nicolaas Matthijs SAKIII-4724 - Migration changes 10581df
Bert Pareyn SAKIII-4849 Adjust the pagesviewer widget to work with new pages stru…
…cture
95e87a5
Nicolaas Matthijs SAKIII-4724 - Migration work 1179e02
Bert Pareyn SAKIII-4848 Style tinyMCE buttons to match the content authoring designs e0f7972
Bert Pareyn SAKIII-4849 Fix bug where 2 or more tinymce bars show up at the same …
…time
90a2be0
Nicolaas Matthijs Merge branch 'SAKIII-4849' of git://github.com/bp323/3akai-ux into SA…
…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
e83dfb4
Nicolaas Matthijs SAKIII-4724 - Fixing row remove bug 0e2c7a1
Nicolaas Matthijs SAKIII-4724 - Some format bar fixes d3cfaff
Bert Pareyn SAKIII-4871 Add "Empty page" images to the new content authoring fram…
…ework
6e8915f
Bert Pareyn Merge remote-tracking branch 'nicolaas/contentauthoring' into SAKIII-…
…4849
5ceddd7
Bert Pareyn SAKIII-4872 Implement empty row placeholder 62bc302
Nicolaas Matthijs SAKIII-4724 - Migration fixes f0e5488
Nicolaas Matthijs SAKIII-4724 - Finishing migration 7533a54
Nicolaas Matthijs SAKIII-4724 - Improving tinyMCE hovering 4b2210a
Nicolaas Matthijs SAKIII-4724 - Fixing migration problem e5c8abd
Bert Pareyn Merge remote-tracking branch 'nicolaas/contentauthoring' into SAKIII-…
…4871
88ac20b
Bert Pareyn SAKIII-4873 Replace styles in formatselect dropdown by sakai styles f4e8cf7
Nicolaas Matthijs SAKIII-4724 - Fixing Chrome inserterbar issue + enabled Table controls a7ab232
Bert Pareyn SAKIII-4878 Text edit controls display incorrectly after dragging tex…
…t element
bba58ce
Bert Pareyn Merge remote-tracking branch 'nicolaas/contentauthoring' into SAKIII-…
…4871
3ac7023
Nicolaas Matthijs SAKIII-4724 - Cancel and save problem 90c179e
Bert Pareyn Merge remote-tracking branch 'nicolaas/contentauthoring' into SAKIII-…
…4871
53d3e5a
Nicolaas Matthijs Merge branch 'SAKIII-4871' of git://github.com/bp323/3akai-ux into SA…
…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
fd55ee6
Bert Pareyn SAKIII-4877 Widget drop placeholder is visible in view mode 1be7423
Bert Pareyn SAKIII-4889 The last row should not be deletable b7dc1a2
Nicolaas Matthijs SAKIII-4724 - Fixing the empty pageholder bugs 4041215
Nicolaas Matthijs Merge branch 'SAKIII-4871' of git://github.com/bp323/3akai-ux into SA…
…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
cd18541
Bert Pareyn SAKIII-4883 Inserter Bar does not float well when browser window is r…
…esized
882ac3f
Bert Pareyn Merge remote-tracking branch 'nicolaas/contentauthoring' into SAKIII-…
…4871
eceb1b2
Bert Pareyn SAKIII-4889 Tweak implementation of last row deletion 4c1aeda
Nicolaas Matthijs SAKIII-4724 - Changing default content e639e0a
Nicolaas Matthijs Merge branch 'SAKIII-4871' of git://github.com/bp323/3akai-ux into SA…
…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
9a80a66
Nicolaas Matthijs SAKIII-4724 - Fixing the min-height 5bdfa36
Bert Pareyn SAKIII-4893 Empty row placeholder does not disappear when adding in a…
… title
b50bd53
Bert Pareyn Merge remote-tracking branch 'nicolaas/contentauthoring' into SAKIII-…
…4871
ad657c7
Nicolaas Matthijs SAKIII-4724 - Changing min height a4f91a4
Nicolaas Matthijs SAKIII-4882 - Google Maps widget - map size option is displayed on re…
…ndered page
b444500
Bert Pareyn SAKIII-4884 No keyboard accessible way to add widgets to the page c54c491
Bert Pareyn SAKIII-4893 Empty row placeholder does not disappear when adding in a…
… title
650d691
Nicolaas Matthijs SAKIII-4881 - Cancelling page edit appears to save all Inserted objec…
…ts until page is refreshed
98f8f38
Nicolaas Matthijs SAKIII-4905 - Top nav drop down menus display behind inserter bar in …
…editing mode
9e5811f
Nicolaas Matthijs SAKIII-4724 - Fixing problem with row resizing after delete c593862
Bert Pareyn Merge remote-tracking branch 'nicolaas/contentauthoring' into SAKIII-…
…4884
8745d8e
Bert Pareyn SAKIII-4899 Font Size menu displays wraps and overlaps font size 7 386b5fc
Nicolaas Matthijs Merge branch 'master' into camaster
* 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
53ff812
Bert Pareyn SAKIII-4913 Landing page title has line height problem 217d88c
Bert Pareyn Merge remote-tracking branch 'nicolaas/contentauthoring' into SAKIII-…
…4884
ecc6178
Bert Pareyn SAKIII-4909 Dragging widget into row and cancelling the add removes D…
…ouble click to start typing...
80edc11
Bert Pareyn SAKIII-4900 Webkit Browsers have strange highlight of row when using …
…double-click to start typing
f8e40f3
Bert Pareyn SAKIII-4898 Collector is not aware of collection deletions until a pa…
…ge refresh
f67a121
Nicolaas Matthijs SAKIII-4903 - Cannot add pages to Sakai Documents 8409474
Nicolaas Matthijs SAKIII-4724 - Fixing timing issue 9de877b
Nicolaas Matthijs SAKIII-4724 - Widget data loading fixes 0111afb
Nicolaas Matthijs SAKIII-4917 - Converted blank sakai-docs cannot have widgets added to…
… them
c4c64b8
Nicolaas Matthijs SAKIII-4724 - Widget storing issue 5e32c86
Nicolaas Matthijs SAKIII-4919 - Strings longer than width of column continue off screen…
… and do not wrap
93131bc
Nicolaas Matthijs Merge branch 'SAKIII-4884' of git://github.com/bp323/3akai-ux into SA…
…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
07cf268
Nicolaas Matthijs SAKIII-4879 - Page Title element cannot be edited once dragged onto t…
…he page
4357f06
Nicolaas Matthijs SAKIII-4910 - Clicking Name of Content Item in Files and Documents wi…
…dget does not open content item
0f13ae8
Nicolaas Matthijs Merge branch 'master' into contentauthoring
* 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
4153bb3
Nicolaas Matthijs SAKIII-4926 - Adding page to SakaiDoc area within world does not add …
…the page to SakaiDoc
40a551f
Bert Pareyn SAKIII-4925 Cannot access entire set of World template content e01fc2f
Bert Pareyn SAKIII-4931 Default message styling has changed 9213e75
Nicolaas Matthijs SAKIII-4922 - Pages added to worlds have no rows and cannot have widg…
…ets added
3de6426
Nicolaas Matthijs SAKIII-4896 - Horizontal scroll bar on search results page in WebKit …
…browsers
bd5980c
Bert Pareyn SAKIII-4929 Inserter bar does not show in correct position in worlds 9c4bb45
Bert Pareyn SAKIII-4900 Webkit Browsers have strange highlight of row when using …
…double-click to start typing
d397629
Bert Pareyn SAKIII-4915 Hide search from inserter until backend feed has been cre…
…ated
323f2f7
Bert Pareyn SAKIII-4931 Fix regression bd9bccd
Bert Pareyn SAKIII-4884 Add focus styles to icons and links 183adfa
Nicolaas Matthijs SAKIII-4901 - Content does not auto-save 15583d9
Nicolaas Matthijs SAKIII-4724 - Bind to save event once 4501b52
Bert Pareyn SAKIII-4933 contentauthoring_row_edit menu displays behing PDF insert…
…ed into row
3158a20
Bert Pareyn SAKIII-4935 Column controls frequently display incompletely in IE b3e8535
Nicolaas Matthijs Version history work ede08f2
Bert Pareyn Merge remote-tracking branch 'nicolaas/contentauthoring' into SAKIII-…
…4925
10e2f1d
Bert Pareyn Merge remote-tracking branch 'origin/master' into SAKIII-4925 3e63770
Bert Pareyn SAKIII-4931 Restore line-height to normal fc271fe
Bert Pareyn SAKIII-4915 Add search style to inserter 60522ac
Bert Pareyn SAKIII-4929 Inserter bar does not show in correct position in worlds 16b1464
Bert Pareyn SAKIII-4900 Webkit Browsers have strange highlight of row when using …
…double-click to start typing
9d498f3
Bert Pareyn SAKIII-4978 When hover to Add row above/below submenu, submenu disapp…
…ears before can be clicked on it
485d7be

Nicolaas Mat... and others added some commits Feb 24, 2012

Nicolaas Matthijs NOJIRA - Following up on code review e864684
Nicolaas Matthijs NOJIRA - Following up on code review c49d242
Nicolaas Matthijs NOJIRA - Fixed bug caused by code cleanup 290af8d
Bert Pareyn SAKIII-5050 Inserter can be dragged behind the branding widget 626f79d
Nicolaas Matthijs NOJIRA - Cleaning up htmlblockwidget d786b07
Nicolaas Matthijs NOJIRA - Code cleanup d1846b6
Bert Pareyn SAKIII-5045 Column height doesn't update in Chrome 2feb850
Nicolaas Matthijs SAKIII-5057 - htmlblock widget doesn't always span the full width of …
…a column
1c9b8f3
Nicolaas Matthijs Merge branch 'SAKIII-5050' of git://github.com/bp323/3akai-ux into SA…
…KIII-5050

* 'SAKIII-5050' of git://github.com/bp323/3akai-ux:
  SAKIII-5050 Inserter can be dragged behind the branding widget
6e8ae07
Nicolaas Matthijs Merge branch 'SAKIII-5045' of git://github.com/bp323/3akai-ux into SA…
…KIII-5045

* 'SAKIII-5045' of git://github.com/bp323/3akai-ux:
  SAKIII-5045 Column height doesn't update in Chrome
d62bcc9
Nicolaas Matthijs NOJIRA - Code cleanup 0392f4e

Bert Pareyn and others added some commits Feb 24, 2012

Bert Pareyn SAKIII-5058 Clean up pageviewer b4cd85f
Nicolaas Matthijs NOJIRA - Code cleanup 810d899
Nicolaas Matthijs NOJIRA - Code cleanup def916e
Nicolaas Matthijs NOJIRA - Fixing hybrid custom config bug 9db0c84
Nicolaas Matthijs NOJIRA - Make hybrid use live feeds 0e9574e
Nicolaas Matthijs NOJIRA - Code cleanup 18f6305
Nicolaas Matthijs NOJIRA - Code cleanup 6633fe6
Nicolaas Matthijs NOJIRA - Code cleanup ae5085c
Nicolaas Matthijs Merge branch 'cleanup' into contentauthoring
* cleanup:
  NOJIRA - Code cleanup
  NOJIRA - Code cleanup
  NOJIRA - Code cleanup
  NOJIRA - Code cleanup
b841c02
Nicolaas Matthijs NOJIRA - Fix cleanjs errors bb91d40
Bert Pareyn SAKIII-4875 Fixes for code review in inserter and inserterbar widget 0716a7f
@jsloane @croby jsloane SAKIII-5030 reset upload form when image has finished loading
Squashed commit of the following:

commit c226a49694b4bbaf9b0d932752a3e0185cdbf4da
Merge: bd64b96 9aaf8c5
Author: Chris Roby <christopher.roby@gmail.com>
Date:   Mon Feb 27 13:13:08 2012 -0800

    Merge remote-tracking branch 'jsloane/SAKIII-5030' into jsloane-SAKIII-5030

commit 9aaf8c5
Author: James Sloane <jsloane@csu.edu.au>
Date:   Thu Feb 23 13:16:34 2012 +1100

    SAKIII-5030 disable upload button until file is selected

commit 7ae5a51
Author: James Sloane <jsloane@csu.edu.au>
Date:   Tue Feb 21 15:47:15 2012 +1100

    SAKIII-5030 reset upload form when image has finished loading
c39bf20
@croby croby Merge pull request #1682 from jsloane/SAKIII-5030
SAKIII-5030 reset upload form when image has finished loading
a9ff08b
Nicolaas Matthijs NOJIRA - Code review follow-up 3d5d97f
Bert Pareyn Merge origin/contentauthoring and fix conflicts 39b9747
Nicolaas Matthijs NOJIRA - Following up on code review 1d2d601
Nicolaas Matthijs NOJIRA - Following up on code review b299926
Bert Pareyn SAKIII-4875 Fixes per comment on Github ddfc4eb
Bert Pareyn Merge remote-tracking branch 'origin/contentauthoring' into SAKIII-4875 7a6b831
Bert Pareyn Merge SAKIII-5058 and fix conflicts f4ce66c
Nicolaas Matthijs NOJIRA - Following up on code review 8e70d01
Bert Pareyn Merge remote-tracking branch 'origin/contentauthoring' into SAKIII-4875 a4f6189
Bert Pareyn SAKIII-5058 Fix regression, apply style rules d69df05
Bert Pareyn Merge remote-tracking branch 'origin/contentauthoring' into SAKIII-5027 15fec73
Bert Pareyn SAKIII-5027 Line height in htmlblock widget is too cramped 18022d2
Nicolaas Matthijs NOJIRA - Regression fix 7a45af2
Nicolaas Matthijs NOJIRA - Regression fixes 0a93e94
Bert Pareyn SAKIII-4963 Highlights sometimes get stuck on the page d917dee
Bert Pareyn Merge remote-tracking branch 'origin/contentauthoring' into SAKIII-5040 cd79343
Bert Pareyn SAKIII-5040 Format and Font size dropdown have blue text 2eb949f
Nicolaas Matthijs NOJIRA - Regression fix 47c2a9c
Bert Pareyn Merge remote-tracking branch 'origin/contentauthoring' into SAKIII-5040 3eed185
Nicolaas Matthijs Merge branch 'master' into contentauthoring
* master:
  SAKIII-5030 reset upload form when image has finished loading
  SAKIII-5053 - Show extra warning private -> public
  SAKIII-5044 - My contacts count lhnav fix
  SAKIII-4855 Workaround for an issue in the document-viewer library
  SAKIII-4854 Don't cache the docstructure GET ajax call, as IE8's aggressive caching will prevent any new areas from being added (after the first)

Conflicts:
	dev/javascript/user.js
9d92d4b
Bert Pareyn Merge remote-tracking branch 'origin/contentauthoring' into SAKIII-5040 5889b74
Bert Pareyn SAKIII-5070 Inserter looks odd after resize 937e299
Bert Pareyn Merge SAKIII-4875 and fix conflicts c6df99b
Bert Pareyn Merge branch 'SAKIII-4963' into SAKIII-5040 e9b97cc
Bert Pareyn Merge branch 'SAKIII-5027' into SAKIII-5040 9f359d6
Nicolaas Matthijs NOJIRA - Documentation cf27325
Bert Pareyn Merge origin/contentauthoring and fix conflicts cc06d24

@nicolaasmatthijs nicolaasmatthijs commented on an outdated diff Feb 28, 2012

devwidgets/inserter/javascript/inserter.js
}
});
- $.each(libraryData, function(i, item){
- if (item._path === collectionId){
+ $contentCountEl.text(collectionCount);
+ if(collectionId !== "library"){
@nicolaasmatthijs

nicolaasmatthijs Feb 28, 2012

Contributor

Add spaces

@nicolaasmatthijs nicolaasmatthijs and 1 other commented on an outdated diff Feb 28, 2012

dev/lib/tinymce/themes/advanced/skins/sakai/ui.css
@@ -139,6 +139,9 @@
.sakaiSkin td.mceRight table {
margin: 0 0 0 auto;
}
+.mceToolbar a {
@nicolaasmatthijs

nicolaasmatthijs Feb 28, 2012

Contributor

shouldn't this be namespaced with .sakaiSkin as well ?

@bp323

bp323 Feb 28, 2012

Member

Absolutely

@nicolaasmatthijs nicolaasmatthijs and 1 other commented on an outdated diff Feb 28, 2012

dev/css/sakai/sakai.corev1.css
@@ -79,6 +79,9 @@
a {
color: #2683bc;
}
+.mceContentBody p {
@nicolaasmatthijs

nicolaasmatthijs Feb 28, 2012

Contributor

Again, this shouldn't be done in corev1.css. It should only happen in htmlblock and tinyMCE, so please move the CSS over there.

@bp323

bp323 Feb 28, 2012

Member

It doesn't get picked up when placed inside of ui.css.

@bp323

bp323 Feb 28, 2012

Member

Moved it into content.css where it gets picked up.

@croby croby and 1 other commented on an outdated diff Feb 28, 2012

...dgets/contentauthoring/javascript/contentauthoring.js
@@ -1444,6 +1453,8 @@ require(['jquery', 'sakai/sakai.api.core', 'jquery-ui'], function($, sakai) {
addNewWidget(null, $el);
});
+ $(window).on("mouseover", checkRemoveHighlight);
@croby

croby Feb 28, 2012

Contributor

Should be single-quotes

@bp323

bp323 Feb 29, 2012

Member

Fixed.

@croby croby and 1 other commented on an outdated diff Feb 28, 2012

devwidgets/inserter/javascript/inserter.js
}
});
- $.each(libraryData, function(i, item){
- if (item._path === collectionId){
+ $contentCountEl.text(collectionCount);
+ if (collectionId !== "library") {
@croby

croby Feb 28, 2012

Contributor

Should be single quotes

@bp323

bp323 Feb 29, 2012

Member

Fixed.

@croby croby and 1 other commented on an outdated diff Feb 28, 2012

devwidgets/inserter/javascript/inserter.js
+ */
+ var emptyCollectionList = function() {
+ var mimetype = $inserterMimetypeFilter.val() || '';
+ disableEnableHeader(!$.trim($(inserterCollectionContentSearch, $rootel).val()) && !mimetype);
+ var query = $.trim($(inserterCollectionContentSearch, $rootel).val());
+ if (!$inserterMimetypeFilter.val() || query) {
+ sakai.api.Util.TemplateRenderer(inserterNoResultsTemplate, {
+ 'search': query,
+ collection: sakai.api.Content.Collections.getCollectionGroupId(contentListDisplayed).replace('c-', '')
+ }, $inserterNoResultsContainer);
+ $inserterNoResultsContainer.show();
+ } else {
+ query = $.trim($(inserterCollectionContentSearch, $rootel).val());
+ sakai.api.Util.TemplateRenderer(inserterNoResultsTemplate, {
+ 'search': 'mimetypesearch',
+ collection: sakai.api.Content.Collections.getCollectionGroupId(contentListDisplayed).replace('c-', '')
@croby

croby Feb 28, 2012

Contributor

Should be consistent with quoting or not quoting the object keys

@bp323

bp323 Feb 29, 2012

Member

Fixed.

@croby croby commented on the diff Feb 28, 2012

devwidgets/inserter/javascript/inserter.js
+ scope: 'content'
+ }, $inserterNoResultsContainer);
+ addDnDToElements();
+ animateUIElements('noresults');
+ };
+
+ /**
+ * Function executed after the infinite scroll list has been rendered
+ * Makes list elements drag and droppable
+ */
+ var collectionListPostRender = function() {
+ // post renderer
+ $inserterNoResultsContainer.hide();
+ sakai.api.Util.Draggable.setupDraggable({
+ connectToSortable: '.contentauthoring_cell_content',
+ start: function() {
@croby

croby Feb 28, 2012

Contributor

I thought Nico had indicated that this was automatically applied in the API?

@bp323

bp323 Feb 29, 2012

Member

Changed to use those functions.

@croby croby and 1 other commented on an outdated diff Feb 28, 2012

devwidgets/inserterbar/javascript/inserterbar.js
@@ -63,10 +66,11 @@ require(['jquery', 'sakai/sakai.api.core'], function($, sakai) {
/**
* Animates the widget in place when the width changes
- * @param width {} The width of the widget to take into account while animating
+ * @param width {int} The width of the widget to take into account while animating
@croby

croby Feb 28, 2012

Contributor

No such thing as an int in Javascript -- it should be a Number

@bp323

bp323 Feb 29, 2012

Member

Fixed.

@croby croby and 1 other commented on an outdated diff Feb 28, 2012

devwidgets/pageviewer/javascript/pageviewer.js
+ $(".pageviewer_lhnav_item button", $rootel).on('click', selectPage);
+ $(".pageviewer_lhnav_item:first button", $rootel).click();
+ };
+
+ /**
+ * Parse cells in a column in a row on a page
+ * @param cellIndex {Object} Index of the cell
+ * @param cell {Object} data for a cell in a column
+ */
+ var parseCells = function(cellIndex, cell) {
+ if ($.isPlainObject(cell)) {
+ if (tempDocData[tempItem._ref][cell.id]) {
+ docData[tempItem._ref][cell.id] = {};
+ if (cell.type !== "htmlblock" && cell.type !== "pagetitle") {
+ docData[tempItem._ref][cell.id][cell.type] = {
+ 'embedmethod': tempDocData[tempItem._ref][cell.id][cell.type].embedmethod,
@croby

croby Feb 28, 2012

Contributor

Should probably create a simple variable and assign it to tempDocData[tempItem._ref][cell.id][cell.type] so you don't have to repeat it everywhere here

@bp323

bp323 Feb 29, 2012

Member

Fixed.

@croby croby and 1 other commented on an outdated diff Feb 28, 2012

devwidgets/pageviewer/javascript/pageviewer.js
fetchPages();
};
- $(window).unbind("start.pageviewer.sakai");
- $(window).bind("start.pageviewer.sakai", function(ev, data){
+ $(window).off('start.pageviewer.sakai');
+ $(window).on('start.pageviewer.sakai', function(ev, data) {
@croby

croby Feb 28, 2012

Contributor

Can combine this line and the previous via chaining the .off and .on

@bp323

bp323 Feb 29, 2012

Member

Fixed.

@croby croby and 1 other commented on an outdated diff Feb 28, 2012

devwidgets/pageviewer/pageviewer.html
- {/if}
+ <ul id="contentauthoring_widget_container">
+ {for row in data[selectedPage].rows}
+ {if $.isPlainObject(row)}
+ ${insertRow(row.id, row.columns)}
+ {/if}
+ {/for}
+ </ul>
+--></div>
+
+<div id="pageviewer_lhnav_template"><!--
+<ul>
+ {for page in data}
+ {if page.pageTitle}
+ <li class="pageviewer_lhnav_item {if page_index === "0"} selected{/if}" data-index="${page_index}">
+ <button type="button" class="s3d-link-button">${page.pageTitle}</button>
@croby

croby Feb 28, 2012

Contributor

Can remove the type attribute here

@bp323

bp323 Feb 29, 2012

Member

Fixed.

Nicolaas Mat... and others added some commits Feb 29, 2012

Nicolaas Matthijs NOJIRA - Fixing version URL d99d5e0
Bert Pareyn SAKIII-5070 Inserter looks odd after resize 0e4b0f2
Bert Pareyn SAKIII-4875 Fixes per comment on Github ec09f80
Bert Pareyn NOJIRA Add blank page placeholder for empty documents in pagesviewer efad401
Nicolaas Matthijs SAKIII-4902 - Page Revisions does not work 842ec77
Nicolaas Matthijs Merge branch '1.2.0' into ca12
* 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
18db153
Nicolaas Matthijs Merge branch 'versions' into contentauthoring
* versions:
  SAKIII-4902 - Page Revisions does not work
  NOJIRA - Fixing version URL
  SAKIII-4902 - Page Revisions does not work
d908732
Bert Pareyn NOJIRA Revert inserterbar changes 2f81b8c
Bert Pareyn Merge origin/contentauthoring and fix conflicts 6ae7ee3
Nicolaas Matthijs NOJIRA - Following up on code review 0241453

@nicolaasmatthijs nicolaasmatthijs and 1 other commented on an outdated diff Feb 29, 2012

...dgets/contentauthoring/javascript/contentauthoring.js
@@ -1516,7 +1527,7 @@ require(['jquery', 'sakai/sakai.api.core', 'jquery-ui'], function($, sakai) {
var uploadError = false;
// Un-highlight on drag leaving drop zone.
- $('.contentauthoring_cell_element', $rootel).live('dragleave', function(ev) {
+ $('.contentauthoring_cell_element', $rootel).live('dragleave dragexit', function(ev) {
@nicolaasmatthijs

nicolaasmatthijs Feb 29, 2012

Contributor

Should be on

@bp323

bp323 Mar 1, 2012

Member

Looks like it was fixed in the latest 1.2.0 branch

@nicolaasmatthijs nicolaasmatthijs and 2 others commented on an outdated diff Feb 29, 2012

...dgets/contentauthoring/javascript/contentauthoring.js
@@ -1437,6 +1446,8 @@ require(['jquery', 'sakai/sakai.api.core', 'jquery-ui'], function($, sakai) {
addNewWidget(null, $el);
});
+ $(window).on('mouseover', checkRemoveHighlight);
@nicolaasmatthijs

nicolaasmatthijs Feb 29, 2012

Contributor

Is this creating any problematic overhead, as this is a function that will be executed all the time?

@croby

croby Feb 29, 2012

Contributor

That's a very good point @nicolaasmatthijs. Seems like we should be using mouseout on the affected element there instead, if possible

@bp323

bp323 Mar 1, 2012

Member

Yes good point, I added the event to the $rootel and changed it to mouseout as well.

@nicolaasmatthijs nicolaasmatthijs and 1 other commented on an outdated diff Feb 29, 2012

devwidgets/pageviewer/javascript/pageviewer.js
+ };
+
+ /**
+ * Parse columns in a row on a page
+ * @param columnIndex {Object} Index of the column
+ * @param column {Object} data for a column
+ */
+ var parseColumns = function(columnIndex, column) {
+ if ($.isPlainObject(column)) {
+ $.each(column.elements, parseCells);
+ }
+ };
+
+ /**
+ * Parse rows on a page
+ * @param rowIndex {Object} Index of the row
@nicolaasmatthijs

nicolaasmatthijs Feb 29, 2012

Contributor

type is backwards.

@bp323

bp323 Mar 1, 2012

Member

Fixed and went through the inserterbar, inserter and contentauthoring widgets as well to straighten this out.

@nicolaasmatthijs nicolaasmatthijs and 1 other commented on an outdated diff Feb 29, 2012

devwidgets/pageviewer/javascript/pageviewer.js
+ if (itemsIndex.indexOf('__array__') === 0) {
+ docData[tempItem._ref][cell.id][cell.type].items[itemsIndex] = cellItem;
+ }
+ });
+ }
+ } else {
+ docData[tempItem._ref][cell.id][cell.type] = {
+ 'content': cellData.content
+ };
+ }
+ }
+ }
+ };
+
+ /**
+ * Parse columns in a row on a page
@nicolaasmatthijs

nicolaasmatthijs Feb 29, 2012

Contributor

Type is backwards.

@bp323

bp323 Mar 1, 2012

Member

Fixed

@nicolaasmatthijs nicolaasmatthijs and 1 other commented on an outdated diff Feb 29, 2012

devwidgets/pageviewer/javascript/pageviewer.js
+ * Renders the left hand navigation in the pageviewer widget
+ */
+ var renderNavigation = function() {
+ sakai.api.Util.TemplateRenderer(pageViewerLHNavTemplate, {
+ data: docData,
+ selectedPage: selectedPage
+ }, $pageViewerLHNavContainer, false);
+
+ $pageViewerLHNavContainer.show();
+
+ $(".pageviewer_lhnav_item button", $rootel).on('click', selectPage);
+ $(".pageviewer_lhnav_item:first button", $rootel).click();
+ };
+
+ /**
+ * Parse cells in a column in a row on a page
@nicolaasmatthijs

nicolaasmatthijs Feb 29, 2012

Contributor

Type is backwards.

@bp323

bp323 Mar 1, 2012

Member

Fixed

Nicolaas Mat... and others added some commits Feb 29, 2012

Nicolaas Matthijs NOJIRA - Following up on code review e16ad8f
Nicolaas Matthijs Merge branch '1.2.0' into ca12
* 1.2.0:
  SAKIII-5068 Get the latest docstructure before overwriting it when adding a subpage to a sakaidoc
  SAKIII-4629 Allow embedding of collections in pages
  SAKIII-4979 Adding some escaping to the carousel

Conflicts:
	dev/javascript/content_profile.js
	devwidgets/collectionviewer/css/collectionviewer.css
	devwidgets/lhnavigation/javascript/lhnavigation.js
9ce221b
Nicolaas Matthijs NOJIRA - Resolving merge conflict 491d109
Nicolaas Matthijs NOJIRA - Following up on code review 71ef38d
Nicolaas Matthijs NOJIRA - Following up on code review 63740e7
Nicolaas Matthijs NOJIRA - Code review follow-up 29fd293
Nicolaas Matthijs NOJIRA - Code review f167205
Nicolaas Matthijs NOJIRA - Code review 69e5e2b
Nicolaas Matthijs NOJIRA - Code review de9091a
Nicolaas Matthijs NOJIRA - Code review + qunit test failures 8d04bea
@croby Nicolaas Matthijs SAKIII-4875 - Content authoring
Squashed commit of the following:

commit 8d04bea87a3ac79da1f5f6c94510386cc8f4535e
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Thu Mar 1 00:36:07 2012 +0000

    NOJIRA - Code review + qunit test failures

commit de9091acc99d572d323e83741d16e6d6c27216dc
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Thu Mar 1 00:00:31 2012 +0000

    NOJIRA - Code review

commit 69e5e2bca1145a37ef35879b1225b02112ba33e9
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Wed Feb 29 23:53:38 2012 +0000

    NOJIRA - Code review

commit f1672051588139288994017ea8fa455232c6f557
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Wed Feb 29 23:50:52 2012 +0000

    NOJIRA - Code review

commit 29fd293da868c76e08c3c8a8391d5b7510c1c2a3
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Wed Feb 29 23:46:51 2012 +0000

    NOJIRA - Code review follow-up

commit 63740e7d3d654625c4da60852a9d3c91401b1511
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Wed Feb 29 23:41:11 2012 +0000

    NOJIRA - Following up on code review

commit 71ef38d414aa673b4398de733d8f797aabf95eec
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Wed Feb 29 23:31:57 2012 +0000

    NOJIRA - Following up on code review

commit 491d1098a16083a5a170ee85e6204a71662a02f8
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Wed Feb 29 23:21:05 2012 +0000

    NOJIRA - Resolving merge conflict

commit 9ce221b9fb25f8e42ab07afe98e91106861a11bb
Merge: e16ad8f c64ceb4
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Wed Feb 29 23:11:24 2012 +0000

    Merge branch '1.2.0' into ca12

    * 1.2.0:
      SAKIII-5068 Get the latest docstructure before overwriting it when adding a subpage to a sakaidoc
      SAKIII-4629 Allow embedding of collections in pages
      SAKIII-4979 Adding some escaping to the carousel

    Conflicts:
    	dev/javascript/content_profile.js
    	devwidgets/collectionviewer/css/collectionviewer.css
    	devwidgets/lhnavigation/javascript/lhnavigation.js

commit e16ad8ff7ee6c122b7e857c2f43b85e670ad5c92
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Wed Feb 29 22:46:36 2012 +0000

    NOJIRA - Following up on code review

commit 024145357284a5b6680eac259538c9669a2e6bd4
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Wed Feb 29 22:12:29 2012 +0000

    NOJIRA - Following up on code review

commit d908732a97ad79ffd33797e5f8fe277c4db940e2
Merge: 18db153 842ec77
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Wed Feb 29 20:00:10 2012 +0000

    Merge branch 'versions' into contentauthoring

    * versions:
      SAKIII-4902 - Page Revisions does not work
      NOJIRA - Fixing version URL
      SAKIII-4902 - Page Revisions does not work

commit 18db153dc9ae4c9ef29dd7605664213c61844d99
Merge: cf27325 cbbe1af
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Wed Feb 29 19:58:28 2012 +0000

    Merge branch '1.2.0' into ca12

    * 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

commit 842ec77f5fdbaf4401d92c6846da789612274569
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Wed Feb 29 19:37:09 2012 +0000

    SAKIII-4902 - Page Revisions does not work

commit d99d5e07ed79aba7304849a0cee4d4da99fbc4fc
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Wed Feb 29 11:18:53 2012 +0000

    NOJIRA - Fixing version URL

commit 01dac21518f72297a14d615ea4143bf8d264c5d0
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Tue Feb 28 16:55:28 2012 +0000

    SAKIII-4902 - Page Revisions does not work

commit cf27325bb1fb7f56cc76b21fdf83252db177bf47
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Tue Feb 28 14:14:28 2012 +0000

    NOJIRA - Documentation

commit 9d92d4b3bb386436db9caae4f1cbedbc22eaca3e
Merge: 47c2a9c a9ff08b
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Tue Feb 28 11:53:06 2012 +0000

    Merge branch 'master' into contentauthoring

    * master:
      SAKIII-5030 reset upload form when image has finished loading
      SAKIII-5053 - Show extra warning private -> public
      SAKIII-5044 - My contacts count lhnav fix
      SAKIII-4855 Workaround for an issue in the document-viewer library
      SAKIII-4854 Don't cache the docstructure GET ajax call, as IE8's aggressive caching will prevent any new areas from being added (after the first)

    Conflicts:
    	dev/javascript/user.js

commit 47c2a9c4adf988bb0df5a58c82b7c171da64a401
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Tue Feb 28 11:47:15 2012 +0000

    NOJIRA - Regression fix

commit 0a93e94a5d1ed29ea54f38bf8e33feb765b8d876
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Tue Feb 28 11:27:27 2012 +0000

    NOJIRA - Regression fixes

commit 7a45af2062a8cd2f059682115f3bb07956b0ee34
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Tue Feb 28 10:55:15 2012 +0000

    NOJIRA - Regression fix

commit 8e70d013eec8c02791482003bce8ee86eb875951
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Tue Feb 28 09:28:12 2012 +0000

    NOJIRA - Following up on code review

commit b299926b0f437cdf982e8705c6475c260d932747
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Mon Feb 27 21:43:46 2012 +0000

    NOJIRA - Following up on code review

commit 1d2d601af93dbdc71e53431c989cfad03cc988bf
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Mon Feb 27 21:35:46 2012 +0000

    NOJIRA - Following up on code review

commit 3d5d97f114a8f1ccd354756a82f20d58681e5e4a
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Mon Feb 27 21:13:22 2012 +0000

    NOJIRA - Code review follow-up

commit a9ff08b9e9cb6ef27682e33fc3e8792f66bb086b
Merge: bd64b96 c39bf20
Author: Chris Roby <christopher.roby@gmail.com>
Date:   Mon Feb 27 13:13:09 2012 -0800

    Merge pull request #1682 from jsloane/SAKIII-5030

    SAKIII-5030 reset upload form when image has finished loading

commit c39bf2072ec867a702fc8f49978002fd0836a577
Author: James Sloane <jsloane@csu.edu.au>
Date:   Mon Feb 27 13:13:08 2012 -0800

    SAKIII-5030 reset upload form when image has finished loading

    Squashed commit of the following:

    commit c226a49694b4bbaf9b0d932752a3e0185cdbf4da
    Merge: bd64b96 9aaf8c5
    Author: Chris Roby <christopher.roby@gmail.com>
    Date:   Mon Feb 27 13:13:08 2012 -0800

        Merge remote-tracking branch 'jsloane/SAKIII-5030' into jsloane-SAKIII-5030

    commit 9aaf8c58ec1097d3d9d23c9f46535f6a688ca7bc
    Author: James Sloane <jsloane@csu.edu.au>
    Date:   Thu Feb 23 13:16:34 2012 +1100

        SAKIII-5030 disable upload button until file is selected

    commit 7ae5a510639dd56d68300c8ef56435219df05321
    Author: James Sloane <jsloane@csu.edu.au>
    Date:   Tue Feb 21 15:47:15 2012 +1100

        SAKIII-5030 reset upload form when image has finished loading

commit bb91d40efa961ba70039cabfa5671ce7715c4ad7
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Mon Feb 27 20:23:44 2012 +0000

    NOJIRA - Fix cleanjs errors

commit b841c02f89422d9af9f1865b78bf8a92d9c78984
Merge: 0e9574e ae5085c
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Mon Feb 27 20:13:30 2012 +0000

    Merge branch 'cleanup' into contentauthoring

    * cleanup:
      NOJIRA - Code cleanup
      NOJIRA - Code cleanup
      NOJIRA - Code cleanup
      NOJIRA - Code cleanup

commit ae5085cbff9e84eec3a9954476bd2f3b1d195bcb
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Mon Feb 27 20:13:13 2012 +0000

    NOJIRA - Code cleanup

commit 6633fe665ce54a112c3e180ca7fdc18ed4660731
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Mon Feb 27 19:05:32 2012 +0000

    NOJIRA - Code cleanup

commit 18f6305cf04a5f6db0e911083be18d695a73fa87
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Mon Feb 27 17:24:37 2012 +0000

    NOJIRA - Code cleanup

commit 0e9574e9fc9cee59cf527a7578867681e29c505c
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Mon Feb 27 16:09:18 2012 +0000

    NOJIRA - Make hybrid use live feeds

commit 9db0c849dae5334c3c885fa68efa9fe61aaaf3ae
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Mon Feb 27 16:07:51 2012 +0000

    NOJIRA - Fixing hybrid custom config bug

commit def916edb7ba4a0a44bf8fd01798a881d6c15f9b
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Mon Feb 27 16:07:05 2012 +0000

    NOJIRA - Code cleanup

commit 810d8995c9793c05abf75c79dd8b0aab6cfc3548
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Mon Feb 27 10:57:05 2012 +0000

    NOJIRA - Code cleanup

commit 0392f4e5436add1357dd6ad9133d95a93c964615
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Fri Feb 24 18:19:02 2012 +0000

    NOJIRA - Code cleanup

commit d62bcc997d6bebb0b39b86aa7a3dd895cfc8a6df
Merge: 6e8ae07 2feb850
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Fri Feb 24 15:13:42 2012 +0000

    Merge branch 'SAKIII-5045' of git://github.com/bp323/3akai-ux into SAKIII-5045

    * 'SAKIII-5045' of git://github.com/bp323/3akai-ux:
      SAKIII-5045 Column height doesn't update in Chrome

commit 6e8ae072980f028a1e0a5fc70869a2be689eca99
Merge: 1c9b8f3 626f79d
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Fri Feb 24 15:07:23 2012 +0000

    Merge branch 'SAKIII-5050' of git://github.com/bp323/3akai-ux into SAKIII-5050

    * 'SAKIII-5050' of git://github.com/bp323/3akai-ux:
      SAKIII-5050 Inserter can be dragged behind the branding widget

commit 1c9b8f3cb2a6f26a0a950f9ddd2e7bc54d7d2e11
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Fri Feb 24 14:50:18 2012 +0000

    SAKIII-5057 - htmlblock widget doesn't always span the full width of a column

commit 2feb85029288352faae2f5e4f4478a5586946c39
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Fri Feb 24 14:25:05 2012 +0000

    SAKIII-5045 Column height doesn't update in Chrome

commit d1846b6507191042c1f79ae2f0dc20f102de20d7
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Fri Feb 24 13:59:09 2012 +0000

    NOJIRA - Code cleanup

commit d786b07f303f2867ad3b8d59b4424e27614fac32
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Fri Feb 24 12:18:29 2012 +0000

    NOJIRA - Cleaning up htmlblockwidget

commit 626f79d216176dea38942b2f1810470a9811edff
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Fri Feb 24 11:13:19 2012 +0000

    SAKIII-5050 Inserter can be dragged behind the branding widget

commit 290af8dc0ec535094392625fc01879e6ade4824a
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Fri Feb 24 11:02:11 2012 +0000

    NOJIRA - Fixed bug caused by code cleanup

commit c49d24297806202c94b04ca0f1c59727f9068019
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Fri Feb 24 00:35:50 2012 +0000

    NOJIRA - Following up on code review

commit e864684432fc43891e9be58df604e1c584e7523f
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Fri Feb 24 00:12:21 2012 +0000

    NOJIRA - Following up on code review

commit 44b374a4929781afbaeaaa8d73eeab54e290f4aa
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Fri Feb 24 00:04:12 2012 +0000

    NOJIRA - Following up on code review

commit 87b032ee64c912520de877265da3aa3f093b0561
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Thu Feb 23 23:57:39 2012 +0000

    NOJIRA - Following up on code review

commit f32278efedee216e4d23fb153705560f0b19d8fd
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Thu Feb 23 20:57:28 2012 +0000

    NOJIRA - Following up on code review

commit e7ab735fe6ae782417af7f1d018a36b121d4c594
Merge: 9ab93f3 69ac5f2
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Thu Feb 23 09:43:11 2012 -0800

    Merge pull request #1707 from bp323/SAKIII-5049

    SAKIII-5049 Clean up code in inserter and inserterbar widgets

commit 69ac5f24a30396d1b3973664e60e9d0683e5f40f
Merge: 05ef8fd 9ab93f3
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Thu Feb 23 17:38:07 2012 +0000

    Merge origin/contentauthoring and fix conflicts

commit 05ef8fd48360bcfd56e9c51675ed3b358137c63d
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Thu Feb 23 17:34:34 2012 +0000

    SAKIII-5049 Clean up inserterbar widget

commit 9ab93f3f0bf11dddb2c907d66b75bd300767768e
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Thu Feb 23 17:30:51 2012 +0000

    NOJIRA - Code cleanup

commit e4c0a3f7e6f1e381c7e34eab5d45065bfc6612e1
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Thu Feb 23 17:04:55 2012 +0000

    NOJIRA - Code cleanup

commit 5699d51b377e5a58baeae716238368e71f287316
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Thu Feb 23 15:18:55 2012 +0000

    SAKIII-5049 Clean up inserter widget CSS

commit d23539cbb220791a58e9efb5c5ea10ca024eb0e4
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Thu Feb 23 15:07:23 2012 +0000

    SAKIII-5049 Clean up inserter widget code

commit 9b570b3ccbadaa05b49280bec2e02f5f77622cbb
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Thu Feb 23 14:53:22 2012 +0000

    NOJIRA - Code cleanup

commit 70f1bcf8d20c4fd1b5696bbd6d5c4ad40f379fa8
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Thu Feb 23 14:22:38 2012 +0000

    NOJIRA - Code cleanup

commit 7022df914b03b7ba3bfe61fae250b4d2eeea8f68
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Thu Feb 23 10:25:24 2012 +0000

    NOJIRA - Code cleanup

commit c36282ad8aa7a1f87364c6e61985e2e6b28d8c6f
Merge: cd9cdcc a396b39
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Thu Feb 23 09:57:19 2012 +0000

    Merge branch 'master' into contentauthoring

    * master:
      SAKIII-5022 dont add spacing to carousel if not needed
      SAKIII-5010 adjust height if branding widget is used
      SAKIII-4729 avoid adding duplicate indexed fields to array
      SAKIII-4821 add checkbox title in inbox widget
      SAKIII-5015 fix issue with i18n debug language selection
      SAKIII-5034 - Fix editing of collections
      SAKIII-5033 changed button title
      SAKIII-5003 - Connect with people in Grid View

commit cd9cdcce5d256db19cfeb9f52644d1e48adcb935
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Thu Feb 23 09:56:16 2012 +0000

    NOJIRA - Removing second version of tinyMCE

commit 33e5ebf4b4760ea5b12a6406441dab54b733d584
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Wed Feb 22 20:58:01 2012 +0000

    SAKIII-4946 - Clicking "italic" doesn't give visual feedback

commit 29e09fac8508b1c91a08588624b34ba170c001e4
Merge: d6f7400 f619db7
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Wed Feb 22 20:45:14 2012 +0000

    Merge branch 'SAKIII-5039' of git://github.com/bp323/3akai-ux into SAKIII-5039

    * 'SAKIII-5039' of git://github.com/bp323/3akai-ux:
      SAKIII-5039 Infinite loader problems in inserter

commit d6f7400a73560ec3aeb06d96109b3f5b94dd526c
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Wed Feb 22 20:36:47 2012 +0000

    SAKIII-4943 - Column width isn't set correctly

commit f619db7ebbc84125a64125465302c9e59a661a42
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Wed Feb 22 19:02:52 2012 +0000

    SAKIII-5039 Infinite loader problems in inserter

commit 7d3ab436b484bee8875eb1f3c758c1c928fbff36
Merge: ce8aee9 503b9b7
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Wed Feb 22 16:31:41 2012 +0000

    Merge branch 'SAKIII-5029' of git://github.com/bp323/3akai-ux into SAKIII-5029

    * 'SAKIII-5029' of git://github.com/bp323/3akai-ux:
      SAKIII-5029 Content profile title should be more meaningful

commit ce8aee9c2e0bed70bdaf801db7c03554f67e70c9
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Wed Feb 22 16:07:33 2012 +0000

    SAKIII-4944 - When creating a bulleted-list, the text is cut off

commit 0dd3a28924f1ce4e7be8a701812417b50c95e78e
Merge: d6f379d cba1058
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Wed Feb 22 15:23:13 2012 +0000

    Merge branch 'SAKIII-5036' of git://github.com/bp323/3akai-ux into SAKIII-5036

    * 'SAKIII-5036' of git://github.com/bp323/3akai-ux:
      SAKIII-5036 Number of content items has language problem

commit d6f379de3a528c50e970371a06327b0160506d79
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Wed Feb 22 15:22:46 2012 +0000

    NOJIRA - Removing duplicate style

commit 3a7428c6915af62d988f5bfd4a5f96befdf4cecf
Merge: 0da381c 1f1b960
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Wed Feb 22 15:03:12 2012 +0000

    Merge branch 'SAKIII-5028' of git://github.com/bp323/3akai-ux into SAKIII-5028

    * 'SAKIII-5028' of git://github.com/bp323/3akai-ux:
      SAKIII-5028 CSS for links in pages is too subtle

commit 0da381c20f5846adb77c06e787315f23547dc87c
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Wed Feb 22 15:01:13 2012 +0000

    SAKIII-4894 - Insert/Modify Table Class menu looks like it shows the classes for the entire site

commit 1f1b96077ee309a2b4263ac5a641af04935c4dbf
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Wed Feb 22 14:31:35 2012 +0000

    SAKIII-5028 CSS for links in pages is too subtle

commit 503b9b745ed41e7e62e9a4b308c75707117d1fe5
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Wed Feb 22 14:00:12 2012 +0000

    SAKIII-5029 Content profile title should be more meaningful

commit f9f11522469402913423d80623b24b4e9701188d
Merge: d968d40 3aae18b
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Wed Feb 22 13:55:07 2012 +0000

    Merge remote-tracking branch 'origin/contentauthoring' into SAKIII-4980

commit cba1058a39875fb5e57401c737f8529e2cf082a4
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Wed Feb 22 12:40:44 2012 +0000

    SAKIII-5036 Number of content items has language problem

commit 3aae18badf26aba45cb83315ae44ad5d5b97c4e5
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Wed Feb 22 12:39:23 2012 +0000

    SAKIII-5032 - Incorporate new widget and formatting icons

commit d968d40e85598cd5d5058e8930f18617042b0a51
Merge: 16927da 903c615
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Wed Feb 22 12:20:29 2012 +0000

    Merge remote-tracking branch 'nicolaas/contentauthoring' into SAKIII-4980

commit c610bb44e3b76c92a7bf41c0ebd586c179f7b6a2
Merge: 903c615 16927da
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Wed Feb 22 11:43:26 2012 +0000

    Merge branch 'SAKIII-4980' of git://github.com/bp323/3akai-ux into SAKIII-4980

    * 'SAKIII-4980' of git://github.com/bp323/3akai-ux:
      SAKIII-4936 Style of content in collector seems to indicate that items can be clicked on to open
      SAKIII-5032 Incorporate new widget and formatting icons
      SAKIII-4967 Row/column/widget padding inconsistent
      SAKIII-5028 CSS for links in pages is too subtle
      SAKIII-5029 Content profile title should be more meaningful
      SAKIII-4928 Convert existing world templates to new structure
      SAKIII-4928 Convert existing world templates to new structure
      SAKIII-4968 Can put the library into edit mode
      SAKIII-4968 Can put the library into edit mode
      SAKIII-5002 Can tab out of the unsaved version overlay.
      SAKIII-4971 Dragging and dropping onto a row can cause hover state to stay
      SAKIII-4997 New branding widget causes edit bar to be too high up
      SAKIII-4961 When adding a text box, it is large then immediately shrinks to one line
      SAKIII-4878 Text edit controls display incorrectly after dragging text element
      SAKIII-4942 Line-height issue with the font size dropdown
      SAKIII-4958 The dropdown for Paragraph and "Font size" doesn't look nice in OS X Lion
      SAKIII-4980 Collector randomly opens

commit 903c61588814032482458fbbf6099d28fdf4ccb9
Merge: 4f9f58d 7a5b5d6
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Wed Feb 22 11:40:24 2012 +0000

    Merge branch 'master' into contentauthoring

    * master:
      NOJIRA Changing path to jscoverage js as it was 404'ing for me suddenly, causing an error in the cleanjs test
      SAKIII-5005 fix styling issue when user can't edit
      SAKIII-5016 fix styling issue
      SAKIII-5025 - speech support for main search
      SAKIII-5008 - Fix join worlds from dashboard

commit 16927da925a23baf5a313bc4e03d9c1ffa14bb0b
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Tue Feb 21 15:50:58 2012 +0000

    SAKIII-4936 Style of content in collector seems to indicate that items can be clicked on to open

commit d4c1f05753984163b39bc1bc1de552ea6e42834b
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Tue Feb 21 15:34:17 2012 +0000

    SAKIII-5032 Incorporate new widget and formatting icons

commit 0ecbdbff041ead691a3ba330fdd0041cc1d12c60
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Tue Feb 21 13:58:53 2012 +0000

    SAKIII-4967 Row/column/widget padding inconsistent

commit e2b8cc79ce0985880d43eaac7126e0ddb9ae5f5f
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Tue Feb 21 13:28:12 2012 +0000

    SAKIII-5028 CSS for links in pages is too subtle

commit 4e7510a2ffba23a48c14efa8c9b5cda08b113ebf
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Tue Feb 21 12:13:09 2012 +0000

    SAKIII-5029 Content profile title should be more meaningful

commit 695036dc112ebd6d2cbef88a5bec029eb0ce580a
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Tue Feb 21 11:55:52 2012 +0000

    SAKIII-4928 Convert existing world templates to new structure

commit a6f031f8ab67f077df7b3c4f344599d0bea821cd
Merge: 279bd66 4f9f58d
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Tue Feb 21 11:03:04 2012 +0000

    Merge remote-tracking branch 'nicolaas/contentauthoring' into SAKIII-4980

commit 279bd66586a26230d03ccc289c6e64bffb5c4cc2
Merge: 291697c 45daef9
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Tue Feb 21 11:02:55 2012 +0000

    Merge remote-tracking branch 'origin/master' into SAKIII-4980

commit 291697cc66244006620d47d30444b4826bde2b95
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Tue Feb 21 11:02:38 2012 +0000

    SAKIII-4928 Convert existing world templates to new structure

commit 4f9f58dc2e308d6e10d0ed0ba7643c40a3137e66
Merge: d7a06f3 1d8c93f
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Mon Feb 20 17:30:39 2012 +0000

    Merge branch 'master' into contentauthoring

    * master:
      SAKIII-5009 - Add area screen has wild-floating _List Categories_ link
      SAKIII-5012 add jquery.tagcloud to sakai.dependencies
      SAKIII-4999 - Fix Gritter message - LTI widget
      SAKIII-4965 - fix document click on page edit
      SAKIII-4992 Add configuration option to enable/disable branding widget
      SAKIII-3821 removed unused config properties
      SAKIII-4988 enable mark as read button only if unread messages are selected
      SAKIII-4822 - My Messages inbox _reply_ links and _delete message_ butto...
      SAKIII-2824 use jeditable in contentmetadata widget
      Sakiii 4796b - Better default remote content widget
      SAKIII-4801 update detect_timezone to latest version
      SAKIII-4237 add text to search button
      SAKIII-4671 fix bug when group option not disabled after adding collection to group
      SAKIII-4628 fix bug with certain characters in profile input fields
      SAKIII-4624 fix css issues with contacts and memberships grid view
      SAKIII-4803 Create branding widget
      SAKIII-4885 position progress indicator and sakaidoc dialogs at users scroll position
      SAKIII-4606 - fix 2x dialog + remove in library
      SAKIII-4816 - profile only contains basic info

    Conflicts:
    	devwidgets/entity/css/entity.css

commit e885cc0b428cd41c1db11984b4de65a016e3e7f3
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Mon Feb 20 12:33:45 2012 +0000

    SAKIII-4968 Can put the library into edit mode

commit d1bbe4bc06cf5c9b982275ca70d789f20e10cd22
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Mon Feb 20 12:25:04 2012 +0000

    SAKIII-4968 Can put the library into edit mode

commit 986dd412c6f8b7e92e6b9856af49b5e67bfb2958
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Fri Feb 17 14:16:22 2012 +0000

    SAKIII-5002 Can tab out of the unsaved version overlay.

commit 0b925b650f63a40c5fc148e2552aa536d4d2fb72
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Fri Feb 17 12:01:50 2012 +0000

    SAKIII-4971 Dragging and dropping onto a row can cause hover state to stay

commit 8cc2c1b751e14bb864737f303381e891f65dd00f
Merge: f88951b c668235
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Fri Feb 17 11:57:17 2012 +0000

    Merge origin/master and fix conflicts

commit f88951bbcf0bb74a2bbf10089c2251a0cb125566
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Thu Feb 16 16:28:53 2012 +0000

    SAKIII-4997 New branding widget causes edit bar to be too high up

commit b88c70c65418602910f1d704e6e1c907737696e9
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Thu Feb 16 16:19:42 2012 +0000

    SAKIII-4961 When adding a text box, it is large then immediately shrinks to one line

commit 0bbf24ad2421af45b3835264c5bb7bf2ca799515
Merge: e021234 8f8ee5b
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Thu Feb 16 14:30:58 2012 +0000

    Merge remote-tracking branch 'origin/master' into SAKIII-4980

commit e0212343322ea6d02871d1e74970a863229f002f
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Wed Feb 15 15:59:33 2012 +0000

    SAKIII-4878 Text edit controls display incorrectly after dragging text element

commit 7e56445a58dcedaf06fb899f05ffbee9cc9dfcf1
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Wed Feb 15 11:56:10 2012 +0000

    SAKIII-4942 Line-height issue with the font size dropdown

commit 2363088f4d5f6c4a2346a458af209c269cf7163d
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Wed Feb 15 11:26:09 2012 +0000

    SAKIII-4958 The dropdown for Paragraph and "Font size" doesn't look nice in OS X Lion

commit 71ada86675f3d6ac1361025ce6c5e33e875e8624
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Wed Feb 15 11:10:15 2012 +0000

    SAKIII-4980 Collector randomly opens

commit d7a06f3bfdf22c6862f2f483efd4757e19d703e0
Merge: 207a660 9cfaff3
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Tue Feb 14 21:07:09 2012 +0000

    Merge branch 'SAKIII-4930' of git://github.com/christianv/3akai-ux into SAKIII-4930

    * 'SAKIII-4930' of git://github.com/christianv/3akai-ux:
      SAKIII-4930 - fix drag/drop in -webkit

commit 207a6605444168ec9881a2919f88b3904869a2ae
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Tue Feb 14 21:05:43 2012 +0000

    SAKIII-4973 - Can remove all rows

commit 344975e3c03873811205f72ee96cd56417e7b237
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Tue Feb 14 20:42:52 2012 +0000

    SAKIII-4972 - Mouse disappears for Google maps widget

commit 037f88173ad91999ce4a4182aa786e486f5791ad
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Tue Feb 14 20:23:47 2012 +0000

    SAKIII-4887 - When dragging widgets onto the page over a text block it 'appears' to hang
    SAKIII-4954 - When resizing a column, the browser overflows height and width, causing scrollbars

commit 9cfaff3fc4ce6d38eecddf7593cbdd6c953ad2b5
Author: Christian Vuerings <vueringschristian@gmail.com>
Date:   Tue Feb 14 11:48:12 2012 -0800

    SAKIII-4930 - fix drag/drop in -webkit
    https://jira.sakaiproject.org/browse/SAKIII-4930

commit 76535010c7a91f301570c09780b4f2185db561a6
Merge: 4838eb1 820940c
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Tue Feb 14 19:46:19 2012 +0000

    Merge branch 'SAKIII-4925' of git://github.com/bp323/3akai-ux into SAKIII-4925

    * 'SAKIII-4925' of git://github.com/bp323/3akai-ux:
      SAKIII-4970 Cannot reorder rows
      SAKIII-4940 Image size issue when adding image in safari

commit 820940c54209fc08f35bbde90b3596062164ac32
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Tue Feb 14 18:10:01 2012 +0000

    SAKIII-4970 Cannot reorder rows

commit ee5afeb554334b6d4210b321f56183bc864d65da
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Tue Feb 14 17:49:14 2012 +0000

    SAKIII-4940 Image size issue when adding image in safari

commit e2af5ceb0b891b2a41abc571fe1f833244eefc31
Merge: 485d7be 7a29b59
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Tue Feb 14 17:29:01 2012 +0000

    Merge remote-tracking branch 'nicolaas/contentauthoring' into SAKIII-4925

commit 4838eb11d3049d87ac8cf5e21dd065c003a157ab
Merge: 7a29b59 485d7be
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Tue Feb 14 16:57:26 2012 +0000

    Merge branch 'SAKIII-4925' of git://github.com/bp323/3akai-ux into SAKIII-4925

    * 'SAKIII-4925' of git://github.com/bp323/3akai-ux:
      SAKIII-4978 When hover to Add row above/below submenu, submenu disappears before can be clicked on it
      SAKIII-4900 Webkit Browsers have strange highlight of row when using double-click to start typing
      SAKIII-4929 Inserter bar does not show in correct position in worlds
      SAKIII-4915 Add search style to inserter
      SAKIII-4931 Restore line-height to normal
      SAKIII-4935 Column controls frequently display incompletely in IE
      SAKIII-4933 contentauthoring_row_edit menu displays behing PDF inserted into row
      SAKIII-4884 Add focus styles to icons and links
      SAKIII-4931 Fix regression
      SAKIII-4915 Hide search from inserter until backend feed has been created
      SAKIII-4900 Webkit Browsers have strange highlight of row when using double-click to start typing
      SAKIII-4929 Inserter bar does not show in correct position in worlds
      SAKIII-4931 Default message styling has changed
      SAKIII-4925 Cannot access entire set of World template content

commit 7a29b591acac1f2cc2d8d661171f40113e69382d
Merge: ede08f2 c66964b
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Tue Feb 14 16:45:06 2012 +0000

    Merge branch 'master' into contentauthoring

    * master:
      KERN-2546 Deal gracefully with pseudogroups that are 404
      SAKIII-4054 update page reference if it no longer exists
      SAKIII-4863 fix searching in mycontacts
      SAKIII-4811 hide back link if no referrer
      SAKIII-4808 - Message detail view should not link to itself
      SAKIII-4842 Fill joinRole from the current Group if the World template is not found

commit 485d7bee397577338564412146a936467e763b89
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Tue Feb 14 16:41:02 2012 +0000

    SAKIII-4978 When hover to Add row above/below submenu, submenu disappears before can be clicked on it

commit 9d498f3de9371b6541ea09046cc8bdf5c1d58a3e
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Tue Feb 14 16:23:57 2012 +0000

    SAKIII-4900 Webkit Browsers have strange highlight of row when using double-click to start typing

commit 16b146491b95d146567991039c460ae9c1b0e6af
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Tue Feb 14 16:06:44 2012 +0000

    SAKIII-4929 Inserter bar does not show in correct position in worlds

commit 60522ac56ddc53c978621709916975d219760b61
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Tue Feb 14 15:19:00 2012 +0000

    SAKIII-4915 Add search style to inserter

commit fc271fe1efe0ef2335e2b98ce0a314e814724bb9
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Tue Feb 14 14:42:47 2012 +0000

    SAKIII-4931 Restore line-height to normal

commit 3e63770589dc8753291684139a3d3ae751ef1b11
Merge: 10e2f1d c66964b
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Tue Feb 14 14:29:39 2012 +0000

    Merge remote-tracking branch 'origin/master' into SAKIII-4925

commit 10e2f1d3576d1982c7f50452be0cd51abb2b21e1
Merge: b3e8535 4501b52
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Tue Feb 14 14:29:22 2012 +0000

    Merge remote-tracking branch 'nicolaas/contentauthoring' into SAKIII-4925

commit ede08f2b81dc1489f5ea9f83c4041e7349ccafb1
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Mon Feb 13 20:24:06 2012 +0000

    Version history work

commit b3e853568e46a2e3cd1ff3c7819f3f9d0a5ff5d6
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Mon Feb 13 16:46:11 2012 +0000

    SAKIII-4935 Column controls frequently display incompletely in IE

commit 3158a20da6fffdbaa3a6724736f84fd7ee6628ac
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Mon Feb 13 16:31:20 2012 +0000

    SAKIII-4933 contentauthoring_row_edit menu displays behing PDF inserted into row

commit 4501b52c3399393a3b8caf0e68b7020316599129
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Mon Feb 13 13:34:10 2012 +0000

    SAKIII-4724 - Bind to save event once

commit 15583d94236a0bcb70397e9b004a1dc544fbab8b
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Mon Feb 13 13:05:04 2012 +0000

    SAKIII-4901 - Content does not auto-save

commit 183adfa052d76777ecc8ad6735d0fb3a3caea153
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Mon Feb 13 12:16:01 2012 +0000

    SAKIII-4884 Add focus styles to icons and links

commit bd9bccdf4c43b81fbe21891fa9447b7660282d64
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Mon Feb 13 12:02:32 2012 +0000

    SAKIII-4931 Fix regression

commit 323f2f78c07e064ba91d09ca06e5f2cdf244a7c3
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Mon Feb 13 11:37:31 2012 +0000

    SAKIII-4915 Hide search from inserter until backend feed has been created

commit d397629b30a9c038ba80915d025546ea54fba7de
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Mon Feb 13 11:03:39 2012 +0000

    SAKIII-4900 Webkit Browsers have strange highlight of row when using double-click to start typing

commit 9c4bb45653451723af426cc9a360066c882ab9fd
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Mon Feb 13 10:40:28 2012 +0000

    SAKIII-4929 Inserter bar does not show in correct position in worlds

commit bd5980c39fa21bce7550fea77161ebefaffabbc3
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Mon Feb 13 10:34:19 2012 +0000

    SAKIII-4896 - Horizontal scroll bar on search results page in WebKit browsers

commit 3de6426c986b1e6c91e23f7cf31f44b12eef1d50
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Mon Feb 13 10:27:08 2012 +0000

    SAKIII-4922 - Pages added to worlds have no rows and cannot have widgets added

commit 9213e758f45717a24924d378a431297a982d18f6
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Mon Feb 13 10:23:23 2012 +0000

    SAKIII-4931 Default message styling has changed

commit e01fc2fb872f56c1dbdebc97a335f7cc5b02139c
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Mon Feb 13 10:17:20 2012 +0000

    SAKIII-4925 Cannot access entire set of World template content

commit 40a551f6a3250f7acb0020ee1cc3b123e368d5a4
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Mon Feb 13 01:18:52 2012 +0000

    SAKIII-4926 - Adding page to SakaiDoc area within world does not add the page to SakaiDoc

commit 4153bb3a397822711fb94975a4381d0db9f33d06
Merge: 0f13ae8 f2343f6
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Sun Feb 12 23:54:50 2012 +0000

    Merge branch 'master' into contentauthoring

    * 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 &amp; 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

commit 0f13ae800c8576fac25f5a0b9a68f1dd6213660b
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Sat Feb 11 13:16:55 2012 +0000

    SAKIII-4910 - Clicking Name of Content Item in Files and Documents widget does not open content item

commit 4357f06dffd086025a56c29720e90d1ba90b530e
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Sat Feb 11 13:05:03 2012 +0000

    SAKIII-4879 - Page Title element cannot be edited once dragged onto the page

commit 07cf26808bcc98b699c99714e0b770dcc3f364eb
Merge: 93131bc f67a121
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Sat Feb 11 00:03:25 2012 +0000

    Merge branch 'SAKIII-4884' of git://github.com/bp323/3akai-ux into SAKIII-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

commit 93131bcef44120b9dc9923c06bca009247c2d083
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Fri Feb 10 23:49:32 2012 +0000

    SAKIII-4919 - Strings longer than width of column continue off screen and do not wrap

commit 5e32c86bb574273ea9570d0762dc06345c1a53af
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Fri Feb 10 23:42:21 2012 +0000

    SAKIII-4724 - Widget storing issue

commit c4c64b80f11fdddebe2d6529f00c8d7603845501
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Fri Feb 10 23:24:27 2012 +0000

    SAKIII-4917 - Converted blank sakai-docs cannot have widgets added to them

commit 0111afbf9562b3caf97ba214c9b73ac49b25a24c
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Fri Feb 10 19:11:08 2012 +0000

    SAKIII-4724 - Widget data loading fixes

commit 9de877b57d452ceff79e9b08921c098f291dee31
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Fri Feb 10 14:35:26 2012 +0000

    SAKIII-4724 - Fixing timing issue

commit 840947491775292a744825576b8de53d129792f5
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Fri Feb 10 14:31:05 2012 +0000

    SAKIII-4903 - Cannot add pages to Sakai Documents

commit f67a121ec4648822e5e2633757f9b0df070d869a
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Fri Feb 10 15:00:01 2012 +0100

    SAKIII-4898 Collector is not aware of collection deletions until a page refresh

commit f8e40f35d401c869a870e6c731f2c5d643fc055d
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Fri Feb 10 13:54:40 2012 +0100

    SAKIII-4900 Webkit Browsers have strange highlight of row when using double-click to start typing

commit 80edc116a6d8478108fcbb185255b00d7bff1c0f
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Fri Feb 10 13:27:56 2012 +0100

    SAKIII-4909 Dragging widget into row and cancelling the add removes Double click to start typing...

commit ecc61783cf4c5e617b4e8bf613f197641ca61f7f
Merge: 217d88c 53ff812
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Fri Feb 10 13:14:00 2012 +0100

    Merge remote-tracking branch 'nicolaas/contentauthoring' into SAKIII-4884

commit 217d88cd6adf46173a6e78651e42375c48645f02
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Fri Feb 10 13:13:45 2012 +0100

    SAKIII-4913 Landing page title has line height problem

commit 53ff8122306c5e38e3488f5a1c972b6119673d39
Merge: c593862 536b5b8
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Fri Feb 10 12:12:36 2012 +0000

    Merge branch 'master' into camaster

    * 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

commit 386b5fcae91e5efe98151151a3de88f2a74c0716
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Fri Feb 10 13:06:23 2012 +0100

    SAKIII-4899 Font Size menu displays wraps and overlaps font size 7

commit 8745d8e9654d814e7a7a09a4841cb4010ceaa07d
Merge: 650d691 c593862
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Fri Feb 10 12:43:22 2012 +0100

    Merge remote-tracking branch 'nicolaas/contentauthoring' into SAKIII-4884

commit c59386229a4c8f46e55b4036da86043e5c5d179e
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Fri Feb 10 11:38:10 2012 +0000

    SAKIII-4724 - Fixing problem with row resizing after delete

commit 9e5811f6d580c467da9cd304cfebc682bfd60da9
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Fri Feb 10 11:26:04 2012 +0000

    SAKIII-4905 - Top nav drop down menus display behind inserter bar in editing mode

commit 98f8f384c6839cf8cfa928ad344df1568a7b3fbf
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Fri Feb 10 11:17:33 2012 +0000

    SAKIII-4881 - Cancelling page edit appears to save all Inserted objects until page is refreshed

commit 650d69147ea3602217a53e275651bcf39783c9c9
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Fri Feb 10 11:21:33 2012 +0100

    SAKIII-4893 Empty row placeholder does not disappear when adding in a title

commit c54c4916a2367271ab88e4d8418c31e0e0136111
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Fri Feb 10 10:22:20 2012 +0100

    SAKIII-4884 No keyboard accessible way to add widgets to the page

commit b444500f02ce65f9c40503421298a9b5295dcfea
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Wed Feb 8 18:02:49 2012 +0000

    SAKIII-4882 - Google Maps widget - map size option is displayed on rendered page

commit a4f91a4ca2f1279ced1ca6e4b03135c74b2cdc0b
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Wed Feb 8 17:12:08 2012 +0000

    SAKIII-4724 - Changing min height

commit ad657c7647c9332d60250fa6af2f6ecc43721c05
Merge: b50bd53 5bdfa36
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Wed Feb 8 16:08:54 2012 +0000

    Merge remote-tracking branch 'nicolaas/contentauthoring' into SAKIII-4871

commit b50bd53c6357f7a40059176bff62ed9924ab14d4
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Wed Feb 8 16:08:19 2012 +0000

    SAKIII-4893 Empty row placeholder does not disappear when adding in a title

commit 5bdfa3644ff710e1d5f95000b830bf07399b3ffc
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Wed Feb 8 16:03:17 2012 +0000

    SAKIII-4724 - Fixing the min-height

commit 9a80a66da387f443eb090d09c06db7731314977d
Merge: e639e0a 4c1aeda
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Wed Feb 8 15:53:51 2012 +0000

    Merge branch 'SAKIII-4871' of git://github.com/bp323/3akai-ux into SAKIII-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

commit e639e0a01bbc3db2b33f632a1b0ffa81f5536ae2
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Wed Feb 8 15:53:26 2012 +0000

    SAKIII-4724 - Changing default content

commit 4c1aeda35ab63ced94f9f06afa001c24ac81096b
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Wed Feb 8 15:52:01 2012 +0000

    SAKIII-4889 Tweak implementation of last row deletion

commit eceb1b2475cc894a56f554a40b8ac8588f9a5104
Merge: 882ac3f 4041215
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Wed Feb 8 15:45:27 2012 +0000

    Merge remote-tracking branch 'nicolaas/contentauthoring' into SAKIII-4871

commit 882ac3f806129148ad92e8220a9fa5fa60e239e9
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Wed Feb 8 15:43:23 2012 +0000

    SAKIII-4883 Inserter Bar does not float well when browser window is resized

commit cd185411c3453b388306b23215e700643686e888
Merge: 4041215 b7dc1a2
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Wed Feb 8 15:33:49 2012 +0000

    Merge branch 'SAKIII-4871' of git://github.com/bp323/3akai-ux into SAKIII-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

commit 4041215517799c5e8ff30fc454140a6908a525da
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Wed Feb 8 15:14:44 2012 +0000

    SAKIII-4724 - Fixing the empty pageholder bugs

commit b7dc1a2c1f6d76884ea2e5869a4716a84301f5dc
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Wed Feb 8 14:03:35 2012 +0000

    SAKIII-4889 The last row should not be deletable

commit 1be7423254ab24e20f4c1487db541585c02ee67d
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Wed Feb 8 13:44:30 2012 +0000

    SAKIII-4877 Widget drop placeholder is visible in view mode

commit fd55ee625c626523eb5bf0ac716a4e6b2096daa8
Merge: 90c179e 3ac7023
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Wed Feb 8 12:26:10 2012 +0000

    Merge branch 'SAKIII-4871' of git://github.com/bp323/3akai-ux into SAKIII-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

commit 53d3e5a789a0ed2bf6387ec3919e059f1e72b0fb
Merge: 3ac7023 90c179e
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Wed Feb 8 12:25:39 2012 +0000

    Merge remote-tracking branch 'nicolaas/contentauthoring' into SAKIII-4871

commit 90c179e075221ae1b5021e8fb575a9b2a9b28050
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Wed Feb 8 12:24:36 2012 +0000

    SAKIII-4724 - Cancel and save problem

commit 3ac7023f689e90c7b029f6d7412ced7e68f3b2e2
Merge: bba58ce a7ab232
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Wed Feb 8 12:21:58 2012 +0000

    Merge remote-tracking branch 'nicolaas/contentauthoring' into SAKIII-4871

commit bba58ce98e8bca98f5a04ff771d421e8de4f2cca
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Wed Feb 8 12:17:55 2012 +0000

    SAKIII-4878 Text edit controls display incorrectly after dragging text element

commit a7ab2325ce447da5dbb738759188573ca8f7991e
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Wed Feb 8 11:49:50 2012 +0000

    SAKIII-4724 - Fixing Chrome inserterbar issue + enabled Table controls

commit f4e8cf7ed977cee90bef6d793c34dd7b828d7b81
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Wed Feb 8 11:06:39 2012 +0000

    SAKIII-4873 Replace styles in formatselect dropdown by sakai styles

commit 88ac20beed2b8d3c7685e925b9dcb8f41e73cd55
Merge: 62bc302 e5c8abd
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Wed Feb 8 10:51:03 2012 +0000

    Merge remote-tracking branch 'nicolaas/contentauthoring' into SAKIII-4871

commit e5c8abd9e6bdcbc63f94cdf29fc42097630a2ce7
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Tue Feb 7 21:03:21 2012 +0000

    SAKIII-4724 - Fixing migration problem

commit 4b2210a2df87d7e158750f9b9d359dfe96da12bb
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Tue Feb 7 20:51:24 2012 +0000

    SAKIII-4724 - Improving tinyMCE hovering

commit 7533a54621dcd60c3b9aaf80672e950610f73421
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Tue Feb 7 20:00:08 2012 +0000

    SAKIII-4724 - Finishing migration

commit f0e5488a8cea9e26adce8038f666b0c5a069a732
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Tue Feb 7 16:28:13 2012 +0000

    SAKIII-4724 - Migration fixes

commit 62bc302f96b314ac0cabd374658b694b8047f9dd
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Tue Feb 7 15:25:33 2012 +0000

    SAKIII-4872 Implement empty row placeholder

commit 5ceddd7c4c61c09ef50c07cabbd8074c449bad17
Merge: 6e8915f d3cfaff
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Tue Feb 7 11:56:53 2012 +0000

    Merge remote-tracking branch 'nicolaas/contentauthoring' into SAKIII-4849

commit 6e8915f2642e7acdc0a1d582272fbbfaa4df5560
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Tue Feb 7 11:56:49 2012 +0000

    SAKIII-4871 Add "Empty page" images to the new content authoring framework

commit d3cfaffbe28546220b865afa6b1f789a7ae7a83c
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Tue Feb 7 10:19:18 2012 +0000

    SAKIII-4724 - Some format bar fixes

commit 0e2c7a15a7f6aad21fe1cd22bca16ec3dd823348
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Tue Feb 7 09:55:22 2012 +0000

    SAKIII-4724 - Fixing row remove bug

commit e83dfb4df7373ce190c09a1cc2246704858c2497
Merge: 1179e02 90a2be0
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Tue Feb 7 09:32:55 2012 +0000

    Merge branch 'SAKIII-4849' of git://github.com/bp323/3akai-ux into SAKIII-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

commit 90a2be0b5dbbf833614cc0aef4aec82e0f04a3bd
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Mon Feb 6 19:43:54 2012 +0000

    SAKIII-4849 Fix bug where 2 or more tinymce bars show up at the same time

commit e0f797256614cbbecf685cefefa562cba4807e69
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Mon Feb 6 17:46:09 2012 +0000

    SAKIII-4848 Style tinyMCE buttons to match the content authoring designs

commit 1179e025695a7e06fc86f42eeeaa20a3cb4d69dc
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Mon Feb 6 17:43:13 2012 +0000

    SAKIII-4724 - Migration work

commit 95e87a533eb4c2eafaf7955d7673451542f67eae
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Mon Feb 6 13:53:36 2012 +0000

    SAKIII-4849 Adjust the pagesviewer widget to work with new pages structure

commit 10581df23406da91aee4e8b1d74ede0d66a7365f
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Mon Feb 6 12:23:59 2012 +0000

    SAKIII-4724 - Migration changes

commit 898157177769c18b1b6809f87f1ed16e240feb79
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Mon Feb 6 12:13:11 2012 +0000

    SAKIII-4724 - Bug fix for htmlblock widget

commit 2deb3b8bdd8cc5ec67e9763dccaab490cf7f10c9
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Mon Feb 6 12:06:13 2012 +0000

    SAKIII-4724 - Problem on pages with no htmlblock widgets

commit b57010d76b6fecf14b3e8ef322afc054942c6ae1
Merge: b73fe2a 5540805
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Mon Feb 6 11:15:38 2012 +0000

    Merge branch 'SAKIII-4844' of git://github.com/bp323/3akai-ux into SAKIII-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

commit b73fe2a4a71fc2134edbbf0817163645b208c5b4
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Mon Feb 6 11:14:32 2012 +0000

    SAKIII-4724 - Finishing the HTMLBlock widget

commit 55408053c8e0b699d43148296c19ac4203146a3a
Merge: 7640ead 85c42b7
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Mon Feb 6 10:48:34 2012 +0000

    Merge remote-tracking branch 'nicolaas/contentauthoring' into SAKIII-4844

commit 85c42b7f479283ea468baa3f45fe970cd2fdab01
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Mon Feb 6 10:47:25 2012 +0000

    SAKIII-4724 - Fixing content migration bug

commit 7640ead9be995c796100cb22246700c64df8245e
Merge: 2b48ad5 eaaea96
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Mon Feb 6 10:25:22 2012 +0000

    Merge remote-tracking branch 'nicolaas/contentauthoring' into SAKIII-4844

commit eaaea96dd0dc91428905ff569295ae2644ef4df9
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Mon Feb 6 10:24:31 2012 +0000

    SAKIII-4724 - Fixing image rendering in content profile

commit 2b48ad5430b6585b19565558e8738f235a6428e8
Merge: cf7856a 2926d0b
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Mon Feb 6 10:01:22 2012 +0000

    Merge remote-tracking branch 'nicolaas/contentauthoring' into SAKIII-4844

commit 2926d0bb50b777417469b23b2b7b6c6a221523e5
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Mon Feb 6 03:11:56 2012 +0000

    SAKIII-4724 - Storing edited text

commit 1fd2bef49eb68438bf503599aa882ef43e46d6a7
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Mon Feb 6 02:18:16 2012 +0000

    SAKIII-4862 - HTMLBlock widget shows scroll bars in Chrome

commit cf7856a275478f7ae1e340d30def02d7431c996f
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Sun Feb 5 22:50:46 2012 +0000

    SAKIII-4847 Adjust template generator to work with new page structure

commit cc65cc09d6e589d1dac408607a07615948eff36b
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Sun Feb 5 15:54:31 2012 +0000

    SAKIII-4850 Adjust width of cell hover for htmlblock and pagetitle

commit 45e23b527569f1c99ade248f189adc40116889df
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Sun Feb 5 15:29:20 2012 +0000

    SAKIII-4851 Update cell hover icons to real icons

commit d72f0ee5ea42c45a673d7fa9e5154073d32fea59
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Sun Feb 5 15:16:28 2012 +0000

    SAKIII-4846 Allow dragging of content from the inserter into a page

commit c8f6c975a7b70af41c1384725e905cd729bfdb2f
Merge: 93b0bf3 bfbfaaf
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Sun Feb 5 14:21:42 2012 +0000

    Merge remote-tracking branch 'nicolaas/contentauthoring' into SAKIII-4844

commit bfbfaaff787c56d0df3d3c89dccdf3337b7921ef
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Sun Feb 5 14:18:22 2012 +0000

    SAKIII-4724 - Fix bug in embedcontent widget

commit 93b0bf3d2807df1569f7b7a68ce744a23aa3f3c3
Merge: bbe6719 e0beaef
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Sun Feb 5 13:30:19 2012 +0000

    Merge remote-tracking branch 'nicolaas/contentauthoring' into SAKIII-4844

commit e0beaefeb151f65427b5f741d5840467d4540f50
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Sun Feb 5 13:29:29 2012 +0000

    SAKIII-4724 - Adding new widget to all other pages

commit bbe67195625f9da5d915e80015397f4d1c66929e
Merge: 31992b8 a23ee68
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Sun Feb 5 13:24:53 2012 +0000

    Merge remote-tracking branch 'nicolaas/contentauthoring' into SAKIII-4844

commit a23ee68036a18885fea7ef5c03557da987d3551b
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Sun Feb 5 09:44:02 2012 +0000

    SAKIII-4724 - Removing some unused files

commit c46b6d1f93dee1b00ecb7f016cb270abe3c8a0cb
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Sun Feb 5 09:43:08 2012 +0000

    SAKIII-4724 - Making the core pages work again

commit 31992b896d59795165620c935f6cdddb26649aaf
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Sat Feb 4 23:40:12 2012 +0000

    SAKIII-4845 Display thumbnails for multiple content items added through drag and drop

commit 0803a326bdd96b96ca52650fdcace0e67abd50e7
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Sat Feb 4 23:34:53 2012 +0000

    SAKIII-4845 Allow dragging of files from the desktop into a page

commit 764ec9c455697bdba89eb5fb7bf8ef3ea05031e1
Merge: f838cd6 50b5a66
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Sat Feb 4 22:18:59 2012 +0000

    Merge branch 'master' into contentauthoring

    * master:
      NOJIRA - Removing the JISC Content widget

commit 18c2ff3a7125251d58e9d9eb81d481545f171629
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Sat Feb 4 21:15:02 2012 +0000

    SAKIII-4844 Create API function to set permissions on item that are the same as its parent

commit b942f72924086ff2c92f57e3c2303f8a98b1f714
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Sat Feb 4 17:53:52 2012 +0000

    SAKIII-4844 Allow drag and drop of external links inside of the content authoring widget

commit b670a6c0109e9e271df2208480b1fd4ddd25ed97
Merge: 3a28a4b f838cd6
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Sat Feb 4 15:05:58 2012 +0000

    Merge remote-tracking branch 'nicolaas/contentauthoring' into SAKIII-4844

commit f838cd6745030c6c084e1e6e873236e4fdf21af4
Merge: 4f0e744 9d326f7
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Sat Feb 4 15:05:08 2012 +0000

    Merge branch 'SAKIII-4815' of git://github.com/bp323/3akai-ux into SAKIII-4815

    * 'SAKIII-4815' of git://github.com/bp323/3akai-ux:
      SAKIII-4815 Add missing features to the new inserter/collector
      SAKIII-4815 WIP

commit 3a28a4bbd8ac3e766d124f2d73892feb70caaca1
Merge: 9d326f7 4f0e744
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Sat Feb 4 15:00:03 2012 +0000

    Merge remote-tracking branch 'nicolaas/contentauthoring' into SAKIII-4844

commit 9d326f7c632714161325a025fe639064bf6439a6
Merge: eaa336c c79b27b
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Sat Feb 4 14:38:27 2012 +0000

    Merge origin/master and fix conflicts

commit 4f0e744756e2b30f55de7d09fd2557173ad5da08
Merge: 4c79048 677b3cd
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Sat Feb 4 14:30:18 2012 +0000

    Merge branch 'master' into contentauthoring

    * master: (30 commits)
      SAKIII-4784 dont escape / in content link
      SAKIII-4592 - tailor share message to intented targets
      Fix 2 clean JS failures
      SAKIII-4818 - Fix reporting of unit tests
      SAKIII-4750 add new function to handle keyboard focus in an overlay dialog
      SAKIII-4685 remove extra quote
      SAKIII-4752 - addpeople widget fails for any user ID containing "_"
      SAKIII-4586 [newaddcontent] Deselect "select all" on every page load + label the select all checkbox.
      SAKIII-4110 - Fix google gadget border issue
      SAKIII-4836 - Fix password length message
      SAKIII-4838 - Fix captcha error message.
      SAKIII-4828 fix add button issue with chrome
      SAKIII-4837 fix sortby in contacts widget
      SAKIII-4753 render math equations in comments widgets
      SAKIII-4684 - Also focus when collector open
      SAKIII-4809 removed duplicate request to fetch collections
      SAKIII-4809 update group content count in the UI when adding content
      SAKIII-4817 add group role to link title
      SAKIII-4795 fix login button on 404 page
      SAKIII-4802 use one save button in accountpreferences widget
      ...

commit eaa336c435ba260fab081308da12e348f95def33
Merge: 677b3cd 4c79048
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Sat Feb 4 14:18:58 2012 +0000

    Merge remote-tracking branch 'nicolaas/contentauthoring' into SAKIII-4844

commit c79b27b41053734496a5838c686a4aad0ed66846
Merge: 3afd7bc 4c79048
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Tue Jan 31 14:52:27 2012 +0000

    Merge remote-tracking branch 'nicolaas/contentauthoring' into SAKIII-4815

commit 3afd7bc310ce1b04821522545d7ce031222df6ec
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Tue Jan 31 14:49:57 2012 +0000

    SAKIII-4815 Add missing features to the new inserter/collector

commit 4c7904838f680d4444b1910397b41cb4d448d037
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Mon Jan 30 07:23:13 2012 -0500

    SAKIII-4724 - Incorporating into content profile

commit 2410cb0faf9861159bbd3f3d3654dd5db8ed5542
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Sun Jan 29 17:15:09 2012 +0000

    SAKIII-4815 WIP

commit 9471e5c961457f373925a6182dc360dd00db2f76
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Sat Jan 28 14:15:41 2012 +0000

    SAKIII-4724 - Bringing this into the core UI

commit d2a6cfe925503d42853b7c848cf3e3902a440f5d
Merge: 02b0bb2 0da552d
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Fri Jan 27 17:25:56 2012 +0000

    Merge branch 'SAKIII-4814' of git://github.com/bp323/3akai-ux into contentauthoring

    * '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

commit 02b0bb2c1548a8fe421f39f1cb35588f8457a6d1
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Fri Jan 27 15:45:53 2012 +0000

    SAKIII-4724 - Fixing column management problems

commit 0da552d063325767914dd9f0dbe3fa9bfc197fef
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Fri Jan 27 14:19:46 2012 +0000

    SAKIII-4810 Add icons to cell hover menu

commit 5f68d442fade2f7364e1820cd106cfb14b3727ed
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Fri Jan 27 12:30:29 2012 +0000

    SAKIII-4810 Create cell hover dropdown menu

commit baa0f14e442506a07e91b900d829a4e8c633a89c
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Fri Jan 27 10:49:08 2012 +0000

    SAKIII-4805 Make sure first grid cell is a full one

commit 33f79c246d31c3398794771c398748f34295f51f
Merge: 51a6b90 0a7ed48
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Thu Jan 26 19:21:45 2012 +0000

    Merge remote-tracking branch 'nicolaas/contentauthoring' into SAKIII-4814

commit 51a6b909f081fdac026f71de2de869247bdc83ee
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Thu Jan 26 19:13:48 2012 +0000

    SAKIII-4814 Make widget draggable, Add carousel and available widgets in the system + make draggable

commit 0a7ed48e4ac12f8773f202401a63908c4609ffff
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Thu Jan 26 16:13:13 2012 +0000

    SAKIII-4724 - Improvements to the collector behavior

commit b8ef6c5ad17b5800f1bc93c00b19d1cc20305487
Merge: c4bb5ea 0165739
Author: Nicolaas Matthijs <nicolaas.matthijs@caret.cam.ac.uk>
Date:   Thu Jan 26 14:06:00 2012 +0…
7ebe01c
@croby croby Merge pull request #1732 from sakaiproject/contentauthoring
SAKIII-4875 - Content authoring
e5b0c89
Nicolaas Matthijs NOJIRA - Adding documentation 6a17483
Nicolaas Matthijs Merge branch 'contentauthoring' into 1.2.0
* contentauthoring: (208 commits)
  NOJIRA - Adding documentation
  NOJIRA - Code review + qunit test failures
  NOJIRA - Code review
  NOJIRA - Code review
  NOJIRA - Code review
  NOJIRA - Code review follow-up
  NOJIRA - Following up on code review
  NOJIRA - Following up on code review
  NOJIRA - Resolving merge conflict
  NOJIRA - Following up on code review
  NOJIRA - Following up on code review
  SAKIII-4902 - Page Revisions does not work
  NOJIRA - Fixing version URL
  SAKIII-4902 - Page Revisions does not work
  NOJIRA - Documentation
  NOJIRA - Regression fix
  NOJIRA - Regression fixes
  NOJIRA - Regression fix
  NOJIRA - Following up on code review
  NOJIRA - Following up on code review
  ...

Conflicts:
	devwidgets/contentauthoring/javascript/contentauthoring.js
4f36e22
Bert Pareyn Merge origin/1.2.0 and fix conflicts f2aea3a
Bert Pareyn NOJIRA Fixes per code review on Github 3f8ec15
Member

bp323 commented Mar 1, 2012

Created a new PR directed to the 1.2.0 branch. sakaiproject#1740

bp323 closed this Mar 1, 2012

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment