lams-github / lams_central / conf

language

Clone Tools

Stats

Commits this week: 0
Total Committers: 19
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
Thursday 21 Nov 2019
9:39 pm

Marcin Cieslak

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

Options
    • -1
    • +2
    ./lams/ApplicationResources.properties
  2. … 1 more file in changeset.
9: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
    • -1
    • +2
    ./lams/ApplicationResources.properties
  2. … 7 more files in changeset.
9:14 pm

Marcin Cieslak

LDEV-4909 Validate groupings and input on LD save

Options
    • -1
    • +2
    ./lams/ApplicationResources.properties
  2. … 3 more files in changeset.
Friday 08 Nov 2019
11:29 pm

Marcin Cieslak

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

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/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java

lams_central/web/main.jsp

lams_common/src/java/org/lamsfoundation/lams/outcome/service/IOutcomeService.java

lams_common/src/java/org/lamsfoundation/lams/outcome/service/OutcomeService.java

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

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java

lams_tool_assessment/conf/language/lams/ApplicationResources.properties

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

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

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

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

lams_tool_lamc/web/authoring/itemlist.jsp

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/AuthoringController.java

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

lams_tool_scratchie/web/pages/authoring/start.jsp

lams_tool_scratchie/web/pages/tblmonitoring/traStudentChoices.jsp

Options
    • -19
    • +24
    ./lams/ApplicationResources.properties
    • -16
    • +23
    ./lams/ApplicationResources_en_AU.properties
  3. … 26 more files in changeset.
Saturday 02 Nov 2019
2:08 am

Andrey Balan

Merge branch 'master' into develop

Conflicts:

lams_central/conf/language/lams/ApplicationResources.properties

lams_central/conf/language/lams/ApplicationResources_el_GR.properties

lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java

lams_common/src/java/org/lamsfoundation/lams/outcome/service/OutcomeService.java

Options
    • -19
    • +27
    ./lams/ApplicationResources.properties
    • -96
    • +15
    ./lams/ApplicationResources_el_GR.properties
    • -26
    • +25
    ./lams/ApplicationResources_en_AU.properties
  4. … 4 more files in changeset.
Tuesday 29 Oct 2019
1:09 pm

Ernie Ghiglione

LDEV-4769 Updating translations

Options
    • -21
    • +29
    ./lams/ApplicationResources.properties
    • -2
    • +15
    ./lams/ApplicationResources_el_GR.properties
    • -27
    • +26
    ./lams/ApplicationResources_en_AU.properties
Friday 25 Oct 2019
8:52 pm

Andrey Balan

Merge branch 'master' into develop

Options
    • -0
    • +6
    ./lams/ApplicationResources_en_AU.properties
  2. … 1 more file in changeset.
8:50 pm

Andrey Balan

LDEV-4879 Create lesson in subgroups at one go

Options
    • -0
    • +6
    ./lams/ApplicationResources_en_AU.properties
  2. … 4 more files in changeset.
Tuesday 22 Oct 2019
8:11 pm

Marcin Cieslak

Merge branch 'LDEV-4745' into v4.0

Conflicts:

lams_central/src/java/org/lamsfoundation/lams/web/qb/SearchQBController.java

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

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

Options
    • -2
    • +4
    ./lams/ApplicationResources_en_AU.properties
  2. … 9 more files in changeset.
Saturday 05 Oct 2019
6:02 am

Andrey Balan

LDEV-4875 Add VSA question type to Assessment and Scratchie

Options
    • -2
    • +4
    ./lams/ApplicationResources_en_AU.properties
  2. … 75 more files in changeset.
Thursday 26 Sep 2019
5:44 pm

Marcin Cieslak

LKC-215 Display WA logs on QB stats page

Options
    • -1
    • +19
    ./lams/ApplicationResources.properties
Tuesday 20 Aug 2019
3:23 pm

Marcin Cieslak

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

Conflicts:

lams_central/conf/language/lams/ApplicationResources_en_AU.properties

Options
    • -0
    • +1
    ./lams/ApplicationResources_en_AU.properties
Friday 16 Aug 2019
10:07 pm

Marcin Cieslak

LDEV-4848 Internationalise labels in Question Bank

Options
    • -0
    • +67
    ./lams/ApplicationResources.properties
  2. … 3 more files in changeset.
Tuesday 13 Aug 2019
5:13 am

Andrey Balan

LDEV-4822 Create a better warning page shown on unsuccessful LTI call

Options
    • -0
    • +2
    ./lams/ApplicationResources_en_AU.properties
  2. … 1 more file in changeset.
5:13 am

Andrey Balan

LDEV-4822 Create a better warning page shown on unsuccessful LTI call

Options
    • -0
    • +2
    ./lams/ApplicationResources_en_AU.properties
  2. … 1 more file in changeset.
Friday 19 Jul 2019
4:21 pm

Marcin Cieslak

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

Conflicts:

lams_central/conf/language/lams/ApplicationResources.properties

lams_central/conf/language/lams/ApplicationResources_en_AU.properties

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

Options
    • -0
    • +2
    ./lams/ApplicationResources.properties
    • -0
    • +2
    ./lams/ApplicationResources_en_AU.properties
  3. … 3 more files in changeset.
Monday 15 Jul 2019
11:40 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

Merge branch 'master' into develop

Options
    • -0
    • +2
    ./lams/ApplicationResources.properties
    • -0
    • +2
    ./lams/ApplicationResources_en_AU.properties
Saturday 13 Jul 2019
4:00 pm

Marcin Cieslak

Merge branch 'LDEV-4834' into LDEV-4745

Conflicts:

lams_central/src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java

lams_central/web/qb/collection.jsp

lams_central/web/qb/stats.jsp

lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java

lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java

lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

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

Options
    • -29
    • +40
    ./lams/ApplicationResources_en_AU.properties
  2. … 10 more files in changeset.
5:21 am

Andrey Balan

LDEV-4836 Change authoring to accommodate importing questions from QB

Options
    • -0
    • +67
    ./lams/ApplicationResources_en_AU.properties
  2. … 76 more files in changeset.
Thursday 04 Jul 2019
11:48 pm

Marcin Cieslak

LDEV-4834 Initial implementation of Learning Outcomes in Question Bank

Options
    • -913
    • +914
    ./lams/ApplicationResources.properties
  2. … 50 more files in changeset.
8:24 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4829 Supports multiple response app ex, improved font on TRA chart

Options
    • -0
    • +2
    ./lams/ApplicationResources.properties
    • -0
    • +2
    ./lams/ApplicationResources_en_AU.properties
  3. … 10 more files in changeset.
3:25 am

Marcin Cieslak

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

# 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/ckconfig_custom.js

# lams_central/web/main.jsp

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

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookConstants.java

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookController.java

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

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

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java

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

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

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

# lams_tool_assessment/web/pages/learning/parts/markhedging.jsp

# lams_tool_assessment/web/pages/learning/parts/matchingpairs.jsp

# lams_tool_assessment/web/pages/learning/parts/multiplechoice.jsp

# lams_tool_assessment/web/pages/learning/parts/ordering.jsp

# lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp

# lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp

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

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/util/AuthoringUtil.java

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

# lams_tool_lamc/web/authoring/BasicContent.jsp

# lams_tool_lamc/web/authoring/candidateAnswersList.jsp

# lams_tool_lamc/web/authoring/itemlist.jsp

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

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

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

# lams_tool_scratchie/web/pages/learning/learning.jsp

# lams_tool_scratchie/web/pages/learning/scratchies.jsp

# lams_tool_scratchie/web/pages/monitoring/summary.jsp

# lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp

# lams_tool_scratchie/web/pages/tblmonitoring/traStudentChoices.jsp

Options
    • -29
    • +57
    ./lams/ApplicationResources.properties
    • -29
    • +40
    ./lams/ApplicationResources_en_AU.properties
  3. … 53 more files in changeset.
Sunday 30 Jun 2019
6:42 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

Merge branch 'master' into develop

Options
    • -12
    • +16
    ./lams/ApplicationResources.properties
    • -12
    • +17
    ./lams/ApplicationResources_en_AU.properties
  3. … 1 more file in changeset.
Friday 28 Jun 2019
4:02 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4829 Deletion of unwanted RAT and Application Exercises supported.

Options
    • -0
    • +2
    ./lams/ApplicationResources.properties
    • -0
    • +2
    ./lams/ApplicationResources_en_AU.properties
  3. … 6 more files in changeset.
Thursday 27 Jun 2019
8:18 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4829 Error msg and text improvements, supports mark entry

Options
    • -12
    • +14
    ./lams/ApplicationResources.properties
    • -12
    • +15
    ./lams/ApplicationResources_en_AU.properties
    • -3
    • +4
    ./lams/TBLResources.properties
  4. … 11 more files in changeset.
Wednesday 26 Jun 2019
1:09 am

Andrey Balan

LDEV-4833 Move import/export questions in XML format feature to QB

Options
    • -2
    • +6
    ./lams/ApplicationResources_en_AU.properties
  2. … 7 more files in changeset.
Tuesday 25 Jun 2019
3:48 am

Andrey Balan

Merge branch 'master' into develop

Options
    • -1
    • +99
    ./lams/ApplicationResources_el_GR.properties
Wednesday 19 Jun 2019
12:46 pm

Ernie Ghiglione

LDEV-4769 Updating translations

Updating Greek

Options
    • -3
    • +96
    ./lams/ApplicationResources_el_GR.properties
6:33 am

Andrey Balan

LDEV-4832 Add ability to create/edit questions from the central QB pages

Options
    • -0
    • +1
    ./lams/ApplicationResources_en_AU.properties
  2. … 28 more files in changeset.
Tuesday 18 Jun 2019
12:11 am

Andrey Balan

LDEV-4826 Add export QTI feature to QB questions page

Options
    • -9
    • +0
    ./lams/ApplicationResources_en_AU.properties
  2. … 6 more files in changeset.