lams-github / lams_admin / conf

language

Clone Tools

Stats

Commits this week: 1
Total Committers: 19
Last Commit:
Commits this week: 1

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
Friday 10 Apr 2020
11:16 am

Ernie Ghiglione

LDEV-4739 Updating labels

Greek, Spanish, Norwegian

Options
    • -2
    • +7
    ./lams/ApplicationResources_el_GR.properties
    • -2
    • +7
    ./lams/ApplicationResources_es_ES.properties
    • -2
    • +7
    ./lams/ApplicationResources_no_NO.properties
11:13 am

Ernie Ghiglione

LDEV-4995 Course manager changes

Important changes for accessibility, specially in tablesorter and page tag. New labels to better reflect new layout -work in progress

Options
    • -13
    • +16
    ./lams/ApplicationResources.properties
  2. … 4 more files in changeset.
Monday 30 Mar 2020
7:30 am

Marcin Cieslak

LDEV-4997 Initial migration of Doku tool to Etherpad as central service

Options
    • -1
    • +3
    ./lams/ApplicationResources.properties
  2. … 32 more files in changeset.
7:30 am

Marcin Cieslak

LDEV-4997 Initial migration of Doku tool to Etherpad as central service

Conflicts:

lams_admin/conf/language/lams/ApplicationResources.properties

lams_build/build.xml

lams_common/src/java/org/lamsfoundation/lams/commonContext.xml

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

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dbupdates/patch20200329.sql

Options
    • -1
    • +3
    ./lams/ApplicationResources.properties
  2. … 31 more files in changeset.
Sunday 22 Mar 2020
4:45 pm

Ernie Ghiglione

LDEV-4995 Upgrading admin to Bootstrap4 and accessibility improvements

Options
    • -1
    • +1
    ./lams/ApplicationResources.properties
  2. … 12 more files in changeset.
Monday 17 Feb 2020
1:29 pm

Marcin Cieslak

LKC-225 Make container auto sync time and interval configurable

Options
    • -0
    • +3
    ./lams/ApplicationResources.properties
  2. … 1 more file in changeset.
Tuesday 11 Feb 2020
4:43 pm

Marcin Cieslak

LKC-225 Make integrated server name configurable

Options
    • -0
    • +1
    ./lams/ApplicationResources.properties
  2. … 1 more file in changeset.
Thursday 06 Feb 2020
1:50 pm

Marcin Cieslak

LKC-225 Add configuration settings for Workflow Automation

Options
    • -0
    • +5
    ./lams/ApplicationResources.properties
  2. … 1 more file in changeset.
Tuesday 28 Jan 2020
7:38 am

Marcin Cieslak

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

Conflicts:

lams_admin/conf/language/lams/ApplicationResources.properties

Options
    • -0
    • +2
    ./lams/ApplicationResources.properties
7:35 am

Marcin Cieslak

LDEV-4957 Confirm before deleting integrated server or LTI consumer

Options
    • -1
    • +2
    ./lams/ApplicationResources.properties
  2. … 2 more files in changeset.
Friday 03 Jan 2020
11:44 am

Marcin Cieslak

Merge branch 'LDEV-4745' into v4.0

# Conflicts:

# lams_admin/conf/language/lams/ApplicationResources.properties

# lams_central/conf/language/lams/ApplicationResources.properties

# lams_central/conf/language/lams/ApplicationResources_en_AU.properties

# lams_central/web/includes/javascript/authoring/authoringGeneral.js

# lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml

# 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_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml

Options
    • -14
    • +25
    ./lams/ApplicationResources.properties
  2. … 19 more files in changeset.
Thursday 19 Dec 2019
8:42 pm

Andrey Balan

Merge branch 'develop' into LDEV-4745

# Conflicts:

# lams_admin/conf/language/lams/ApplicationResources.properties

# lams_admin/conf/language/lams/ApplicationResources_en_AU.properties

# lams_admin/conf/language/lams/ApplicationResources_es_ES.properties

# lams_central/conf/language/lams/ApplicationResources.properties

# lams_central/conf/language/lams/ApplicationResources_en_AU.properties

# lams_common/src/java/org/lamsfoundation/lams/commonContext.xml

# lams_learning/conf/language/lams/ApplicationResources.properties

# lams_learning/conf/language/lams/ApplicationResources_en_AU.properties

# lams_learning/conf/language/lams/ApplicationResources_es_ES.properties

# lams_tool_assessment/conf/language/lams/ApplicationResources.properties

# lams_tool_assessment/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml

# 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_laqa/conf/language/lams/ApplicationResources.properties

# lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_laqa/conf/language/lams/ApplicationResources_es_ES.properties

# lams_tool_laqa/web/learning/CombinedAnswersContent.jsp

# lams_tool_laqa/web/learning/IndividualLearnerResults.jsp

# lams_tool_laqa/web/learning/LearnerRep.jsp

# lams_tool_laqa/web/learning/SequentialAnswersContent.jsp

# lams_tool_mindmap/conf/language/lams/ApplicationResources.properties

# lams_tool_mindmap/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_mindmap/conf/language/lams/ApplicationResources_es_ES.properties

# lams_tool_nb/conf/language/lams/ApplicationResources.properties

# lams_tool_nb/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_nb/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_nb/conf/language/lams/ApplicationResources_es_ES.properties

# lams_tool_notebook/conf/language/lams/ApplicationResources.properties

# lams_tool_notebook/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_notebook/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_notebook/conf/language/lams/ApplicationResources_es_ES.properties

# lams_tool_pixlr/conf/language/lams/ApplicationResources.properties

# lams_tool_pixlr/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_pixlr/conf/language/lams/ApplicationResources_es_ES.properties

# lams_tool_sbmt/conf/language/lams/ApplicationResources.properties

# lams_tool_sbmt/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_sbmt/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_sbmt/conf/language/lams/ApplicationResources_es_ES.properties

# lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

# lams_tool_scratchie/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml

# lams_tool_scribe/conf/language/lams/ApplicationResources.properties

# lams_tool_scribe/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_scribe/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_scribe/conf/language/lams/ApplicationResources_es_ES.properties

# lams_tool_spreadsheet/conf/language/lams/ApplicationResources.properties

# lams_tool_spreadsheet/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_spreadsheet/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_spreadsheet/conf/language/lams/ApplicationResources_es_ES.properties

# lams_tool_survey/conf/language/lams/ApplicationResources.properties

# lams_tool_survey/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_survey/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_survey/conf/language/lams/ApplicationResources_es_ES.properties

# lams_tool_task/conf/language/lams/ApplicationResources.properties

# lams_tool_task/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_task/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_task/conf/language/lams/ApplicationResources_es_ES.properties

# lams_tool_vote/conf/language/lams/ApplicationResources.properties

# lams_tool_vote/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_vote/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_vote/conf/language/lams/ApplicationResources_es_ES.properties

# lams_tool_wiki/conf/language/lams/ApplicationResources.properties

# lams_tool_wiki/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_wiki/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_wiki/conf/language/lams/ApplicationResources_es_ES.properties

Options
    • -1
    • +1
    ./lams/ApplicationResources.properties
    • -2
    • +2
    ./lams/ApplicationResources_en_AU.properties
    • -1
    • +1
    ./lams/ApplicationResources_es_ES.properties
  4. … 14 more files in changeset.
Wednesday 11 Dec 2019
5:26 pm

Andrey Balan

Merge branch 'master' into develop

# 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_tool_laqa/web/learning/LearnerRep.jsp

# lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp

# lams_tool_mindmap/conf/language/lams/ApplicationResources.properties

# lams_tool_nb/conf/language/lams/ApplicationResources.properties

# lams_tool_notebook/conf/language/lams/ApplicationResources.properties

# lams_tool_pixlr/conf/language/lams/ApplicationResources.properties

# lams_tool_pixlr/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_scratchie/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_scribe/conf/language/lams/ApplicationResources.properties

# lams_tool_spreadsheet/conf/language/lams/ApplicationResources.properties

# lams_tool_survey/conf/language/lams/ApplicationResources.properties

# lams_tool_task/conf/language/lams/ApplicationResources.properties

# lams_tool_task/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_vote/conf/language/lams/ApplicationResources.properties

# lams_tool_wiki/conf/language/lams/ApplicationResources.properties

# lams_tool_wiki/conf/language/lams/ApplicationResources_el_GR.properties

Options
    • -2
    • +3
    ./lams/ApplicationResources.properties
    • -3
    • +19
    ./lams/ApplicationResources_el_GR.properties
    • -2
    • +2
    ./lams/ApplicationResources_en_AU.properties
    • -25
    • +39
    ./lams/ApplicationResources_es_ES.properties
  5. … 14 more files in changeset.
Monday 09 Dec 2019
2:15 pm

Ernie Ghiglione

LDEV-4745 adding new labels

Options
    • -6
    • +6
    ./lams/ApplicationResources.properties
    • -3
    • +6
    ./lams/ApplicationResources_en_AU.properties
    • -25
    • +42
    ./lams/ApplicationResources_es_ES.properties
2:01 pm

Marcin Cieslak

LDEV-4844 Add missing labels

Options
    • -0
    • +2
    ./lams/ApplicationResources.properties
12:57 pm

Ernie Ghiglione

LDEV-4769 updating labels

Updating labels across all modules. Mainly Greek, Norwegian, Español and English

Options
    • -2
    • +3
    ./lams/ApplicationResources.properties
    • -3
    • +19
    ./lams/ApplicationResources_el_GR.properties
    • -2
    • +2
    ./lams/ApplicationResources_en_AU.properties
    • -25
    • +39
    ./lams/ApplicationResources_es_ES.properties
    • -2
    • +3
    ./lams/ApplicationResources_no_NO.properties
  6. … 61 more files in changeset.
Tuesday 03 Dec 2019
8:44 pm

Andrey Balan

Merge branch 'master' into develop

# Conflicts:

# lams_admin/conf/language/lams/ApplicationResources.properties

# lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java

# lams_gradebook/conf/language/lams/ApplicationResources_el_GR.properties

# lams_learning/conf/language/lams/ApplicationResources_el_GR.properties

# lams_monitoring/conf/language/lams/ApplicationResources.properties

# lams_monitoring/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_chat/conf/language/lams/ApplicationResources.properties

# lams_tool_chat/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_daco/conf/language/lams/ApplicationResources.properties

# lams_tool_daco/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_forum/conf/language/lams/ApplicationResources.properties

# lams_tool_forum/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_images/conf/language/lams/ApplicationResources.properties

# lams_tool_images/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_imscc/conf/language/lams/ApplicationResources.properties

# lams_tool_imscc/conf/language/lams/ApplicationResources_el_GR.properties

# 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_laqa/conf/language/lams/ApplicationResources.properties

# lams_tool_laqa/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_larsrc/conf/language/lams/ApplicationResources.properties

# lams_tool_larsrc/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_leader/conf/language/lams/ApplicationResources.properties

# lams_tool_mindmap/conf/language/lams/ApplicationResources.properties

# lams_tool_mindmap/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_nb/conf/language/lams/ApplicationResources.properties

# lams_tool_nb/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_notebook/conf/language/lams/ApplicationResources.properties

# lams_tool_notebook/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_preview/conf/language/lams/ApplicationResources.properties

# lams_tool_preview/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_sbmt/conf/language/lams/ApplicationResources.properties

# lams_tool_sbmt/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_sbmt/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_sbmt/conf/language/lams/ApplicationResources_es_ES.properties

# lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

# lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_scribe/conf/language/lams/ApplicationResources.properties

# lams_tool_scribe/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_spreadsheet/conf/language/lams/ApplicationResources.properties

# lams_tool_spreadsheet/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_survey/conf/language/lams/ApplicationResources.properties

# lams_tool_survey/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_task/conf/language/lams/ApplicationResources.properties

# lams_tool_task/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_vote/conf/language/lams/ApplicationResources.properties

# lams_tool_vote/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_wiki/conf/language/lams/ApplicationResources.properties

# lams_tool_wiki/conf/language/lams/ApplicationResources_el_GR.properties

Options
    • -7
    • +17
    ./lams/ApplicationResources.properties
    • -2
    • +16
    ./lams/ApplicationResources_en_AU.properties
  3. … 34 more files in changeset.
7:20 pm

Andrey Balan

Merge branch 'LDEV-4918'

# Conflicts:

# lams_admin/conf/language/lams/ApplicationResources_en_AU.properties

Options
    • -1
    • +2
    ./lams/ApplicationResources_en_AU.properties
7:17 pm

Andrey Balan

LDEV-4918 Collapsible subcourses

Options
    • -1
    • +1
    ./lams/ApplicationResources_en_AU.properties
  2. … 13 more files in changeset.
Monday 02 Dec 2019
2:06 pm

Ernie Ghiglione

LDEV-4769 updating labels

Updating all labels (Greek, English, Spanish, Norwegian)

Options
    • -7
    • +16
    ./lams/ApplicationResources.properties
    • -3
    • +16
    ./lams/ApplicationResources_en_AU.properties
    • -12
    • +81
    ./lams/ApplicationResources_no_NO.properties
  4. … 120 more files in changeset.
Friday 22 Nov 2019
10:01 am

Marcin Cieslak

Merge remote-tracking branch 'origin/develop' into LDEV-4745

Options
    • -0
    • +2
    ./lams/ApplicationResources.properties
  2. … 1 more file in changeset.
10:00 am

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into develop

Options
    • -0
    • +2
    ./lams/ApplicationResources.properties
  2. … 1 more file in changeset.
9:08 am

Marcin Cieslak

LDEV-4912 Add session time information to Logged In Users in sysadmin

Options
    • -0
    • +2
    ./lams/ApplicationResources.properties
  2. … 2 more files in changeset.
Thursday 21 Nov 2019
2:39 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/develop' into LDEV-4745

Options
    • -0
    • +1
    ./lams/ApplicationResources.properties
  2. … 1 more file in changeset.
2:36 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into develop

Conflicts:

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

lams_central/web/includes/javascript/authoring/authoringGeneral.js

lams_central/web/includes/javascript/authoring/authoringProperty.js

Options
    • -0
    • +1
    ./lams/ApplicationResources.properties
  2. … 7 more files in changeset.
2:25 pm

Marcin Cieslak

Merge branch 'SP-3'

Options
    • -0
    • +1
    ./lams/ApplicationResources.properties
  2. … 7 more files in changeset.
1:19 pm

Marcin Cieslak

LDEV-4844 Add a missing label

Options
    • -1
    • +1
    ./lams/ApplicationResources.properties
Wednesday 20 Nov 2019
2:49 pm

Marcin Cieslak

Merge branch 'LDEV-4827' into LDEV-4745

Conflicts:

lams_admin/conf/language/lams/ApplicationResources.properties

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

Options
    • -0
    • +1
    ./lams/ApplicationResources.properties
  2. … 1 more file in changeset.
Tuesday 19 Nov 2019
2:43 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/develop' into LDEV-4745

Conflicts:

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

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

lams_tool_assessment/web/pages/learning/learning.jsp

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaLearningController.java

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

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java

lams_tool_scratchie/web/pages/learning/learning.jsp

Options
    • -0
    • +1
    ./lams/ApplicationResources.properties
  2. … 21 more files in changeset.
Monday 18 Nov 2019
3:30 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into develop

Conflicts:

lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java

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

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

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

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

lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java

Options
    • -0
    • +1
    ./lams/ApplicationResources.properties
  2. … 14 more files in changeset.