Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5096 Add "Close" button to an opened permission gate.

  1. … 4 more files in changeset.
LDEV-5083 Initial refactoring of redesigned monitoring into LAMS 5 JSP

  1. … 17 more files in changeset.
LDEV-5083 Initial refactoring of redesigned monitoring into LAMS 5 JSP

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

Conflicts:

lams_central/conf/language/lams/ApplicationResources_en_AU.properties

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java

lams_central/src/java/org/lamsfoundation/lams/web/QuestionsController.java

lams_central/web/questions/questionFile.jsp

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190722.sql

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190724.sql

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java

lams_tool_assessment/web/pages/monitoring/summary.jsp

lams_tool_lamc/conf/language/lams/ApplicationResources.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_el_GR.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_es_ES.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_fr_FR.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_no_NO.properties

lams_tool_lamc/db/sql/activity_insert.sql

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

lams_tool_lamc/web/WEB-INF/tags/Etherpad.tag

lams_tool_lamc/web/WEB-INF/tags/OutcomeAuthor.tag

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

lams_tool_lamc/web/WEB-INF/tags/StyledRating.tag

lams_tool_lamc/web/authoring/BasicContent.jsp

lams_tool_lamc/web/authoring/editQuestionBox.jsp

lams_tool_lamc/web/authoring/itemlist.jsp

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

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

Conflicts:

lams_common/src/java/org/lamsfoundation/lams/util/WebUtil.java

  1. … 2 more files in changeset.
LDEV-5038 Add group to user name in lesson monitor sequence tab

  1. … 2 more files in changeset.
LDEV-5023 Allow single click gate open in monitoring

  1. … 4 more files in changeset.
LDEV-4995 fix exception thrown on trying to get activity's Id

LDEV-4995 Revert accidentally committed code

LDEV-4995 Improvements to the index page

* Fix offcanvas bar search and organisation tablesorter markup in case

of big amount of available organisations

* Optimise DB queries

* Introduce hasContributeActivities Lesson's flag

* Show "fa-spin" when loading an organisation

  1. … 14 more files in changeset.
LDEV-4995 Upgrade to bootstrap 4

* Update LAMS code to use bootstrap 4

* Update and redesign index page

  1. … 198 more files in changeset.
LDEV-4989 Password Gate initial implementation

  1. … 31 more files in changeset.
LDEV-4951 Remove traces of MCQ tool from other modules

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

    • -0
    • +130
    ./org/lamsfoundation/lams/monitoring/web/form/GateForm.java
  1. … 41 more files in changeset.
LDEV-4932 Adding CSRF to add lesson

  1. … 2 more files in changeset.
LDEV-4932 Adding CSRF to central and monitoring

Adding CSRF to:

- Grades on completion

- Enable/disable presence and IM

- Send emails

- Update users into lessons

- Send email notifications

- Delete email notifications

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

* Add CSRF protection to:

- Change lesson status (incl. remove)

- Remove lesson using main.jsp button

- Rename lesson

* Start using /common/taglibs.jsp in lams_central

  1. … 23 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-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. … 10 more files in changeset.
LDEV-4900 Run autosave command asynchronously after all

Synchronous approach would work only on LAMS installation with a single

application server. For multi-server environment we need to wait for the

proper server to pick up the command from DB.

  1. … 3 more files in changeset.
LDEV-4900 Trigger autosave when force completing Assessment activity

  1. … 5 more files in changeset.
LDEV-4897 Update Gradebook, Kumalive, and archived emails to use new Excel exporting methods

  1. … 8 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-4879 Create lesson in subgroups at one go

  1. … 4 more files in changeset.
LDEV-4881 Remove notebook entries from DB on lesson removal

  1. … 4 more files in changeset.
LDEV-4651 Scheduled lesson with rescheduled gate can start now

LDEV-4651 Scheduled gate in scheduled lesson can be viewed/rescheduled.

  1. … 1 more file in changeset.
LDEV-4749 Transitions to be deleted earlier in the preview lesson delete