lams_learning

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5164 Switch buttons when choosing branching in preview

LDEV-4553 Updating labels

  1. … 3 more files in changeset.
LDEV-5143 and LDEV-5140 labels updates

  1. … 20 more files in changeset.
LDEV-4769 Update Greek

  1. … 3 more files in changeset.
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. … 29 more files in changeset.
LDEV-4075 Re-introduce skipping branching in Preview

LDEV-5120 Allow hiding criteria titles in Rating.tag

  1. … 31 more files in changeset.
LDEV-5127 Adjust reported pad height when toolbar is not displayed

  1. … 32 more files in changeset.
LDEV-5127 Fix pad resizing

  1. … 32 more files in changeset.
LDEV-4915, LDEV-3971 Silence an unnecessary exception log

If this exception occurs, the user can probably and should carry on

instead of trying to create a session which already exists.

LDEV-4769 Updating English, Spanish, Norwegian

  1. … 11 more files in changeset.
LDEV-5102 Prevent Scratchie from giving marks to absent learner

  1. … 5 more files in changeset.
LDEV-5091 Etherpad.tag to accept predefined pad ID

  1. … 31 more files in changeset.
LDEV-4769 Updating Greek

  1. … 2 more files in changeset.
LDEV-5093 Populate lesson Notebook entry correctly while editing

LDEV-5091 Initialise Etherpads on Discussion panel expand

  1. … 36 more files in changeset.
Merge remote-tracking branch 'origin/master' into v4.0

  1. … 31 more files in changeset.
LDEV-5085 Run CKEditor initialisation immediately

If CKEditor.tag is loaded dynamically, binding it to page load event

does not work.

  1. … 31 more files in changeset.
LDEV-4425 Do not escape user names. Add padding to portrait.

  1. … 31 more files in changeset.
Merge remote-tracking branch 'origin/master' into v4.0

  1. … 31 more files in changeset.
LDEV-5085 Make editor init method parametrized

It seems that multiple instances of CKEditor tag were interacting with

each other, probably with request attributes. Now initialisation method

is parametrised so CKEditor starts with own set of attributes.

  1. … 31 more files in changeset.
LDEV-4769 Updating labels Green, Norwegian, English

  1. … 8 more files in changeset.
LDEV-4718 Fix plugin race condition by manually disabling buttons

LDEV-5078 Fix i18n labels in Arrow tag

  1. … 52 more files in changeset.
LDEV-4769 Updating Greek and Norwegian

  1. … 1 more file in changeset.
Updating translations English, Greek, German and Norwegian

Added German to Lokalise. All labels are the same but the output file format is slightly different.

  1. … 40 more files in changeset.
LDEV-4769 Updating English, Spanish, Greek and Norwegian labels

  1. … 14 more files in changeset.
Merge remote-tracking branch 'origin/v4.0' into v5.0

Conflicts:

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/questions/questionFile.jsp

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

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

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java

lams_tool_assessment/web/pages/monitoring/summary.jsp

lams_tool_lamc/conf/language/lams/ApplicationResources.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_el_GR.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_es_ES.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_fr_FR.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_no_NO.properties

lams_tool_lamc/db/sql/activity_insert.sql

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml

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

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

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

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

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

lams_tool_lamc/web/authoring/BasicContent.jsp

lams_tool_lamc/web/authoring/editQuestionBox.jsp

lams_tool_lamc/web/authoring/itemlist.jsp

  1. … 25 more files in changeset.
LDEV-4769 Updating English , Spanish, Norwegian

  1. … 5 more files in changeset.
LDEV-4769 Updating Spanish, Greek, French, Norwegian

  1. … 39 more files in changeset.