Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4453 Add gradebook on lesson complete front end

  1. … 6 more files in changeset.
Merge branch 'LDEV-4451'

  1. … 7 more files in changeset.
Merge branch 'LDEV-4451'

  1. … 3 more files in changeset.
LDEV-4453 Add "gradebook on lesson complete" field to Lesson

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

Conflicts:

lams_build/lib/lams/lams.jar

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java

  1. … 4 more files in changeset.
Merge branch 'LDEV-4451'

  1. … 1 more file in changeset.
LDEV-4451 Create Confidence level system

Create Confidence level classes similar to the Ratings ones, that we

already have. They must be located in lams_common folder as it's going

to be used by 3 tools: learners are going to enter them in Assessment

and MCQ, and we later display them in all three tools.

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

Rewrite Kumalive JSON code to Jackson

  1. … 6 more files in changeset.
LDEV-4366 Disable learner's button when Kumalive is not started

  1. … 4 more files in changeset.
LDEV-4447 Toggle Kumalive feature on organisation level

  1. … 7 more files in changeset.
LDEV-4447 Toggle Kumalive feature on sysadmin level

  1. … 6 more files in changeset.
Merge branch 'LDEV-4366'

  1. … 4 more files in changeset.
LDEV-4440 Add a test library which does not reference Struts

After full LAMS migration to Spring MVC it will become

3rdParty.userlibraries

  1. … 67 more files in changeset.
LDEV-4440 Upgrade Spring to version 4.3.12

Add Spring MVC module.

    • binary
    ./spring/spring-aop-4.3.10.RELEASE.jar
    • binary
    ./spring/spring-aop-4.3.12.RELEASE.jar
    • binary
    ./spring/spring-beans-4.3.10.RELEASE.jar
    • binary
    ./spring/spring-beans-4.3.12.RELEASE.jar
    • binary
    ./spring/spring-context-4.3.10.RELEASE.jar
    • binary
    ./spring/spring-context-4.3.12.RELEASE.jar
    • binary
    ./spring/spring-context-support-4.3.10.RELEASE.jar
    • binary
    ./spring/spring-context-support-4.3.12.RELEASE.jar
    • binary
    ./spring/spring-core-4.3.10.RELEASE.jar
    • binary
    ./spring/spring-core-4.3.12.RELEASE.jar
    • binary
    ./spring/spring-expression-4.3.10.RELEASE.jar
    • binary
    ./spring/spring-expression-4.3.12.RELEASE.jar
    • binary
    ./spring/spring-jdbc-4.3.10.RELEASE.jar
    • binary
    ./spring/spring-jdbc-4.3.12.RELEASE.jar
    • binary
    ./spring/spring-orm-4.3.10.RELEASE.jar
  1. … 10 more files in changeset.
Fix merged lams.jar

Merge remote-tracking branch 'origin/master' into lams31

Conflicts:

lams_build/lib/lams/lams.jar

lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java

lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookMonitoringAction.java

  1. … 8 more files in changeset.
LDEV-4415 Merging LDEV-4433 changes from Master

Added weighting % markers to the new activity summary.

  1. … 2 more files in changeset.
Update LAMS libraries after merge

Merge remote-tracking branch 'origin/master' into lams31

Conflicts:

lams_build/lib/lams/lams.jar

lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java

lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/LearningWebsocketServer.java

lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/MonitoringAction.java

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

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java

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

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/MonitoringAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/MonitoringAction.java

lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/MonitoringAction.java

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/MonitoringAction.java

lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/MonitoringAction.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/MonitoringAction.java

  1. … 29 more files in changeset.
LDEV-4366 Kumalive reports export

Allow exporting all and selected Kumalives in Excel format. Use i18n

instead of hardcoded labels. Move free jqGrid library to lams_central.

Minor fixes.

  1. … 11 more files in changeset.
LDEV-4366 Fix JAR broken when merging. Fix batch naming.

  1. … 1 more file in changeset.
Merge remote-tracking branch 'origin/master' into LDEV-4366

Conflicts:

lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java

lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserDAO.java

lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java

  1. … 3 more files in changeset.
LDEV-4415 Gradebook calculations and UI support weighting

  1. … 15 more files in changeset.
LDEV-4415 Add a title to weights dialog

  1. … 3 more files in changeset.
Merge remote-tracking branch 'origin/master' into LDEV-4415

  1. … 1 more file in changeset.
LDEV-4417 branch rebased to master and merge conflict of lams.jar resolved.

LDEV-4417 Popover portraits in Monitoring

Implmented in GMap

  1. … 3 more files in changeset.
Merge LDEV-4408 into lams31

  1. … 1 more file in changeset.
LDEV-4408 Implement session list in sysadmin

  1. … 7 more files in changeset.
LDEV-4402 Reintroduce XML Commons library

The library was supposed to become obsolete after changing XStream cod,

but is still required by Struts and Apache Commons Validator.

Also obsolete entries for JBoss Web and Gson were removed from a

configuration file.

    • -0
    • +49
    ./xml-commons/xmlcommons.module.xml
  1. … 2 more files in changeset.