Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4391 Get rid of redundant jQuery UI themes

Only bootstrap theme is used now.

  1. … 94 more files in changeset.
LDEV-4440 Fix Edit link in monitoring

  1. … 1 more file in changeset.
LDEV-4440 Peer Review converted to Spring MVC

  1. … 12 more files in changeset.
LDEV-4440 Peer Review code changes made, working through issues

  1. … 59 more files in changeset.
LDEV-4539 Monitor can preview results emails before being sent.

  1. … 7 more files in changeset.
LDEV-4537modifying fonticon

modifying fonticon for manage users as it conflicts with existing css for TBL UI. Hopefully this icon is even more representative of the label

LDEV-4537 Add Peer Review tab to TBL monitoring

  1. … 8 more files in changeset.
LDEV-4417 Popover portraits in Monitoring

Implmented in Share Resources, Survey, Leader, Mindmap,

Noticeboard, Notebook, Pixlr, Peer Review

  1. … 40 more files in changeset.
LDEV-4417 Popover portraits in Monitoring

Implmented in Share Resources, Survey, Leader, Mindmap,

Noticeboard, Notebook, Pixlr, Peer Review

  1. … 40 more files in changeset.
LDEV-4367 Skins can be created

The SASS files are now configured to allow a new variable file to be

set up with different colours and for users to be able to switch

between skins.

  1. … 155 more files in changeset.
LDEV-4286 * Edit Activity in monitoring page to be opened in a popup page * Move "Edit activity" buttons to the right

  1. … 29 more files in changeset.
LDEV-4258: Protecting the export download and whole of session student email generation from multiple triggers by disabling the button. The existing file download code was made generic and moved to lams_common.

  1. … 1 more file in changeset.
LDEV-4233 changed button icon

LDEV-4233 added confirmation dialog asking whether teacher wants to proceed with hiding user as it will lead to removal of this user's ratings and comments

  1. … 1 more file in changeset.
LDEV-4233 Ability to hide users

    • -0
    • +158
    ./manageUsers.jsp
  1. … 18 more files in changeset.
LDEV-4161: I18N tweaks

  1. … 2 more files in changeset.
LDEV-4072: Spreadsheet export for monitoring.

  1. … 6 more files in changeset.
LDEV-3767: Missing I18N reference - the label has already been created but missed using it in jsp.

LDEV-4046: Escaping quotes and other entries in title so that it does not break the javascript.

  1. … 3 more files in changeset.
LDEV-3767: Removed the tooltip that duplicates the comment display.

LDEV-3767: Monitor can send an email to learners with their reviews.

  1. … 13 more files in changeset.
LDEV-3767: Adding search on name to the monitoring screens

  1. … 4 more files in changeset.
LDEV-3806: Paging reflections

  1. … 7 more files in changeset.
LDEV-3806: Moved reflections to a separate page, with the reflections for a single session shown. Added some simple statistics - number of users in a session and number of users completed in a session.

  1. … 9 more files in changeset.
LDEV-3767: Adding two new methods for Peer Review. Monitoring first cut completed.

    • -0
    • +144
    ./criteriapart.jsp
  1. … 3 more files in changeset.
LDEV-3767: Adding two new methods for Peer Review. Monitoring first cut completed.

    • -0
    • +44
    ./criteriaToDelete.jsp
  1. … 14 more files in changeset.
LDEV-3795: Tweaking JQgrid look and behaviour

LDEV-3795: Bootstrapping monitor

  1. … 1 more file in changeset.
LDEV-2917: Change DOCTYPE tag of files which have not been picked up by previous runs as they had this tag broken into 2 lines and regex had not detected them.

  1. … 340 more files in changeset.
This commit was manufactured by cvs2svn to create branch 'lams2_head_wildfly'.

Cherrypick from master 2015-10-21 12:46:03 UTC ernieg 'LDEV-3594: Prevent XSS injection':

lams_tool_preview/.classpath

lams_tool_preview/.cvsignore

lams_tool_preview/.project

lams_tool_preview/build.properties

lams_tool_preview/build.xml

lams_tool_preview/conf/hibernate/mappings/hibernate.cfg.xml

lams_tool_preview/conf/hibernate/mappings/org/lamsfoundation/lams/tool/peerreview/model/Peerreview.hbm.xml

lams_tool_preview/conf/language/lams/ApplicationResources.properties

lams_tool_preview/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_preview/conf/xdoclet/global-exceptions.xml

lams_tool_preview/conf/xdoclet/global-forwards.xml

lams_tool_preview/conf/xdoclet/struts-actions.xml

lams_tool_preview/conf/xdoclet/struts-forms.xml

lams_tool_preview/conf/xdoclet/struts-message-resources.xml

lams_tool_preview/conf/xdoclet/struts-plugins.xml

lams_tool_preview/conf/xdoclet/validation-forms.xml

lams_tool_preview/conf/xdoclet/validation-global.xml

lams_tool_preview/db/model/peerreview.clay

lams_tool_preview/db/sql/activity_insert.sql

lams_tool_preview/db/sql/create_lams_tool_peerreview.sql

lams_tool_preview/db/sql/db_version_insert.sql

lams_tool_preview/db/sql/drop_lams_tool_peerreview.sql

lams_tool_preview/db/sql/library_insert.sql

lams_tool_preview/db/sql/table-schema.sql

lams_tool_preview/db/sql/tool_insert.sql

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/PeerreviewConstants.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/DAO.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/PeerreviewDAO.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/PeerreviewSessionDAO.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/PeerreviewUserDAO.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/BaseDAOHibernate.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewDAOHibernate.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewSessionDAOHibernate.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewUserDAOHibernate.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dbupdates/autopatchContext.xml

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dbupdates/patch20150825.sql

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dbupdates/patch20150930.sql

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dto/GroupSummary.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dto/ReflectDTO.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/ims/IContentPackageConverter.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/ims/IMSManifestException.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/ims/ImscpApplicationException.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/ims/OrganizationXMLDef.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/ims/SimpleContentPackageConverter.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/model/Peerreview.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/model/PeerreviewSession.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/model/PeerreviewUser.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/peerreviewApplicationContext.xml

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/IPeerreviewService.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewApplicationException.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewImportContentVersionFilter.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceProxy.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/UploadPeerreviewFileException.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/util/PeerreviewToolContentHandler.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/util/ReflectDTOComparator.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/AuthoringAction.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/ClearSessionAction.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/LearningAction.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/MonitoringAction.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/form/PeerreviewForm.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/form/ReflectionForm.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/servlet/ExportServlet.java

lams_tool_preview/web/403.jsp

lams_tool_preview/web/404.jsp

lams_tool_preview/web/WEB-INF/tags/AuthoringButton.tag

lams_tool_preview/web/WEB-INF/tags/AuthoringRatingCriteria.tag

lams_tool_preview/web/WEB-INF/tags/CKEditor.tag

lams_tool_preview/web/WEB-INF/tags/Date.tag

lams_tool_preview/web/WEB-INF/tags/DefineLater.tag

lams_tool_preview/web/WEB-INF/tags/Head.tag

lams_tool_preview/web/WEB-INF/tags/ImgButtonWrapper.tag

lams_tool_preview/web/WEB-INF/tags/Rating.tag

lams_tool_preview/web/WEB-INF/tags/Tab.tag

lams_tool_preview/web/WEB-INF/tags/TabBody.tag

lams_tool_preview/web/WEB-INF/tags/TabName.tag

lams_tool_preview/web/WEB-INF/tags/Tabs.tag

lams_tool_preview/web/WEB-INF/tags/TextSearch.tag

lams_tool_preview/web/WEB-INF/tags/headItems.tag

lams_tool_preview/web/WEB-INF/tlds/jstl/c.tld

lams_tool_preview/web/WEB-INF/tlds/jstl/fmt.tld

lams_tool_preview/web/WEB-INF/tlds/jstl/fn.tld

lams_tool_preview/web/WEB-INF/tlds/jstl/x.tld

lams_tool_preview/web/WEB-INF/tlds/lams/lams.tld

lams_tool_preview/web/WEB-INF/tlds/struts/struts-bean-el.tld

lams_tool_preview/web/WEB-INF/tlds/struts/struts-bean.tld

lams_tool_preview/web/WEB-INF/tlds/struts/struts-html-el.tld

lams_tool_preview/web/WEB-INF/tlds/struts/struts-html.tld

lams_tool_preview/web/WEB-INF/tlds/struts/struts-logic-el.tld

lams_tool_preview/web/WEB-INF/tlds/struts/struts-logic.tld

lams_tool_preview/web/WEB-INF/tlds/struts/struts-nested.tld

lams_tool_preview/web/WEB-INF/tlds/struts/struts-tiles-el.tld

lams_tool_preview/web/WEB-INF/tlds/struts/struts-tiles.tld

lams_tool_preview/web/WEB-INF/web.xml

lams_tool_preview/web/common/footer.jsp

lams_tool_preview/web/common/header.jsp

lams_tool_preview/web/common/messages.jsp

lams_tool_preview/web/common/tabbedheader.jsp

lams_tool_preview/web/common/taglibs.jsp

lams_tool_preview/web/error.jsp

lams_tool_preview/web/images/icon_peerreview.png

lams_tool_preview/web/images/icon_peerreview.svg

lams_tool_preview/web/images/icon_peerreview.swf

lams_tool_preview/web/images/icon_peerreview_16.svg

lams_tool_preview/web/images/icon_sharedpeerreview.svg

lams_tool_preview/web/includes/css/learning.css

lams_tool_preview/web/includes/css/peerreview.css

lams_tool_preview/web/includes/images/.cvsignore

lams_tool_preview/web/includes/images/cross.gif

lams_tool_preview/web/includes/images/downarrow.gif

lams_tool_preview/web/includes/images/downarrow_disabled.gif

lams_tool_preview/web/includes/images/edit.gif

lams_tool_preview/web/includes/images/indicator.gif

lams_tool_preview/web/includes/images/spacer.gif

lams_tool_preview/web/includes/images/tick.gif

lams_tool_preview/web/includes/images/uparrow.gif

lams_tool_preview/web/includes/images/uparrow_disabled.gif

lams_tool_preview/web/login.jsp

lams_tool_preview/web/pages/authoring/advance.jsp

lams_tool_preview/web/pages/authoring/authoring.jsp

lams_tool_preview/web/pages/authoring/basic.jsp

lams_tool_preview/web/pages/authoring/definelater.jsp

lams_tool_preview/web/pages/authoring/definelaterforbid.jsp

lams_tool_preview/web/pages/authoring/start.jsp

lams_tool_preview/web/pages/export/exportportfolio.jsp

lams_tool_preview/web/pages/learning/definelater.jsp

lams_tool_preview/web/pages/learning/finish.jsp

lams_tool_preview/web/pages/learning/learning.jsp

lams_tool_preview/web/pages/learning/notebook.jsp

lams_tool_preview/web/pages/learning/results.jsp

lams_tool_preview/web/pages/monitoring/advanceoptions.jsp

lams_tool_preview/web/pages/monitoring/editactivity.jsp

lams_tool_preview/web/pages/monitoring/monitoring.jsp

lams_tool_preview/web/pages/monitoring/reflections.jsp

lams_tool_preview/web/pages/monitoring/statistic.jsp

lams_tool_preview/web/pages/monitoring/summary.jsp

    • -0
    • +112
    ./advanceoptions.jsp
  1. … 130 more files in changeset.