lams-github

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4929 Add missing service method names to xApplicationContext.xmls

* Alphabetize method names in to xApplicationContext.xmls

  1. … 28 more files in changeset.
LDEV-4930 Avoid displaying excessive user parameters on edit profile jsp

    • -20
    • +6
    /lams_central/web/profile/editprofile.jsp
LDEV-4911 Added ids to support automated testing

    • -1
    • +1
    /lams_learning/web/gate/gateDescription.jsp
    • -2
    • +2
    /lams_monitoring/web/gate/gateInfo.jsp
LDEV-4929 Make calls to addExtUserToCourseAndLesson transactional

LDEV-4884 Store MCQ questions' UUIDs in JSON so Scratchie can use them

Merge branch 'master' into LDEV-4886

LDEV-4928 Update monitoring, TBL monitoring and Excel export to fully support VSA question type

LDEV-4921 Fix ordering for burning question in Scratchie learner

LDEV-4921 Properly detect General Burning Question in TBL monitor

LDEV-4922 Email results are generated for comment only rating activity

LDEV-4922 Email results are generated for comment only rating activity

LDEV-4922 Email results are generated for comment only rating activity

Merge branch 'master' into develop

# Conflicts:

# lams_admin/conf/language/lams/ApplicationResources.properties

# lams_admin/conf/language/lams/ApplicationResources_el_GR.properties

# lams_admin/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_laqa/web/learning/LearnerRep.jsp

# lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp

# lams_tool_mindmap/conf/language/lams/ApplicationResources.properties

# lams_tool_nb/conf/language/lams/ApplicationResources.properties

# lams_tool_notebook/conf/language/lams/ApplicationResources.properties

# lams_tool_pixlr/conf/language/lams/ApplicationResources.properties

# lams_tool_pixlr/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_scratchie/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_scribe/conf/language/lams/ApplicationResources.properties

# lams_tool_spreadsheet/conf/language/lams/ApplicationResources.properties

# lams_tool_survey/conf/language/lams/ApplicationResources.properties

# lams_tool_task/conf/language/lams/ApplicationResources.properties

# lams_tool_task/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_vote/conf/language/lams/ApplicationResources.properties

# lams_tool_wiki/conf/language/lams/ApplicationResources.properties

# lams_tool_wiki/conf/language/lams/ApplicationResources_el_GR.properties

  1. … 3 more files in changeset.
LDEV-4293 Prevent session invalidation exceptions from propagating

It seems that WildFly distributed session management may have bugs. On

session invalidation there is an attempt to close a websocket channel,

even if it does not exist. If it happens, an user gets in an endless

loop of accessing error.jsp page, trying to get session, trying to

invalidate his previous session, getting an error etc. We should at

least prevent the user from getting a visible error and let him try to

create a new session.

LDEV-4802 Try to identify and fix a NPE in Scratchie websockets

LDEV-4880 Correctly check whether variable is undefined

LDEV-4927 Add "min-height" property to rating widget

Merge branch 'develop' into LDEV-4745

# Conflicts:

# lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java

# lams_common/src/java/org/lamsfoundation/lams/outcome/service/IOutcomeService.java

# lams_common/src/java/org/lamsfoundation/lams/outcome/service/OutcomeService.java

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dto/GeneralLearnerFlowDTO.java

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/model/QaQueContent.java

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/util/QaUtils.java

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaLearningController.java

# lams_tool_laqa/web/learning/LearnerRep.jsp

# lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp

    • -140
    • +178
    /lams_tool_laqa/web/learning/LearnerRep.jsp
Merge branch 'LDEV-4927' into develop

LDEV-4927 Add padding to confidence widget

LDEV-4927 Show other users' answers right after user answers

* Some minor tweaks in monitor pages

    • -1
    • +0
    /lams_central/web/css/_learner_base.scss
LDEV-4921 Hide question titles in TBL monitoring IRA

    • -83
    • +85
    /lams_tool_lamc/web/tblmonitoring/mcq.jsp
LDEV-4921 Hide question titles in TBL monitoring burning questions

LDEV-4921 Hide question titles in Scratchie monitoring burning questions

LDEV-4921 Hide question titles in Scratchie burning questions

LDEV-4927 Stop using "RevisitedLearnerRep.jsp" page

* Remove redundant form fields

LDEV-4769 updating labels

LDEV-4769 updating labels

LDEV-4769 updating labels

LDEV-4769 updating labels