Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4425 Adding Portraits in Learner

Included in Grouping, Chat, Peer Review and QA

  1. … 42 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. … 151 more files in changeset.
LDEV-2999 Include a rating option for reviewed resources (authored only). To make the grouped rating of authored resources work properly, session id was added to the rating and rating comments tables and all code using the shared jRating script and shared ratings updated to store the session code. DB script updates existing rating, rating comment records.

  1. … 38 more files in changeset.
LDEV-2999: Allow learner to change their rating (when using the tag entry) and tweaking how the retry configuration is set up on initialisation.

  1. … 20 more files in changeset.
LDEV-4240: Consistent upload widget Keeping the tag files consistent across LAMS.

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

    • -0
    • +57
    ./learningHiddenUser.jsp
  1. … 16 more files in changeset.
LDEV-4161: Further enhancement to Peer Review - the author can now differentiate what to show on the results, the results page now indicates how many possible reviews can be done and sorts the comments in alphabetical order.

  1. … 12 more files in changeset.
LDEV-4161: On star entry page, change wording from "Your rating is " to "You gave a rating of " and do not display the average.

  1. … 1 more file in changeset.
LDEV-4161: Allow user to rerate a star rating. This is optional - set in a parameter in the initialization call.

  1. … 1 more file in changeset.
LDEV-4109: Adding explicit comment style rating support to Peer Review.

  1. … 1 more file in changeset.
LDEV-4109: Adding explicit comment style rating support to Peer Review.

  1. … 1 more file in changeset.
LDEV-4109: Adding explicit comment style rating support to Peer Review. Also fixed problem with working out whether it was the first, second, last, etc rating which was causing the wrong combination of next/prev/continue buttons to be displayed.

LDEV-4109: Adding explicit comment style rating support to Peer Review. LDEV-4112: Fixing the previous button - was not detecting the prev case properly and always redisplaying the same screen.

LDEV-4047: Removing green tick method of storing comments (now only saved when going to the next or previous page or triggering paging) and ensuring validation for the comments for star ratings and the justification for hedging is occuring when needed.

LDEV-4047: Removing green tick method of storing comments (now only saved when going to the next or previous page or triggering paging) and ensuring validation for the comments for star ratings and the justification for hedging is occuring when needed.

  1. … 4 more files in changeset.
LDEV-4047: Submitting any comments not submitted with the tick.

  1. … 2 more files in changeset.
LDEV-4048: Adding Rate All to Star Ratings

  1. … 3 more files in changeset.
LDEV-4046: Escaping quotes and other entries in title so that it does not break the javascript.

  1. … 2 more files in changeset.
LDEV-3767: Monitor can send an email to learners with their reviews.

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

  1. … 14 more files in changeset.
LDEV-3767: Adding two new methods for Peer Review. Authoring and learning changes completed.

  1. … 20 more files in changeset.
LDEV-3794: Bootstrapping authoring. Switched jquery-ui theme to smoothness as it looks more like bootstrap, and deleted unneeded gifs.

  1. … 7 more files in changeset.
LDEV-3706 Updating tag and its dynamically created equivalent

  1. … 2 more files in changeset.
LDEV-3706: Fixing flow of screen and ensuring the lock message refers to the correct button name.

  1. … 3 more files in changeset.
LDEV-3706: Tablesorter converted to Bootstrap.

  1. … 4 more files in changeset.
LDEV-3706: Updating to use Bootstrap. Learner done overall but still needs the tablesorter converted.

    • -0
    • +31
    ./notebookdisplay.jsp
  1. … 7 more files 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. … 336 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

  1. … 131 more files in changeset.
LDEV-3593: Leftover debugging removed - was causing odd chars to be displayed in the Criteria field.

LDEV-3592: When disabling fields as we are at the max number of rated items, don't disable the fields that are part of a set already being rated.

  1. … 6 more files in changeset.