Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Updating labels Spanish, English, French, Norwegian

    • -23
    • +23
    ./language/lams/ApplicationResources_es_ES.properties
  1. … 41 more files in changeset.
LDEV-4769 Updating Spanish, Norwegian

    • -0
    • +53
    ./language/lams/ApplicationResources_es_ES.properties
  1. … 3 more files in changeset.
LDEV-4769 Updating Spanish, Greek, French, Norwegian

    • -1
    • +1
    ./language/lams/ApplicationResources.properties
    • -1
    • +1
    ./language/lams/ApplicationResources_en_AU.properties
    • -1
    • +1
    ./language/lams/ApplicationResources_es_ES.properties
    • -1
    • +1
    ./language/lams/ApplicationResources_no_NO.properties
LDEV-4769 Updating Spanish

Also removing a deprecated label

    • -1
    • +1
    ./language/lams/ApplicationResources.properties
    • -1
    • +1
    ./language/lams/ApplicationResources_en_AU.properties
    • -1
    • +6
    ./language/lams/ApplicationResources_es_ES.properties
  1. … 20 more files in changeset.
LDEV-4769 Updating Spanish, Greek, French, Norwegian

    • -38
    • +38
    ./language/lams/ApplicationResources_es_ES.properties
  1. … 21 more files in changeset.
LDEV-4769 Updating English, Spanish, French, Greek and Norwegian for all active projects

From this commit onwards, we no longer will use the LAMS Community i18n to manage and handle translations.

Instead, we have now migrated to Lokalise (https://lokalise.com/) for managing all i18n projects and translations.

Many thanks Lokalise for your support!!

    • -1089
    • +1062
    ./language/lams/ApplicationResources.properties
    • -1066
    • +1063
    ./language/lams/ApplicationResources_el_GR.properties
    • -1066
    • +1063
    ./language/lams/ApplicationResources_en_AU.properties
    • -835
    • +1005
    ./language/lams/ApplicationResources_es_ES.properties
    • -313
    • +320
    ./language/lams/ApplicationResources_fr_FR.properties
    • -1070
    • +1063
    ./language/lams/ApplicationResources_no_NO.properties
  1. … 166 more files in changeset.
LKC-215 Allow comment when sending question for reviewing

LKC-213 Add CSRF protection to Workflow Automation project

    • -2
    • +15
    ./security/Owasp.CsrfGuard.properties
LDEV-5041 Add individual time limits

  1. … 12 more files in changeset.
LDEV-5041 Control relative time limit in Assessment monitor

  1. … 6 more files in changeset.
LDEV-4769 Updating labels

    • -1
    • +1
    ./language/lams/ApplicationResources.properties
    • -1
    • +1
    ./language/lams/ApplicationResources_en_AU.properties
  1. … 2 more files in changeset.
DEMO-5 Add Google SSO integration to CSRF Guard

Merge remote-tracking branch 'origin/master' into v4.0

    • -2
    • +162
    ./language/lams/ApplicationResources_el_GR.properties
    • -2
    • +164
    ./language/lams/ApplicationResources_no_NO.properties
  1. … 1 more file in changeset.
LDEV-4745 adding labels for Greek and Norwegian

    • -2
    • +162
    ./language/lams/ApplicationResources_el_GR.properties
    • -2
    • +164
    ./language/lams/ApplicationResources_no_NO.properties
LDEV-5024 Import question from QB to TBL template wizard

    • -0
    • +1
    ./language/lams/ApplicationResources.properties
  1. … 2 more files in changeset.
LDEV-5024 Add "question from bank" button to TBL template wizard

    • -0
    • +1
    ./language/lams/ApplicationResources.properties
  1. … 1 more file in changeset.
Merge remote-tracking branch 'origin/v4.0' into v5.0

Conflicts:

lams_build/3rdParty.userlibraries

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java

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

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

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

lams_common/src/java/org/lamsfoundation/lams/util/CommonConstants.java

lams_monitoring/web/tblmonitor/teams.jsp

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190517.sql

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190809.sql

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

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

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

lams_tool_lamc/web/WEB-INF/tlds/lams/lams.tld

lams_tool_lamc/web/authoring/BasicContent.jsp

lams_tool_lamc/web/learning/CombinedAnswersContent.jsp

lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp

lams_tool_lamc/web/learning/ViewAnswers.jsp

lams_tool_lamc/web/monitoring/SummaryContent.jsp

lams_tool_lamc/web/monitoring/parts/statsPart.jsp

lams_tool_lamc/web/tblmonitoring/mcqStudentChoices.jsp

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java

  1. … 30 more files in changeset.
LDEV-4995 First draft of the monitor page

  1. … 16 more files in changeset.
LDEV-4999 Allow marks update in Dokuy monitoring summary page

  1. … 4 more files in changeset.
LDEV-4995 Improvements to the index page

* Fix offcanvas bar search and organisation tablesorter markup in case

of big amount of available organisations

* Optimise DB queries

* Introduce hasContributeActivities Lesson's flag

* Show "fa-spin" when loading an organisation

  1. … 18 more files in changeset.
LDEV-4949 import questions from Word files

    • -0
    • +3
    ./language/lams/ApplicationResources_en_AU.properties
  1. … 15 more files in changeset.
LDEV-4949 import questions from Word files

Cherry-pick from 5.0 branch

Conflicts:

lams_build/3rdParty.userlibraries

lams_central/conf/language/lams/ApplicationResources_en_AU.properties

lams_central/src/java/org/lamsfoundation/lams/web/QuestionsController.java

lams_central/web/questions/questionFile.jsp

    • -0
    • +3
    ./language/lams/ApplicationResources_en_AU.properties
  1. … 15 more files in changeset.
LDEV-4995 Further development of index page

  1. … 16 more files in changeset.
LDEV-4995 Upgrade to bootstrap 4

* Update LAMS code to use bootstrap 4

* Update and redesign index page

    • -2
    • +3
    ./language/lams/ApplicationResources_en_AU.properties
  1. … 196 more files in changeset.
Merge remote-tracking branch 'origin/master' into v4.0

Conflicts:

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

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

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dto/GroupSummary.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

    • -0
    • +2
    ./language/lams/ApplicationResources.properties
  1. … 20 more files in changeset.
LDEV-4989 Password Gate initial implementation

    • -0
    • +2
    ./language/lams/ApplicationResources.properties
  1. … 35 more files in changeset.
Merge branch 'LDEV-4979' into LDEV-4951

# Conflicts:

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

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java

# lams_tool_lamc/build.properties

# lams_tool_lamc/db/sql/create_lams_tool_mc.sql

# lams_tool_lamc/db/sql/tool_insert.sql

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java

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

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/MonitoringController.java

# lams_tool_lamc/web/403.jsp

# lams_tool_lamc/web/404.jsp

# lams_tool_lamc/web/WEB-INF/web.xml

# lams_tool_lamc/web/common/taglibs.jsp

# lams_tool_lamc/web/error.jsp

# lams_tool_lamc/web/login.jsp

  1. … 6 more files in changeset.
LDEV-4951 Remove traces of MCQ tool from other modules

  1. … 192 more files in changeset.
LDEV-4932 Add CSRF to password change

  1. … 1 more file in changeset.
LDEV-4932 Add CSRF to password change

(cherry picked from commit df52e287d4a5f815849470ffb1fd82a3867a6bdb)

  1. … 1 more file in changeset.