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
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.
Monday 17 Jun 2019
9:57 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

Merge branch 'master' into develop

Options
    • -14
    • +16
    ./lams/ApplicationResources.properties
    • -14
    • +18
    ./lams/ApplicationResources_en_AU.properties
9:49 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4829 Wording tweaks and tool tips added to templates

Options
    • -14
    • +16
    ./lams/ApplicationResources.properties
    • -14
    • +18
    ./lams/ApplicationResources_en_AU.properties
  3. … 5 more files in changeset.
Friday 14 Jun 2019
11:22 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

Merge branch 'master' into develop

Options
    • -8
    • +12
    ./lams/ApplicationResources.properties
    • -8
    • +10
    ./lams/ApplicationResources_en_AU.properties
  3. … 1 more file in changeset.
Thursday 13 Jun 2019
9:45 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4829 Application Exercise functionality completed, can edit titles

Options
    • -6
    • +10
    ./lams/ApplicationResources.properties
    • -2
    • +2
    ./lams/ApplicationResources_en_AU.properties
    • -10
    • +8
    ./lams/TBLResources.properties
  4. … 14 more files in changeset.
Sunday 09 Jun 2019
3:22 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4829 Multiple App Exercises with multiple Questions, QTI import

Options
    • -3
    • +3
    ./lams/ApplicationResources.properties
    • -8
    • +10
    ./lams/ApplicationResources_en_AU.properties
    • -10
    • +15
    ./lams/TBLResources.properties
  4. … 12 more files in changeset.
Wednesday 05 Jun 2019
8:11 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4829 Activities removable in build, RAT and AE have QTI Import

Options
    • -1
    • +1
    ./lams/ApplicationResources.properties
    • -1
    • +4
    ./lams/TBLResources.properties
  3. … 16 more files in changeset.
4:17 pm

Marcin Cieslak

LDEV-4828 Add QB collections link on index page

Options
    • -884
    • +885
    ./lams/ApplicationResources.properties
  2. … 3 more files in changeset.
Thursday 30 May 2019
8:06 am

Andrey Balan

LDEV-4826 Remove import/export QTI questions feature from tools

Options
    • -0
    • +2
    ./lams/ApplicationResources_en_AU.properties
  2. … 12 more files in changeset.
Monday 13 May 2019
8:35 pm

Andrey Balan

LDEV-4777 Show question details for all question types

Options
    • -1
    • +13
    ./lams/ApplicationResources_en_AU.properties
  2. … 4 more files in changeset.
Wednesday 27 Mar 2019
7:18 pm

Marcin Cieslak

LDEV-4786 Adjust outcome CSS in authoring. Confirm outcome removal.

Options
    • -0
    • +1
    ./lams/ApplicationResources.properties
    • -0
    • +1
    ./lams/ApplicationResources_en_AU.properties
  3. … 86 more files in changeset.
Thursday 21 Mar 2019
9:58 pm

Marcin Cieslak

LDEV-4786 Removing mapping does not remove outcome

Also limit outcome editing to sysadmin only.

Options
    • -1
    • +3
    ./lams/ApplicationResources.properties
  2. … 3 more files in changeset.
Wednesday 13 Mar 2019
9:20 pm

Marcin Cieslak

LDEV-4788 All learning outcomes are now global

Options
    • -6
    • +0
    ./lams/ApplicationResources.properties
    • -6
    • +6
    ./lams/ApplicationResources_el_GR.properties
    • -6
    • +6
    ./lams/ApplicationResources_en_AU.properties
    • -6
    • +6
    ./lams/ApplicationResources_es_ES.properties
  5. … 18 more files in changeset.
7:38 pm

Marcin Cieslak

LDEV-4787 Fix incorrect spacing when copying activities in authoring

Options
    • -1
    • +1
    ./lams/ApplicationResources.properties
    • -1
    • +1
    ./lams/ApplicationResources_el_GR.properties
    • -1
    • +1
    ./lams/ApplicationResources_en_AU.properties
    • -1
    • +1
    ./lams/ApplicationResources_es_ES.properties
    • -1
    • +1
    ./lams/ApplicationResources_no_NO.properties
  6. … 1 more file in changeset.
6:13 am

Andrey Balan

LDEV-4777 Further development of QB search feature

* Search QB interface is now available in Q&A tool, but questions of

this type (Essay) can only be added via DB for now

Options
    • -0
    • +9
    ./lams/ApplicationResources_en_AU.properties
  2. … 14 more files in changeset.
Thursday 14 Feb 2019
4:09 pm

Marcin Cieslak

LDEV-4771 Remove close activity authoring confirmation screen

The JSP that controls the close action stays as it works differently in

various environments (authoring, monitoring, IE). It is just run

immediately instead of waiting for button click.

Options
    • -1
    • +0
    ./lams/ApplicationResources.properties
    • -1
    • +0
    ./lams/ApplicationResources_ar_JO.properties
    • -1
    • +0
    ./lams/ApplicationResources_cs_CZ.properties
    • -1
    • +0
    ./lams/ApplicationResources_cy_GB.properties
    • -1
    • +0
    ./lams/ApplicationResources_da_DK.properties
    • -1
    • +0
    ./lams/ApplicationResources_de_DE.properties
    • -1
    • +0
    ./lams/ApplicationResources_el_GR.properties
    • -1
    • +0
    ./lams/ApplicationResources_en_AU.properties
    • -1
    • +0
    ./lams/ApplicationResources_es_ES.properties
    • -1
    • +0
    ./lams/ApplicationResources_es_MX.properties
    • -1
    • +0
    ./lams/ApplicationResources_fr_FR.properties
    • -1
    • +0
    ./lams/ApplicationResources_id_ID.properties
    • -1
    • +0
    ./lams/ApplicationResources_it_IT.properties
    • -1
    • +0
    ./lams/ApplicationResources_ja_JP.properties
    • -1
    • +0
    ./lams/ApplicationResources_ko_KR.properties
  16. … 11 more files in changeset.
11:53 am

Marcin Cieslak

LDEV-4771 Remove close activity authoring confirmation screen

The JSP that controls the close action stays as it works differently in

various environments (authoring, monitoring, IE). It is just run

immediately instead of waiting for button click.

Options
    • -1
    • +0
    ./lams/ApplicationResources.properties
    • -1
    • +0
    ./lams/ApplicationResources_ar_JO.properties
    • -1
    • +0
    ./lams/ApplicationResources_cs_CZ.properties
    • -1
    • +0
    ./lams/ApplicationResources_cy_GB.properties
    • -1
    • +0
    ./lams/ApplicationResources_da_DK.properties
    • -1
    • +0
    ./lams/ApplicationResources_de_DE.properties
    • -1
    • +0
    ./lams/ApplicationResources_el_GR.properties
    • -1
    • +0
    ./lams/ApplicationResources_en_AU.properties
    • -1
    • +0
    ./lams/ApplicationResources_es_ES.properties
    • -1
    • +0
    ./lams/ApplicationResources_es_MX.properties
    • -1
    • +0
    ./lams/ApplicationResources_fr_FR.properties
    • -1
    • +0
    ./lams/ApplicationResources_id_ID.properties
    • -1
    • +0
    ./lams/ApplicationResources_it_IT.properties
    • -1
    • +0
    ./lams/ApplicationResources_ja_JP.properties
    • -1
    • +0
    ./lams/ApplicationResources_ko_KR.properties
  16. … 11 more files in changeset.
Sunday 10 Feb 2019
3:23 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4769 Updating Greek

Options
    • -2
    • +91
    ./lams/ApplicationResources_el_GR.properties