Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge remote-tracking branch 'origin/master' into v4.0

Conflicts:

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

  1. … 5 more files in changeset.
LDEV-5057 Use UTF-8 as default encoding for message sources

  1. … 33 more files in changeset.
LDEV-4233 Fix user count in paging when current user is not displayed

LDEV-5035 Introduce tolerance in Peer Review SAP and SAPA factors

  1. … 2 more files in changeset.
LDEV-5035 Introduce tolerance in Peer Review SAP and SAPA factors

  1. … 2 more files in changeset.
Merge remote-tracking branch 'origin/master' into v4.0

LDEV-4925 Fix new lines in hedging comments in Peer Review

  1. … 1 more file in changeset.
LDEV-5010 Add SA and PA to Peer Review export

  1. … 1 more file in changeset.
LDEV-4984 Prevent an exception if not everyone voted in self review

LDEV-4984 Add SAPA factor to Spreadsheet export

  1. … 1 more file in changeset.
LDEV-4983 Round Peer Review factors to 2 decimal places instead of 1

Also make Email screen consistent with calculation in Spreadsheet export

LDEV-4962 Use complex portrait UUID in tools

  1. … 24 more files in changeset.
LDEV-4962 Use complex portrait UUID in tools

Conflicts:

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUsrRespDAO.java

  1. … 24 more files in changeset.
LDEV-4945 Fix mysql comments on patch files

  1. … 76 more files in changeset.
LDEV-4945 Fix mysql comments on patch files

  1. … 101 more files in changeset.
LDEV-4932 Add CSRF Excel export in tools

  1. … 9 more files in changeset.
LDEV-4932 Add CSRF to monitor and central

  1. … 50 more files in changeset.
LDEV-4743 Squash tool patches updating to version 3.1

  1. … 114 more files in changeset.
LDEV-4932 Secure gradebook calls with CSRF Guard

* Secure the following gradebook calls in particular:

- Release marks

- Any change in marks

- Export

* Add taglibs.jsp to gradebook project

  1. … 14 more files in changeset.
LDEV-4932 Secure save tool authoring with CSRF Guard

  1. … 42 more files in changeset.
LDEV-4932 Secure edit in monitor with CSRF Guard

* In order to secure /definelater.do path, added definelater() method to

AuthoringController to the tools missing it

* Remove unnecessary forms from monitor in Vote, NB, QA tools

  1. … 108 more files in changeset.
LDEV-4929 Add missing service method names to xApplicationContext.xmls

* Alphabetize method names in to xApplicationContext.xmls

  1. … 42 more files in changeset.
LDEV-4922 Email results are generated for comment only rating activity

LDEV-4924 Prevent monitor from showing redundant comments

LDEV-4897 Update Peerreview, Grouping servlet, Outcome controller to use new Excel exporting methods

* Improve code generating excel files. Add bold attribute to Excel rows

  1. … 7 more files in changeset.
LDEV-4900 Update Gradebook marks of non-leaders on leader finish

* Gradebook now pushes updated marks to LTI consumer. It happens only if

user has finished the lesson

  1. … 60 more files in changeset.
LDEV-4897 Update Scratchie and MCQ to use new Excel exporting methods

  1. … 15 more files in changeset.
LDEV-4897 Introduce ExcelRow and ExcelSheet classes

* Update Daco and Assessment to use new classes

* Move existing ExcelCell and ExcelUtils to .util.excel package

  1. … 29 more files in changeset.
LDEV-4743 Update SQL script with autopatch changes for LAMS 3.1 release

  1. … 131 more files in changeset.
LDEV-4678 Remove no longer needed @Autowired applicationContext

  1. … 20 more files in changeset.