lams-github / lams_tool_assessment / conf

language

Clone Tools

Stats

Commits this week: 0
Total Committers: 14
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
Friday 06 Dec 2019
2:32 pm

Marcin Cieslak

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

Conflicts:

lams_admin/conf/language/lams/ApplicationResources.properties

lams_tool_assessment/conf/language/lams/ApplicationResources.properties

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_lamc/conf/language/lams/ApplicationResources.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_laqa/web/learning/CombinedAnswersContent.jsp

lams_tool_laqa/web/learning/Notebook.jsp

lams_tool_laqa/web/learning/SequentialAnswersContent.jsp

lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties

Options
    • -1
    • +10
    ./lams/ApplicationResources.properties
    • -16
    • +74
    ./lams/ApplicationResources_en_AU.properties
  3. … 10 more files in changeset.
1:54 pm

Marcin Cieslak

LDEV-4786 Add missing labels

Options
    • -0
    • +1
    ./lams/ApplicationResources.properties
  2. … 2 more files in changeset.
Thursday 05 Dec 2019
10:53 pm

Marcin Cieslak

LDEV-4921 Introduce MCQ admin page. Allow hiding question titles.

Add numbering in authoring and excel export.

Options
    • -0
    • +6
    ./lams/ApplicationResources.properties
  2. … 13 more files in changeset.
Monday 02 Dec 2019
9:06 pm

Ernie Ghiglione

LDEV-4769 updating labels

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

Options
    • -2
    • +10
    ./lams/ApplicationResources.properties
    • -2
    • +10
    ./lams/ApplicationResources_en_AU.properties
    • -2
    • +11
    ./lams/ApplicationResources_es_ES.properties
  4. … 120 more files in changeset.
Saturday 23 Nov 2019
8:01 am

Ernie Ghiglione

LDEV-4769 Updating labels

Norgewian and Greek

Options
    • -4
    • +15
    ./lams/ApplicationResources_no_NO.properties
  2. … 2 more files in changeset.
1:51 am

Andrey Balan

LDEV-4880 Add confidence level variations

Options
    • -1
    • +8
    ./lams/ApplicationResources_en_AU.properties
  2. … 19 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
    • -2
    • +3
    ./lams/ApplicationResources.properties
    • -0
    • +2
    ./lams/ApplicationResources_en_AU.properties
  3. … 26 more files in changeset.
Saturday 26 Oct 2019
8:59 am

Ernie Ghiglione

LDEV-4769 Updating translations

Options
    • -3
    • +3
    ./lams/ApplicationResources.properties
    • -4
    • +13
    ./lams/ApplicationResources_el_GR.properties
    • -2
    • +3
    ./lams/ApplicationResources_en_AU.properties
    • -4
    • +3
    ./lams/ApplicationResources_es_ES.properties
3:19 am

Andrey Balan

LDEV-4859 Include time with dates

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

Andrey Balan

LDEV-4875 Add VSA question type to Assessment and Scratchie

Options
    • -1
    • +8
    ./lams/ApplicationResources_en_AU.properties
  2. … 75 more files in changeset.
Thursday 18 Jul 2019
6:51 pm

Andrey Balan

LDEV-4836 Cope with random questions

* Properly set content_folder_id for old and new QB questions

* Prepare for recalculate marks after edit in monitor

Options
    • -1
    • +0
    ./lams/ApplicationResources_en_AU.properties
  2. … 14 more files in changeset.
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
    • -1
    • +11
    ./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
    • -64
    • +2
    ./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
    • -358
    • +359
    ./lams/ApplicationResources.properties
  2. … 50 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
    • -0
    • +6
    ./lams/ApplicationResources.properties
    • -12
    • +16
    ./lams/ApplicationResources_en_AU.properties
  3. … 53 more files in changeset.
Thursday 30 May 2019
8:06 am

Andrey Balan

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

Options
    • -2
    • +0
    ./lams/ApplicationResources_en_AU.properties
  2. … 12 more files in changeset.
Wednesday 29 May 2019
9:02 pm

Marcin Cieslak

LDEV-4825 Display QB stats in Assessment tool monitoring

Options
    • -348
    • +352
    ./lams/ApplicationResources.properties
  2. … 2 more files in changeset.
Monday 13 May 2019
8:35 pm

Andrey Balan

LDEV-4777 Show question details for all question types

Options
    • -0
    • +1
    ./lams/ApplicationResources_en_AU.properties
  2. … 4 more files in changeset.
Wednesday 08 May 2019
5:11 am

Andrey Balan

LDEV-4746 Migrate Assessment to QB

Options
    • -0
    • +3
    ./lams/ApplicationResources_en_AU.properties
  2. … 80 more files in changeset.
Wednesday 24 Apr 2019
6:24 am

Andrey Balan

LDEV-4805 Finally switch to using free-jqGrid

Options
    • -3
    • +1
    ./lams/ApplicationResources_en_AU.properties
  2. … 27 more files in changeset.
Thursday 18 Apr 2019
4:45 am

Andrey Balan

LDEV-4765 UI improvements

* Use switches instead of checkboxes

* Properly use toggle in Mark hedging question type

Options
    • -8
    • +8
    ./lams/ApplicationResources_en_AU.properties
  2. … 13 more files in changeset.
Friday 05 Apr 2019
5:13 pm

Ernie Ghiglione

LDEV-4769 Updating labels

English and Español

Options
    • -3
    • +3
    ./lams/ApplicationResources.properties
    • -3
    • +3
    ./lams/ApplicationResources_en_AU.properties
    • -3
    • +4
    ./lams/ApplicationResources_es_ES.properties
5:09 pm

Ernie Ghiglione

LDEV-4769 Updating labels

English and Español

Options
    • -3
    • +9
    ./lams/ApplicationResources.properties
    • -3
    • +9
    ./lams/ApplicationResources_en_AU.properties
    • -4
    • +10
    ./lams/ApplicationResources_es_ES.properties
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.
Monday 25 Mar 2019
8:07 am

Ernie Ghiglione

LDEV-4739 Updating translations

Options
    • -3
    • +3
    ./lams/ApplicationResources.properties
    • -2
    • +7
    ./lams/ApplicationResources_el_GR.properties
    • -2
    • +3
    ./lams/ApplicationResources_en_AU.properties
    • -2
    • +3
    ./lams/ApplicationResources_es_ES.properties
  5. … 8 more files in changeset.
Tuesday 12 Mar 2019
10:41 pm

Marcin Cieslak

LDEV-4786 Allow creating learning outcomes on the fly

Options
    • -0
    • +1
    ./lams/ApplicationResources.properties
  2. … 63 more files in changeset.
Tuesday 12 Feb 2019
10:17 am

Ernie Ghiglione

LDEV-4587 LDEV-4607 Adding missing labels

Options
    • -4
    • +7
    ./lams/ApplicationResources.properties
    • -3
    • +7
    ./lams/ApplicationResources_en_AU.properties
    • -3
    • +7
    ./lams/ApplicationResources_es_ES.properties
Sunday 10 Feb 2019
3:31 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4769 Updating Greek

Options
    • -2
    • +6
    ./lams/ApplicationResources_el_GR.properties
Thursday 07 Feb 2019
4:52 am

Andrey Balan

LDEV-4765 Apply new UI to other question types

Options
    • -7
    • +11
    ./lams/ApplicationResources_en_AU.properties
  2. … 23 more files in changeset.
Saturday 26 Jan 2019
2:35 pm

Marcin Cieslak

Merge ordered branching LDEV-4587 into develop

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