lams-github

Clone Tools

Stats

Commits this week: 0
Total Committers: 50
Last Commit:
Commits this week: 0

Lines of code count not available

Commit Activity

Commits By Day In Week
52 week commits volume
Commits By Day In Week
Commits by day
Commits By Day In Week
Commits by hour
Commits By Hour In Day
Commit calendar
 

Most active committers (90 days)

loading
loading
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Tuesday 22 Sep 2020
1:48 pm

Marcin Cieslak

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

Conflicts:

lams_tool_assessment/web/pages/authoring/parts/optionlist.jsp

lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp

lams_tool_assessment/web/pages/authoring/parts/questionlistRestricted.jsp

lams_tool_laqa/web/authoring/itemlist.jsp

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

Options
    • -2
    • +2
    /lams_tool_lamc/web/authoring/candidateAnswersList.jsp
    • -2
    • +2
    /lams_tool_laqa/web/authoring/itemlist.jsp
    • -2
    • +2
    /lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp
    • -2
    • +2
    /lams_tool_scratchie/web/pages/authoring/parts/optionlist.jsp
1:40 pm

Marcin Cieslak

Merge branch 'LDEV-5078'

Options
1:40 pm

Marcin Cieslak

LDEV-5078 Fix i18n labels in Arrow tag

Options
    • -3
    • +4
    /lams_admin/web/WEB-INF/tags/Arrow.tag
    • -3
    • +4
    /lams_central/web/WEB-INF/tags/Arrow.tag
    • -2
    • +2
    /lams_central/web/authoring/template/tool/assessoption.jsp
    • -2
    • +2
    /lams_central/web/authoring/template/tool/mcoption.jsp
    • -3
    • +4
    /lams_gradebook/web/WEB-INF/tags/Arrow.tag
    • -3
    • +4
    /lams_learning/web/WEB-INF/tags/Arrow.tag
    • -3
    • +4
    /lams_monitoring/web/WEB-INF/tags/Arrow.tag
    • -3
    • +4
    /lams_tool_assessment/web/WEB-INF/tags/Arrow.tag
    • -2
    • +2
    /lams_tool_assessment/web/pages/authoring/parts/optionlist.jsp
    • -2
    • +2
    /lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp
    • -2
    • +2
    /lams_tool_assessment/web/pages/authoring/parts/questionlistRestricted.jsp
    • -3
    • +4
    /lams_tool_chat/web/WEB-INF/tags/Arrow.tag
    • -2
    • +2
    /lams_tool_chat/web/pages/authoring/conditionList.jsp
    • -3
    • +4
    /lams_tool_daco/web/WEB-INF/tags/Arrow.tag
    • -2
    • +2
    /lams_tool_daco/web/pages/authoring/parts/answeroptions.jsp
  16. … 38 more files in changeset.
Monday 21 Sep 2020
5:04 pm

Marcin Cieslak

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

Options
5:04 pm

Marcin Cieslak

Merge branch 'LDEV-5077'

Options
5:03 pm

Marcin Cieslak

LDEV-5077 Allow all HTTP methods when fetching Survey chart

Options
    • -2
    • +1
    /lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/ChartController.java
1:03 pm

Marcin Cieslak

LDEV-4745 Use correct Set class for sorting MCQ questions

Options
    • -2
    • +2
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McContent.java
Sunday 20 Sep 2020
10:20 am

Ernie Ghiglione

LDEV-4769 Updating Greek and Norwegian

Options
    • -4
    • +4
    /lams_learning/conf/language/lams/ApplicationResources_el_GR.properties
    • -1
    • +1
    /lams_monitoring/conf/language/lams/ApplicationResources_no_NO.properties
Thursday 17 Sep 2020
11:12 pm

Marcin Cieslak

LDEV-4745 Sort QB questions using display order when fetching from DB

Options
    • -1
    • +1
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -3
    • +4
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McContent.java
    • -0
    • +3
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java
10:17 pm

Marcin Cieslak

LKC-236 Return questions replaced in tool for further processing

Options
    • -1
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/tool/service/IQbToolService.java
    • -1
    • +6
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -1
    • +6
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
    • -1
    • +4
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
Wednesday 16 Sep 2020
11:27 pm

Marcin Cieslak

LKC-215 Send review reminder email every given period

Options
    • -2
    • +5
    /lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java
Tuesday 15 Sep 2020
2:02 pm

Ernie Ghiglione

LDEV-5076 Align TBL terminology

Options
    • -7
    • +7
    /lams_central/conf/language/lams/TBLResources.properties
    • -4
    • +4
    /lams_monitoring/conf/language/lams/ApplicationResources.properties
    • -4
    • +4
    /lams_monitoring/conf/language/lams/ApplicationResources_el_GR.properties
    • -4
    • +4
    /lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties
    • -3
    • +3
    /lams_monitoring/conf/language/lams/ApplicationResources_no_NO.properties
    • -1
    • +1
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    /lams_tool_assessment/conf/language/lams/ApplicationResources_el_GR.properties
    • -1
    • +1
    /lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +1
    /lams_tool_assessment/conf/language/lams/ApplicationResources_no_NO.properties
    • -2
    • +2
    /lams_tool_scratchie/conf/language/lams/ApplicationResources.properties
    • -2
    • +2
    /lams_tool_scratchie/conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +2
    /lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +2
    /lams_tool_scratchie/conf/language/lams/ApplicationResources_no_NO.properties
Monday 14 Sep 2020
7:21 pm

Marcin Cieslak

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

Options
7:21 pm

Marcin Cieslak

Merge branch 'LDEV-5075'

Options
7:20 pm

Marcin Cieslak

LDEV-5075 Take content folder ID from correct place in Doku authoring

Options
    • -1
    • +1
    /lams_tool_doku/web/pages/authoring/basic.jsp
Sunday 13 Sep 2020
11:42 pm

Marcin Cieslak

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

Options
    • -2
    • +6
    /lams_central/web/authoring/template/comms.jsp
    • -24
    • +29
    /lams_central/web/authoring/template/tbl/tbl.jsp
11:41 pm

Marcin Cieslak

Merge branch 'LDEV-5074'

Options
11:41 pm

Marcin Cieslak

LDEV-5074 Prevent double submit of TBL template

Options
    • -2
    • +6
    /lams_central/web/authoring/template/comms.jsp
    • -24
    • +29
    /lams_central/web/authoring/template/tbl/tbl.jsp
12:12 pm

Ernie Ghiglione

Updating translations English, Greek, German and Norwegian

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

Options
    • -14
    • +2
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -484
    • +399
    /lams_admin/conf/language/lams/ApplicationResources_de_DE.properties
    • -1
    • +2
    /lams_admin/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +1
    /lams_admin/conf/language/lams/ApplicationResources_es_ES.properties
    • -1
    • +2
    /lams_admin/conf/language/lams/ApplicationResources_no_NO.properties
    • -20
    • +0
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -313
    • +235
    /lams_central/conf/language/lams/ApplicationResources_de_DE.properties
    • -1
    • +2
    /lams_central/conf/language/lams/ApplicationResources_el_GR.properties
    • -64
    • +53
    /lams_common/conf/language/lams/ApplicationResources_de_DE.properties
    • -91
    • +67
    /lams_gradebook/conf/language/lams/ApplicationResources_de_DE.properties
    • -0
    • +1
    /lams_gradebook/conf/language/lams/ApplicationResources_el_GR.properties
    • -111
    • +70
    /lams_learning/conf/language/lams/ApplicationResources_de_DE.properties
    • -207
    • +173
    /lams_monitoring/conf/language/lams/ApplicationResources_de_DE.properties
    • -4
    • +4
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -277
    • +242
    /lams_tool_assessment/conf/language/lams/ApplicationResources_de_DE.properties
  16. … 26 more files in changeset.
Saturday 12 Sep 2020
3:31 pm

Marcin Cieslak

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

Options
    • -2
    • +6
    /lams_monitoring/web/includes/javascript/monitorLesson.js
    • -1
    • +1
    /lams_tool_scratchie/web/pages/learning/results.jsp
3:12 pm

Marcin Cieslak

LDEV-5022 Fix line breaks when multiple editing Burning Questions

Options
    • -1
    • +1
    /lams_tool_scratchie/web/pages/learning/results.jsp
12:56 am

Marcin Cieslak

Merge branch 'LDEV-5073'

Options
12:55 am

Marcin Cieslak

LDEV-5073 Do not autofresh monitoring if a modal dialog is open

Options
    • -2
    • +6
    /lams_monitoring/web/includes/javascript/monitorLesson.js
    • -4
    • +6
    /lams_monitoring/web/tblmonitor/tblmonitor.jsp
Thursday 10 Sep 2020
1:18 pm

Marcin Cieslak

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

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_admin/conf/language/lams/ApplicationResources_es_ES.properties

lams_admin/conf/language/lams/ApplicationResources_no_NO.properties

Options
    • -1
    • +1
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -1
    • +0
    /lams_admin/conf/language/lams/ApplicationResources_el_GR.properties
    • -1
    • +0
    /lams_admin/conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +0
    /lams_admin/conf/language/lams/ApplicationResources_es_ES.properties
    • -1
    • +0
    /lams_admin/conf/language/lams/ApplicationResources_no_NO.properties
    • -2
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java
1:14 pm

Marcin Cieslak

Merge branch 'LDEV-5072'

Options
Wednesday 09 Sep 2020
4:25 pm

Marcin Cieslak

LDEV-5072 Allow customisation of LTI user ID parameter name

Options
    • -1
    • +1
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -1
    • +0
    /lams_admin/conf/language/lams/ApplicationResources_el_GR.properties
    • -1
    • +0
    /lams_admin/conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +0
    /lams_admin/conf/language/lams/ApplicationResources_es_ES.properties
    • -1
    • +0
    /lams_admin/conf/language/lams/ApplicationResources_no_NO.properties
    • -12
    • +19
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/LtiConsumerForm.java
    • -2
    • +2
    /lams_admin/web/integration/ltiConsumer.jsp
    • -31
    • +27
    /lams_central/src/java/org/lamsfoundation/lams/web/LoginRequestLtiServlet.java
    • -0
    • +14
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20200909.sql
    • -10
    • +11
    /lams_common/src/java/org/lamsfoundation/lams/integration/ExtServer.java
    • -44
    • +43
    /lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java
Tuesday 08 Sep 2020
12:11 am

Marcin Cieslak

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

Options
    • -2
    • +14
    /lams_central/web/includes/javascript/authoring/authoringActivity.js
12:11 am

Marcin Cieslak

LDEV-5071 Fix race condition when opening activity authoring

Options
    • -2
    • +14
    /lams_central/web/includes/javascript/authoring/authoringActivity.js
Monday 07 Sep 2020
6:40 pm

Marcin Cieslak

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

Options
    • -28
    • +33
    /lams_central/web/includes/javascript/authoring/authoringActivity.js
6:38 pm

Marcin Cieslak

Merge branch 'LDEV-5071'

Options