lams-github

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4917 Fix validation of pics taken with Uppy Webcam plugin

LDEV-4510 Skip erroneous CKEditor validation

LDEV-4510 Allow deleting of any question in TBL template

LDEV-4510 Allow empty question description fields in TBL template

Merge branch 'LDEV-5141' into v4.0

LDEV-5140 Introduce Release Marks panel for sending emails to learners

    • -21
    • +49
    /lams_gradebook/web/gradebookMonitor.jsp
    • -0
    • +109
    /lams_gradebook/web/releaseLessonMarks.jsp
LDEV-5140 Introduce Release Marks panel for sending emails to learners

    • -21
    • +49
    /lams_gradebook/web/gradebookMonitor.jsp
    • -0
    • +109
    /lams_gradebook/web/releaseLessonMarks.jsp
LDEV-5141 Correctly display Finish button to non-leaders

    • -7
    • +5
    /lams_tool_doku/web/pages/learning/learning.jsp
LDEV-5141 Allow Author to always continue in Preview mode

    • -9
    • +19
    /lams_tool_doku/web/pages/learning/learning.jsp
LDEV-4769 Update Greek

LDEV-5141 Make manual timer start optional

    • -0
    • +7
    /lams_tool_doku/web/pages/authoring/advance.jsp
LDEV-5009 Fix Assessment monitoring if there are no questions added

LDEV-5120 Fix "wait for time limit launch" page parameter passing

LDEV-5103 Make Authoring dialog wider to accommodate QB button

LDEV-5097 Skip empty sessions for rating calculation

LDEV-4769 Fixing quotes for Greek

LDEV-4769 Fixing quotes for Greek

Merge branch 'LDEV-5139' into v4.0

LDEV-5139 Fix parameter passing when opening Notifications dialog

    • -31
    • +25
    /lams_central/web/includes/javascript/dialog.js
Merge remote-tracking branch 'origin/v4.0' into LDEV-5016

Conflicts:

lams_build/3rdParty.userlibraries

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/qb/collection.jsp

lams_central/web/questions/questionFile.jsp

lams_common/db/sql/create_lams_11_tables.sql

lams_common/db/sql/insert_lams_config_data.sql

lams_common/db/sql/insert_types_data.sql

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

lams_common/src/java/org/lamsfoundation/lams/questions/QuestionWordParser.java

lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_assessment/db/sql/create_lams_tool_assessment.sql

lams_tool_lamc/conf/language/lams/ApplicationResources.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McContent.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McUsrAttempt.java

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

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

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

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

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

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

lams_tool_lamc/web/authoring/candidateAnswersList.jsp

lams_tool_lamc/web/authoring/itemlist.jsp

lams_tool_scratchie/web/pages/authoring/basic.jsp

lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp

    • -1
    • +2
    /lams_common/db/sql/create_lams_11_tables.sql
    • -1
    • +4
    /lams_common/db/sql/insert_lams_config_data.sql
    • -2
    • +2
    /lams_common/db/sql/insert_types_data.sql
  1. … 15 more files in changeset.
LDEV-4769 Updating Greek

LDEV-5097 Skip empty sessions for rating calculation

LDEV-4769 Updating Greek and Norwegian

SP-5 Expose variables for other LAMS modules to use

Merge branch 'v4.0' of https://github.com/lamsfoundation/lams.git into v4.0

LDEV-5097 Skip empty sessions for rating calculation

LDEV-4769 Updating Greek

LDEV-4959 Fix comments in the DB patch

LDEV-5120 Updating labels Spanish, English

LDEV-5120 index.html should be blank