Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4054: Updating and fixing labels

There's quite a lot of work required with labels and it's not jsut translations but rearringing them according to language, string lenght, etc. Also we shouild be more accurate in naming users. When we are referring to students, we should call them students instead of users. Quite a few of these instances in this commit

    • -24
    • +17
    ./lams/ApplicationResources.properties
    • -24
    • +17
    ./lams/ApplicationResources_en_AU.properties
    • -11
    • +11
    ./lams/ApplicationResources_es_ES.properties
  1. … 46 more files in changeset.
LDEV-4054: Updating labels

    • -0
    • +193
    ./lams/ApplicationResources_es_ES.properties
  1. … 25 more files in changeset.
LDEV-4054 Updating labels

Updating greek

    • -9
    • +32
    ./lams/ApplicationResources_el_GR.properties
LDEV-4054 updating labels

Updating labels in bulk mainly English, Greek and Norwegian

    • -33
    • +32
    ./lams/ApplicationResources.properties
    • -9
    • +32
    ./lams/ApplicationResources_en_AU.properties
    • -0
    • +200
    ./lams/ApplicationResources_no_NO.properties
  1. … 54 more files in changeset.
LDEV-4539 Monitor can preview results emails before being sent.

    • -0
    • +5
    ./lams/ApplicationResources.properties
  1. … 8 more files in changeset.
LDEV-4471: Formatted email with SPA calculations for user results

    • -7
    • +26
    ./lams/ApplicationResources.properties
  1. … 8 more files in changeset.
LDEV-4054: Adding Greek

Adding Greek to peer review tool

    • -0
    • +177
    ./lams/ApplicationResources_el_GR.properties
LDEV-3517: adding labels to i18n

Adding all the labels to i18n site

    • -85
    • +99
    ./lams/ApplicationResources.properties
    • -84
    • +91
    ./lams/ApplicationResources_en_AU.properties
LDEV-4072: fixing label

    • -1
    • +1
    ./lams/ApplicationResources_en_AU.properties
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
    • +2
    ./lams/ApplicationResources.properties
  1. … 1 more file in changeset.
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

    • -0
    • +1
    ./lams/ApplicationResources_en_AU.properties
  1. … 1 more file in changeset.
LDEV-4233 Ability to hide users

    • -0
    • +7
    ./lams/ApplicationResources_en_AU.properties
  1. … 20 more files in changeset.
LDEV-4161: I18N tweaks

    • -3
    • +4
    ./lams/ApplicationResources.properties
    • -4
    • +4
    ./lams/ApplicationResources_en_AU.properties
  1. … 1 more file 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.

    • -3
    • +6
    ./lams/ApplicationResources.properties
    • -9
    • +24
    ./lams/ApplicationResources_en_AU.properties
  1. … 11 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.

    • -0
    • +1
    ./lams/ApplicationResources.properties
  1. … 1 more file in changeset.
LDEV-4109: Adding explicit comment style rating support to Peer Review. Also fixed a couple of counts that were not calculating correctly - the number of ratings done was being reported on all criteria in the lesson, not the individual criteria.

    • -1
    • +4
    ./lams/ApplicationResources.properties
  1. … 3 more files in changeset.
LDEV-4072: Spreadsheet export for monitoring.

    • -1
    • +8
    ./lams/ApplicationResources.properties
  1. … 6 more files in changeset.
LDEV-4048: Adding Rate All to Star Ratings

    • -1
    • +2
    ./lams/ApplicationResources.properties
  1. … 7 more files in changeset.
LDEV-3767: Monitor can send an email to learners with their reviews.

    • -2
    • +13
    ./lams/ApplicationResources.properties
    • -2
    • +13
    ./lams/ApplicationResources_en_AU.properties
  1. … 16 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
    • +5
    ./lams/ApplicationResources.properties
    • -1
    • +5
    ./lams/ApplicationResources_en_AU.properties
  1. … 13 more files in changeset.
LDEV-3767: Adding two new methods for Peer Review. Monitoring first cut completed.

    • -1
    • +10
    ./lams/ApplicationResources.properties
    • -1
    • +10
    ./lams/ApplicationResources_en_AU.properties
  1. … 14 more files in changeset.
LDEV-3767: Adding two new methods for Peer Review. Authoring and learning changes completed.

    • -4
    • +31
    ./lams/ApplicationResources.properties
    • -3
    • +31
    ./lams/ApplicationResources_en_AU.properties
  1. … 25 more files in changeset.
LDEV-3859: Grouping options in the advanced tag, updating tags from core.

    • -0
    • +2
    ./lams/ApplicationResources.properties
  1. … 7 more files in changeset.
LDEV-3706: Fixing flow of screen and ensuring the lock message refers to the correct button name.

    • -2
    • +1
    ./lams/ApplicationResources.properties
    • -2
    • +1
    ./lams/ApplicationResources_en_AU.properties
  1. … 4 more files in changeset.
LDEV-3706: Tablesorter converted to Bootstrap.

    • -1
    • +0
    ./lams/ApplicationResources.properties
  1. … 5 more files in changeset.
LDEV-3706: Updating to use Bootstrap. Learner done overall but still needs the tablesorter converted.

    • -0
    • +1
    ./lams/ApplicationResources.properties
  1. … 11 more files in changeset.
LDEV-3660: Remove export potfolio resources: Java classes, JPS, DB entries and labels. Remove localLinkPath attribute from CSS tag as it was only used for export portfolio.

    • -2
    • +0
    ./lams/ApplicationResources.properties
  1. … 371 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
    • +96
    ./lams/ApplicationResources.properties
    • -0
    • +96
    ./lams/ApplicationResources_en_AU.properties
  1. … 134 more files in changeset.
LDEV-3517: Export Portfolio not supported

    • -15
    • +7
    ./lams/ApplicationResources.properties
    • -16
    • +8
    ./lams/ApplicationResources_en_AU.properties
  1. … 3 more files in changeset.
LDEV-3553: Refuses to add rating/comment if max number reached and triggers a page refresh.

    • -0
    • +1
    ./lams/ApplicationResources.properties
    • -1
    • +1
    ./lams/ApplicationResources_en_AU.properties
  1. … 3 more files in changeset.