Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4951 Remove traces of MCQ tool from other modules

  1. … 192 more files in changeset.
LDEV-4935 Secure lesson chat (presence) websockets

Nickname is taken from session, not from incoming parameters. User gets

checked if he participates in the given lesson.

Simplified code, clean up.

  1. … 2 more files in changeset.
Merge branch 'master' into develop

LDEV-4929 Add missing service method names to xApplicationContext.xmls

* Alphabetize method names in to xApplicationContext.xmls

  1. … 41 more files in changeset.
Merge remote-tracking branch 'origin/master' into develop

Conflicts:

lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/CompleteActivityController.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GateController.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GroupingController.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/SequenceActivityController.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java

  1. … 8 more files in changeset.
LDEV-4900 Put websocket commands in a separate transaction

Otherwise command websocket server does not see them until main

transaction finishes.

LDEV-4900 Fix websocket server run frequency

Merge remote-tracking branch 'origin/master' into LDEV-4900

  1. … 1 more file in changeset.
Merge branch 'master' into develop

LDEV-4894 Fix opening group details from monitor's Learners tab

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. … 2 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. … 51 more files in changeset.
LDEV-4900 Trigger autosave when force completing Assessment activity

  1. … 4 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. … 30 more files in changeset.
LDEV-4882 Check lesson monitor rights correctly

LDEV-4881 Remove notebook entries from DB on lesson removal

  1. … 4 more files in changeset.
Merge branch 'master' into develop

Conflicts:

lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GroupingController.java

  1. … 4 more files in changeset.
LDEV-4874 Restrict displaying names for students that are not within student's group

  1. … 8 more files in changeset.
Merge remote-tracking branch 'origin/master' into develop

LDEV-3839 Check on back end if a lesson can be restarted by a learner

LDEV-4801 Revert changes of FileDAO

They did not lead to fixing the problem and were actually unnecessary:

FileDAO does not use DB connections, so no need for transactions.

  1. … 9 more files in changeset.
LDEV-4802 Make all DAO calls in content repository go through service

Some classes in content repository were using DAO methods directly,

without enveloping them in a transaction. Now they all go through

RepositoryService.

These methods need to start with "dao" prefix so they are not picked up

by CheckCredentialTicketBeforeAdvice.

  1. … 9 more files in changeset.
Merge branch 'master' into develop

  1. … 1 more file in changeset.
LDEV-4803 Remove branching warning when there's no need to warn

* Fix problem with HibernateProxy

* Change warning messages and their presentation

* Further enhancements to choose branching page markup

  1. … 2 more files in changeset.
Merge branch 'master' into develop

LDEV-4802 Stop websocket threads even more gracefully

An exception can occur also when session gets open, not only when it

gets closed.

  1. … 7 more files in changeset.
LDEV-4800 Proceed to the first incompleted activity in a branch, and not to simply the first one

Also display list of child activities for the completed branch, so user

can revisit completed activities.

  1. … 1 more file in changeset.
Merge ordered branching LDEV-4587 into develop

  1. … 20 more files in changeset.