Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4644 Add content folder ID for CKEditor to outcomes and scales

  1. … 14 more files in changeset.
LDEV-4644 Add outcomes model

  1. … 7 more files in changeset.
LDEV-4639 Use tour instead of tutorials video on first login

Tutorial videos have never been fully implemented. We get rid of them in

favour of tours.

  1. … 19 more files in changeset.
LDEV-4440 Rewrite Vote to conform with new guidelines

  1. … 5 more files in changeset.
Merge remote-tracking branch 'asia/LDEV-4440' into LDEV-4440

Conflicts:

lams_build/lib/lams/lams-central.jar

lams_build/lib/lams/lams.jar

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/PedagogicalPlannerAction.java

Merge branch 'LDEV-4627'

Merge to lams31 after a vital commit to master

  1. … 3 more files in changeset.
Merge branch 'LDEV-4609'

  1. … 2 more files in changeset.
Monthly merge from master to lams31

Conflicts:

lams_build/3rdParty.userlibraries

lams_build/build.xml

lams_build/conf/j2ee/jboss-deployment-structure.xml

lams_build/lib/lams/lams.jar

lams_build/liblist.txt

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java

  1. … 23 more files in changeset.
LDEV-4440, LDEV-4400 Add collections4 library required by Apache POI

    • -0
    • +22
    ./jakarta-commons/collections4.module.xml
    • binary
    ./jakarta-commons/commons-collections4-4.2.jar
  1. … 2 more files in changeset.
LDEV-4617 Implement full email verification on sign up

  1. … 9 more files in changeset.
LDEV-4440 Added new spring version of grouping form

  1. … 4 more files in changeset.
LDEV-4617 Add an option to enable email verification on sign up

  1. … 9 more files in changeset.
LDEV-4440 Necessary changes for migration to Spring - changes in method of validation

  1. … 8 more files in changeset.
LDEV-4440 Added new way of sending error messages

  1. … 8 more files in changeset.
LDEV-4440 Started migration of Noticeboard

  1. … 45 more files in changeset.
LDEV-4627 Accept country in integrations servlet

If a received langIsoCode is just 2 letters, then countryIsoCode stays

the same and country will fall back to default. If langIsoCode is en_AU,

then it gets split to langIsoCode and countryIsoCode and the old value

of countryIsoCode is considered country.

  1. … 6 more files in changeset.
LDEV-4625 Make server country configurable

Also use default country in integrations

  1. … 7 more files in changeset.
LDEV-4624: adding lams.jar

LDEV-4616 Remove locale from courses

  1. … 12 more files in changeset.
LDEV-4440 Almost finished learning and monitoring - needed corrections

  1. … 16 more files in changeset.
Merge branch 'LDEV-4614'

Merge branch 'LDEV-4620'

LDEV-4609 Calculate dates and status for archived progress

Methods which calculate LearnerProgress dates and status use ugly

instanceof constructs. There seem to be no good alternatives, though.

LearnerProgressArchive can inherit from LearnerProgress and we use

table-per-subclass Hibernate strategy. But then queries for

LearnerProgress would fetch also LearnerProgressArchive entities unless

in each HQL query we put "WHERE lp.class = LearnerProgress". It is easy

to forget plus generic methods like findAll() will not work well anyway.

LearnerProgress and LearnerProgressArchive can extend a new

AbstractLearnerProgress and we use table-per-concrete-class Hibernate

strategy. Same with CompletedActivityProgress and

CompletedActivityProgressArchive. But then

AbstractLearnerProgress.completedActivities will not let use both of

them due to lack of polymorphism in collections. Neither

Map<Activty, AbstractCompletedActivityProgress>

nor

Map<Activity, ? extends AbstractCompletedActivityProgress>

will not work. And this collection is the main reason why to do

inheritance in the first place.

Looking how the above solutions add complexity and little gain, these

few methods with instanceof seem to be a fine trade off.

  1. … 9 more files in changeset.
Merge branch 'LDEV-4605'

  1. … 1 more file in changeset.
LDEV-4440 Almost finished authoring migration

  1. … 22 more files in changeset.
LDEV-4440 Show archived activity attempts in gradebook

  1. … 9 more files in changeset.
LDEV-4440 Finishing authoring migration

  1. … 18 more files in changeset.
Merge branch 'LDEV-4593'

  1. … 5 more files in changeset.
LDEV-4609 Add archive date to gradebook marks on lesson restart

  1. … 6 more files in changeset.