lams-github / lams_central

conf

Clone Tools

Stats

Commits this week: 0
Total Committers: 22
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
Wednesday 30 Dec 2020
10:05 am

Marcin Cieslak

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

Options
    • -9
    • +12
    ./language/lams/ApplicationResources_en_AU.properties
  2. … 29 more files in changeset.
Sunday 27 Dec 2020
2:34 am

Ernie Ghiglione

LDEV-4769 Updating Greek and Norwegian

Options
    • -11
    • +11
    ./language/lams/ApplicationResources_el_GR.properties
  2. … 2 more files in changeset.
Friday 25 Dec 2020
3:41 am

Ernie Ghiglione

LDEV-4769 Updating Greek

Options
    • -1
    • +1
    ./language/lams/ApplicationResources_el_GR.properties
  2. … 9 more files in changeset.
Thursday 26 Nov 2020
3:04 pm

Ernie Ghiglione

LDEV-4769 Updating English, Spanish, Norwegian, Greek

Options
    • -0
    • +3
    ./language/lams/ApplicationResources_el_GR.properties
    • -0
    • +1
    ./language/lams/ApplicationResources_no_NO.properties
  3. … 8 more files in changeset.
Sunday 22 Nov 2020
12:25 am

Ernie Ghiglione

LDEV-5101 Adding labels from lokalise (English and Español)

Options
    • -1
    • +1
    ./language/lams/ApplicationResources.properties
    • -0
    • +1
    ./language/lams/ApplicationResources_en_AU.properties
    • -0
    • +1
    ./language/lams/ApplicationResources_es_ES.properties
  4. … 6 more files in changeset.
Saturday 21 Nov 2020
11:16 am

Marcin Cieslak

Merge branch 'LDEV-5101' into v4.0

Conflicts:

lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

Options
    • -0
    • +1
    ./language/lams/ApplicationResources.properties
  2. … 9 more files in changeset.
Thursday 19 Nov 2020
1:47 am

Ernie Ghiglione

LDEV-4769 Updating English, Spanish, Norwegian, Greek

Options
    • -1
    • +1
    ./language/lams/ApplicationResources.properties
    • -0
    • +1
    ./language/lams/ApplicationResources_en_AU.properties
    • -0
    • +1
    ./language/lams/ApplicationResources_es_ES.properties
    • -1
    • +2
    ./language/lams/ApplicationResources_no_NO.properties
  5. … 16 more files in changeset.
Tuesday 17 Nov 2020
12:42 pm

Marcin Cieslak

LDEV-5114 Enforce question new version on demand

Options
    • -0
    • +1
    ./language/lams/ApplicationResources.properties
  2. … 3 more files in changeset.
Wednesday 11 Nov 2020
1:17 am

Ernie Ghiglione

LDEV-4769 Updating Greek and Norwegian

Options
    • -2
    • +2
    ./language/lams/ApplicationResources_el_GR.properties
    • -0
    • +1
    ./language/lams/ApplicationResources_no_NO.properties
  3. … 1 more file in changeset.
Sunday 08 Nov 2020
3:15 pm

Marcin Cieslak

LDEV-5101 Allow applying new question version to other activities in LD

Options
    • -0
    • +1
    ./language/lams/ApplicationResources.properties
  2. … 13 more files in changeset.
2:20 pm

Ernie Ghiglione

LDEV-4949 LDEV-5106 LDEV-5107 LDEV-5108 Adding/updating labels

Options
    • -2
    • +2
    ./language/lams/ApplicationResources.properties
    • -0
    • +1
    ./language/lams/ApplicationResources_de_DE.properties
    • -2
    • +2
    ./language/lams/ApplicationResources_en_AU.properties
    • -1
    • +2
    ./language/lams/ApplicationResources_es_ES.properties
    • -0
    • +1
    ./language/lams/ApplicationResources_fr_FR.properties
    • -1
    • +1
    ./language/lams/ApplicationResources_no_NO.properties
  7. … 14 more files in changeset.
2:19 pm

Ernie Ghiglione

LDEV-4769 Updating Greek

Options
    • -4
    • +6
    ./language/lams/ApplicationResources_el_GR.properties
  2. … 4 more files in changeset.
9:16 am

Ernie Ghiglione

LDEV-5106 Adding MS Word question import to TBL Template

Options
    • -0
    • +1
    ./language/lams/ApplicationResources.properties
    • -0
    • +1
    ./language/lams/ApplicationResources_en_AU.properties
  3. … 2 more files in changeset.
Friday 06 Nov 2020
9:24 am

Ernie Ghiglione

LDEV-4949 Updating labels for Greek and Norwegian

Options
    • -1
    • +1
    ./language/lams/ApplicationResources_el_GR.properties
    • -2
    • +4
    ./language/lams/ApplicationResources_no_NO.properties
7:21 am

Ernie Ghiglione

LDEV-4769 Updating Greek, Norwegian

Options
    • -0
    • +1
    ./language/lams/ApplicationResources_el_GR.properties
    • -0
    • +1
    ./language/lams/ApplicationResources_no_NO.properties
7:20 am

Ernie Ghiglione

LDEV-4949 Updating labels

Options
    • -3
    • +6
    ./language/lams/ApplicationResources.properties
    • -3
    • +6
    ./language/lams/ApplicationResources_en_AU.properties
    • -2
    • +5
    ./language/lams/ApplicationResources_es_ES.properties
4:52 am

Ernie Ghiglione

LDEV-4769 Updating English, Spanish, Norwegian

Options
    • -1
    • +1
    ./language/lams/ApplicationResources.properties
    • -4
    • +1
    ./language/lams/ApplicationResources_en_AU.properties
    • -1
    • +1
    ./language/lams/ApplicationResources_es_ES.properties
  4. … 9 more files in changeset.
Monday 19 Oct 2020
10:24 am

Ernie Ghiglione

LDEV-4769 Updating Greek

Options
    • -6
    • +6
    ./language/lams/ApplicationResources_el_GR.properties
  2. … 2 more files in changeset.
Sunday 11 Oct 2020
8:17 am

Ernie Ghiglione

LDEV-4769 Updating Greek

Options
    • -2
    • +2
    ./language/lams/ApplicationResources_el_GR.properties
  2. … 6 more files in changeset.
Sunday 04 Oct 2020
4:29 am

Ernie Ghiglione

LDEV-4769 Updating labels Green, Norwegian, English

Options
    • -5
    • +5
    ./language/lams/ApplicationResources_el_GR.properties
  2. … 8 more files in changeset.
Tuesday 22 Sep 2020
3:05 pm

Marcin Cieslak

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

Conflicts:

lams_central/conf/language/lams/ApplicationResources_en_AU.properties

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

lams_tool_assessment/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/service/McService.java

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

lams_tool_lamc/web/authoring/candidateAnswersList.jsp

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

Options
    • -0
    • +1
    ./language/lams/ApplicationResources_en_AU.properties
  2. … 7 more files in changeset.
Tuesday 15 Sep 2020
8:02 am

Ernie Ghiglione

LDEV-5076 Align TBL terminology

Options
    • -7
    • +7
    ./language/lams/TBLResources.properties
  2. … 12 more files in changeset.
Sunday 13 Sep 2020
6:12 am

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
    • -20
    • +0
    ./language/lams/ApplicationResources.properties
    • -313
    • +235
    ./language/lams/ApplicationResources_de_DE.properties
    • -1
    • +2
    ./language/lams/ApplicationResources_el_GR.properties
  4. … 38 more files in changeset.
Sunday 30 Aug 2020
2:27 pm

Marcin Cieslak

LKC-213 Reintroduce labels for Workflow Automation in Question Bank

Options
    • -0
    • +20
    ./language/lams/ApplicationResources.properties
Friday 21 Aug 2020
3:40 am

Ernie Ghiglione

LDEV-4769 Updating English, Spanish, Greek and Norwegian labels

Options
    • -1
    • +1
    ./language/lams/ApplicationResources.properties
    • -1
    • +14
    ./language/lams/ApplicationResources_el_GR.properties
    • -0
    • +1
    ./language/lams/ApplicationResources_en_AU.properties
    • -0
    • +1
    ./language/lams/ApplicationResources_es_ES.properties
    • -0
    • +1
    ./language/lams/ApplicationResources_no_NO.properties
  6. … 10 more files in changeset.
Thursday 20 Aug 2020
8:46 am

Marcin Cieslak

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

Options
    • -1066
    • +1076
    ./language/lams/ApplicationResources_en_AU.properties
    • -2
    • +21
    ./security/Owasp.CsrfGuard.properties
  3. … 24 more files in changeset.
Wednesday 19 Aug 2020
10:26 am

Marcin Cieslak

LDEV-4917 Add error pop up on attempt of uploading incorrect file

Options
    • -0
    • +1
    ./language/lams/ApplicationResources.properties
  2. … 10 more files in changeset.
Monday 17 Aug 2020
6:05 am

Ernie Ghiglione

LDEV-4769 Updating English , Spanish, Norwegian

Options
    • -1
    • +14
    ./language/lams/ApplicationResources_no_NO.properties
  2. … 5 more files in changeset.
Monday 10 Aug 2020
3:37 am

Ernie Ghiglione

LDEV-4769 Updating Spanish

Options
    • -2
    • +2
    ./language/lams/ApplicationResources_es_ES.properties
Friday 07 Aug 2020
6:52 am

Ernie Ghiglione

LDEV-4769 Updating Spanish, Greek, French, Norwegian

Options
    • -2
    • +1
    ./language/lams/ApplicationResources.properties
    • -1
    • +0
    ./language/lams/ApplicationResources_el_GR.properties
    • -2
    • +1
    ./language/lams/ApplicationResources_en_AU.properties
    • -11
    • +10
    ./language/lams/ApplicationResources_es_ES.properties
    • -1
    • +0
    ./language/lams/ApplicationResources_fr_FR.properties
    • -1
    • +0
    ./language/lams/ApplicationResources_no_NO.properties
  7. … 40 more files in changeset.