lams-github

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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
    • +28
    /lams_tool_preview/.classpath
    • -0
    • +2
    /lams_tool_preview/.cvsignore
    • -0
    • +43
    /lams_tool_preview/.project
    • -0
    • +7
    /lams_tool_preview/build.properties
    • -0
    • +7
    /lams_tool_preview/build.xml
    • -0
    • +96
    /lams_tool_preview/conf/language/lams/ApplicationResources.properties
    • -0
    • +96
    /lams_tool_preview/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +8
    /lams_tool_preview/conf/xdoclet/global-exceptions.xml
    • -0
    • +6
    /lams_tool_preview/conf/xdoclet/global-forwards.xml
    • -0
    • +104
    /lams_tool_preview/conf/xdoclet/struts-actions.xml
    • -0
    • +1
    /lams_tool_preview/conf/xdoclet/struts-forms.xml
    • -0
    • +1
    /lams_tool_preview/conf/xdoclet/struts-message-resources.xml
    • -0
    • +1
    /lams_tool_preview/conf/xdoclet/struts-plugins.xml
  1. … 121 more files in changeset.
LDEV-3594: Prevent XSS injection

LDEV-3578: Convert passwords from sha1 to sha256 with salt after successful authentication and on password change. Remove password hashing in browser. Change internal authentication mechanism for LoginRequestServlet and LoginAsAction.

    • binary
    /lams_build/lib/lams/lams-central.jar
  1. … 9 more files in changeset.
LDEV-3335: Prevent NullPointerException when the user provided blank login.

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.

    • -12
    • +40
    /lams_central/web/includes/javascript/rating.js
    • -2
    • +16
    /lams_tool_laqa/web/learning/mobile/LearnerRep.jsp
LDEV-3593: Leftover debugging removed - was causing odd chars to be displayed in the Criteria field.

LDEV-2463: Revert SsoHandler code as the check is not needed there - JSP code does it correctly.

LDEV-2463: Escape redirectURL param on the login page. Check for HTML tages in redirectURL param during authentication.

LDEV-3335: Prevent NullPointerException when the user provided blank login.

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.

    • -2
    • +16
    /lams_tool_laqa/web/learning/mobile/LearnerRep.jsp
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.

    • -12
    • +40
    /lams_central/web/includes/javascript/rating.js
LDEV-3591: Flatten UniversalLoginModule hierarchy - it was just a single leaf anyway. Format code. Clean up logs, errors and comments. Move queries from config files to code.

    • binary
    /lams_build/lib/lams/lams-central.jar
LKC-61: Added reference to this fix in the Release Notes

    • -1
    • +2
    /lams_bb_integration/RELEASE_NOTES.TXT
LKC-61: Added reference to this fix in the Release Notes

    • -1
    • +2
    /lams_bb_integration/RELEASE_NOTES.TXT
LDEV-3510: In trying to fix the ordering problem, started opening lessons in a new tab/window. Now reverted back to previous behaviour with lesson loading in the same tab.

    • -0
    • +5
    /lams_bb_integration/RELEASE_NOTES.TXT
LDEV-3510: In trying to fix the ordering problem, started opening lessons in a new tab/window. Now reverted back to previous behaviour with lesson loading in the same tab.

    • -0
    • +5
    /lams_bb_integration/RELEASE_NOTES.TXT
LKC-61 Support syncing of gradebook marks for Chen Rui Building Block

LKC-61 Support syncing of gradebook marks for Chen Rui Building Block

LDEV-3577 Pass marks to gradebook on finishing activity that was already completed

LDEV-3577 Pass marks to gradebook on finishing activity that was already completed

LDEV-3451 Fixed exception on trying to revert changes done by learners

LDEV-3414 Fixed rating statistics don't display properly in IE

LDEV-3450 Implemented calculation of one of the image gallery's tool outputs - "number of comments" * fixed label

LDEV-3573 Fixed Image Gallery throwing JS error on opening any new image using IE

    • -85
    • +97
    /lams_central/web/includes/javascript/common.js
LDEV-3576 Added servlet-mapping for GetServerTimeServlet

LDEV-3421 jqGrid should all all available entries by default

LDEV-3421 jqGrid should all all available entries by default

LDEV-3572: Set FLA window height same as browser height.

LDEV-3572: Set FLA window height same as browser height.

LDEV-3451 Fixed exception on trying to revert changes done by learners