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 01 May 2020
12:47 pm

Ernie Ghiglione

LDEV-5002 changes in labels

Conflicts:

lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

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

Ernie Ghiglione

LDEV-5002 Cosmetic and label changes

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

Ernie Ghiglione

LDEV-5002 Cosmetic and label changes

Options
    • -1
    • +1
    ./lams/ApplicationResources.properties
  2. … 1 more file in changeset.
Monday 27 Apr 2020
5:05 pm

Marcin Cieslak

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

Conflicts:

lams_tool_assessment/web/pages/tblmonitoring/iraAssessmentStudentChoices.jsp

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

Marcin Cieslak

LDEV-5009 Add student's choices table to Assessment regular monitor

Options
    • -0
    • +1
    ./lams/ApplicationResources.properties
  2. … 4 more files in changeset.
Monday 20 Apr 2020
3:28 pm

Marcin Cieslak

LDEV-5002 Add Etherpads after each question in Assessment

Options
    • -1
    • +2
    ./lams/ApplicationResources.properties
  2. … 6 more files in changeset.
3:28 pm

Marcin Cieslak

LDEV-5002 Add Etherpads after each question in Assessment

Conflicts:

lams_tool_assessment/conf/language/lams/ApplicationResources.properties

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

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

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

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

lams_tool_assessment/web/pages/learning/learning.jsp

Options
    • -1
    • +2
    ./lams/ApplicationResources.properties
  2. … 6 more files in changeset.
Monday 23 Mar 2020
2:47 am

Ernie Ghiglione

LDEV-4961 Adding missing label

Options
    • -3
    • +5
    ./lams/ApplicationResources.properties
    • -2
    • +4
    ./lams/ApplicationResources_en_AU.properties
2:45 am

Ernie Ghiglione

LDEV-4769 Updating Greek and Norwegian

Options
    • -2
    • +8
    ./lams/ApplicationResources_el_GR.properties
    • -2
    • +30
    ./lams/ApplicationResources_no_NO.properties
2:44 am

Ernie Ghiglione

LDEV-4739 updating Greek and Norwegian

Options
    • -2
    • +8
    ./lams/ApplicationResources_el_GR.properties
    • -2
    • +30
    ./lams/ApplicationResources_no_NO.properties
Friday 20 Mar 2020
7:03 am

Marcin Cieslak

LDEV-4961 Export Assessment confidence levels

Options
    • -1
    • +1
    ./lams/ApplicationResources.properties
  2. … 1 more file in changeset.
Tuesday 28 Jan 2020
11:07 pm

Andrey Balan

LDEV-4951 Migrate MCQ tool to Assessment

Options
    • -0
    • +12
    ./lams/ApplicationResources_en_AU.properties
  2. … 10 more files in changeset.
Thursday 16 Jan 2020
10:36 pm

Andrey Balan

LDEV-4944 Take care about VSAs edited by several teachers simultaneously

Options
    • -1
    • +1
    ./lams/ApplicationResources_en_AU.properties
  2. … 4 more files in changeset.
Monday 23 Dec 2019
1:59 pm

Ernie Ghiglione

LDEV-4745 LDEV-4875 Adding/updating labels

Adding and updating labels for QB and VSAs for LAMS v4.0

Options
    • -2
    • +7
    ./lams/ApplicationResources.properties
    • -2
    • +7
    ./lams/ApplicationResources_en_AU.properties
  3. … 4 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
    • +16
    ./lams/ApplicationResources.properties
  2. … 17 more files in changeset.
Monday 09 Dec 2019
2:18 pm

Ernie Ghiglione

LDEV-4745 adding new labels

Options
    • -15
    • +13
    ./lams/ApplicationResources.properties
    • -2
    • +25
    ./lams/ApplicationResources_el_GR.properties
    • -12
    • +13
    ./lams/ApplicationResources_en_AU.properties
12:57 pm

Ernie Ghiglione

LDEV-4769 updating labels

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

Options
    • -2
    • +16
    ./lams/ApplicationResources.properties
    • -2
    • +25
    ./lams/ApplicationResources_el_GR.properties
    • -2
    • +16
    ./lams/ApplicationResources_en_AU.properties
  4. … 63 more files in changeset.
Saturday 07 Dec 2019
12:09 pm

Ernie Ghiglione

LDEV-4745 adding missing labels to tools

Scratchie, QA, MC and assessment

Options
    • -0
    • +3
    ./lams/ApplicationResources.properties
  2. … 3 more files in changeset.
Friday 06 Dec 2019
7:32 am

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.
6:54 am

Marcin Cieslak

LDEV-4786 Add missing labels

Options
    • -0
    • +1
    ./lams/ApplicationResources.properties
  2. … 2 more files in changeset.
Thursday 05 Dec 2019
3: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
2: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
1: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.
Friday 22 Nov 2019
6:51 pm

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
4: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
2: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
Friday 25 Oct 2019
9:19 pm

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
12: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
12: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
10:00 am

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.