SAKIII-4760 add default display settings for embedcontent
SAKIII-4760 add default display settings for embedcontent
SAKIII-4760 moved default options to the embedcontent config.json file and override this in the config.js file
SAKIII-5308 Add the 'data-sakai-addcontextoption' attribute to the privspace li's so that the counts can be updated correctly
Merge pull request #1886 from croby/SAKIII-5308

SAKIII-5308 Add the 'data-sakai-addcontextoption' attribute to the privspace li's so that the counts can be updated correctly
SAKIII-4760 removed default widget config from config.js, fixed valid json file, moved documentation
SAKIII-4923 changed text from don't save to cancel
SAKIII-4115 fix bug when rendering category with no children
SAKIII-5321 saneHTML the content before it is inserted in the DOM
Merge pull request #1891 from croby/SAKIII-5321

SAKIII-5321 saneHTML the content before it is inserted in the DOM

* croby/SAKIII-5321:
  SAKIII-5321 saneHTML the content before it is inserted in the DOM
SAKIII-5319 - Add some more :focus selectors
https://jira.sakaiproject.org/browse/SAKIII-5319
SAKIII-5326 add ability to assign editor role for content
SAKIII-5326 add ability to assign editor role for content
SAKIII-4760 added example in comments
SAKIII-5324 Changed timestamp of SakaiDocs never updates
Merge pull request #1899 from bp323/SAKIII-5324

SAKIII-5324 Changed timestamp of SakaiDocs never updates

* bp323/SAKIII-5324:
  SAKIII-5324 Changed timestamp of SakaiDocs never updates
SAKIII-5326 work on adding editor role to content and collections
SAKIII-5321 Scripts embedded in Content Authoring docs are executed if they are entered via Edit HTML

Squashed commit of the following:

commit 986bb47479eb8fa9776dfc1501f506bc2d59c72c
Merge: 7d6c24e 6fd7b77
Author: Christian Vuerings <vueringschristian@gmail.com>
Date:   Wed Mar 21 10:45:01 2012 -0700

    Merge remote-tracking branch 'bp323/SAKIII-5321' into bp323-SAKIII-5321

commit 6fd7b771ec2248133f5f90ce4642e6304033f391
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Wed Mar 21 11:19:34 2012 +0000

    SAKIII-5321 Scripts embedded in Content Authoring docs are executed if they are entered via Edit HTML

commit 73e76e9f11864faab2844eac3c048c35dafcb0ba
Author: Christian Vuerings <vueringschristian@gmail.com>
Date:   Mon Mar 19 10:44:00 2012 -0700

    SAKIII-5321 - Allow the src iframe attribute
    https://jira.sakaiproject.org/browse/SAKIII-5321
Merge pull request #1902 from bp323/SAKIII-5321

SAKIII-5321 Scripts embedded in Content Authoring docs are executed if they are entered via Edit HTML
SAKIII-5312 rows/columns rendered in wrong places on a sakai doc

Squashed commit of the following:

commit 5715fa137f697bf81e282b310f9acf2a4784e385
Merge: ddb4d70 871b9eb
Author: Christian Vuerings <vueringschristian@gmail.com>
Date:   Wed Mar 21 11:57:41 2012 -0700

    Merge remote-tracking branch 'bp323/SAKIII-5312' into bp323-SAKIII-5312

commit 871b9eb77f6138e11c85520f677d39212b22ffd6
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Wed Mar 21 09:46:04 2012 +0000

    SAKIII-5312 Fixes per comment on Github

commit 196d97ee46613fe39e32175dbf66d988fcb1267e
Merge: 8d00fbb 7d6c24e
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Wed Mar 21 09:11:00 2012 +0000

    Merge remote-tracking branch 'origin/1.2.0' into SAKIII-5312

commit 8d00fbbd1aa27df25e2c6f65adfdeeaf0dbe110a
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Tue Mar 20 20:52:12 2012 +0000

    SAKIII-5312 rows/columns rendered in wrong places on a sakai doc