lams-github / lams_tool_laqa / web

learning

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
Friday 20 Dec 2019
3:42 am

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
    • -6
    • +7
    ./CombinedAnswersContent.jsp
    • -1
    • +1
    ./LearnerRep.jsp
    • -6
    • +5
    ./SequentialAnswersContent.jsp
  4. … 14 more files in changeset.
Thursday 12 Dec 2019
12:26 am

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
    ./LearnerRep.jsp
  2. … 17 more files in changeset.
Wednesday 11 Dec 2019
5:59 am

Andrey Balan

LDEV-4927 Add "min-height" property to rating widget

Options
    • -1
    • +5
    ./LearnerRep.jsp
5:56 am

Andrey Balan

Merge branch 'develop' into LDEV-4745

# Conflicts:

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

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

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

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dto/GeneralLearnerFlowDTO.java

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/model/QaQueContent.java

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/util/QaUtils.java

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

# lams_tool_laqa/web/learning/LearnerRep.jsp

# lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp

Options
    • -140
    • +178
    ./LearnerRep.jsp
  2. … 10 more files in changeset.
5:05 am

Andrey Balan

LDEV-4927 Show other users' answers right after user answers

* Some minor tweaks in monitor pages

Options
    • -99
    • +113
    ./LearnerRep.jsp
  2. … 7 more files in changeset.
Tuesday 10 Dec 2019
5:24 am

Andrey Balan

LDEV-4927 Stop using "RevisitedLearnerRep.jsp" page

* Remove redundant form fields

Options
    • -52
    • +73
    ./LearnerRep.jsp
    • -479
    • +0
    ./RevisitedLearnerRep.jsp
  3. … 5 more files in changeset.
Monday 09 Dec 2019
2:32 am

Ernie Ghiglione

LDEV-4927 Improvements to Q&A UI

1) Only show question numbering if there's more than one question.

2) Improve warnings about answer requirements and word count required

3) Make use of placeholder for "Your answer" instead.

Options
    • -10
    • +8
    ./CombinedAnswersContent.jsp
    • -4
    • +4
    ./IndividualLearnerResults.jsp
    • -2
    • +2
    ./LearnerRep.jsp
    • -2
    • +2
    ./RevisitedLearnerRep.jsp
    • -10
    • +9
    ./SequentialAnswersContent.jsp
  6. … 1 more file in changeset.
Sunday 08 Dec 2019
9:46 pm

Ernie Ghiglione

LDEV-4927 Improvements to Q&A UI

1) Only show question numbering if there's more than one question.

2) Improve warnings about answer requirements and word count required

3) Make use of placeholder for "Your answer" instead.

Options
    • -13
    • +15
    ./CombinedAnswersContent.jsp
    • -4
    • +7
    ./IndividualLearnerResults.jsp
    • -8
    • +11
    ./LearnerRep.jsp
    • -5
    • +3
    ./RevisitedLearnerRep.jsp
    • -10
    • +10
    ./SequentialAnswersContent.jsp
  6. … 2 more files in changeset.
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
    • +0
    ./AnswersContent.jsp
    • -8
    • +0
    ./CombinedAnswersContent.jsp
    • -28
    • +23
    ./Notebook.jsp
    • -11
    • +0
    ./SequentialAnswersContent.jsp
  5. … 8 more files in changeset.
Thursday 05 Dec 2019
11:41 pm

Andrey Balan

LDEV-4919 Don't focus on question answer

Options
    • -1
    • +0
    ./AnswersContent.jsp
    • -17
    • +8
    ./CombinedAnswersContent.jsp
    • -29
    • +23
    ./Notebook.jsp
    • -19
    • +3
    ./SequentialAnswersContent.jsp
Tuesday 19 Nov 2019
9: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
    • -20
    • +20
    ./AnswersContent.jsp
  2. … 21 more files in changeset.
Thursday 14 Nov 2019
10:02 pm

Marcin Cieslak

LDEV-4900 Make other tools react to autosave command

Options
    • -20
    • +20
    ./AnswersContent.jsp
  2. … 2 more files in changeset.
Friday 06 Sep 2019
2:13 am

Andrey Balan

LDEV-4863 Q&A authoring to look more like Assessment essay authoring

Options
    • -6
    • +6
    ./CombinedAnswersContent.jsp
    • -6
    • +6
    ./LearnerRep.jsp
    • -6
    • +6
    ./RevisitedLearnerRep.jsp
    • -14
    • +15
    ./SequentialAnswersContent.jsp
  5. … 4 more files in changeset.
1:18 am

Andrey Balan

LDEV-4864 Show question body in Q&A learner

Options
    • -44
    • +38
    ./AnswersContent.jsp
    • -13
    • +10
    ./CombinedAnswersContent.jsp
    • -62
    • +53
    ./IndividualLearnerResults.jsp
    • -5
    • +5
    ./LearnerRep.jsp
    • -5
    • +5
    ./RevisitedLearnerRep.jsp
    • -2
    • +3
    ./SequentialAnswersContent.jsp
  7. … 1 more file in changeset.
Thursday 05 Sep 2019
5:13 am

Andrey Balan

LDEV-4841 Migrate Q&A tool to QB

Options
    • -2
    • +2
    ./AnswersContent.jsp
    • -2
    • +2
    ./IndividualLearnerResults.jsp
    • -4
    • +4
    ./LearnerRep.jsp
    • -1
    • +1
    ./Notebook.jsp
    • -4
    • +4
    ./RevisitedLearnerRep.jsp
    • -2
    • +2
    ./submissionDeadline.jsp
  7. … 39 more files in changeset.
Wednesday 06 Feb 2019
11:04 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Panels are now cards.

Options
    • -1
    • +1
    ./AnswersContent.jsp
    • -5
    • +5
    ./CombinedAnswersContent.jsp
    • -8
    • +8
    ./IndividualLearnerResults.jsp
    • -4
    • +4
    ./LearnerRep.jsp
    • -9
    • +9
    ./RevisitedLearnerRep.jsp
    • -5
    • +5
    ./SequentialAnswersContent.jsp
  7. … 501 more files in changeset.
Friday 01 Feb 2019
10:38 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Authoring and monitoring tabs working

Options
    • -1
    • +1
    ./AnswersContent.jsp
    • -1
    • +1
    ./LearnerRep.jsp
  3. … 314 more files in changeset.
Friday 21 Dec 2018
4:47 am

Andrey Balan

LDEV-4678 WebUtil.putActivityPositionInRequestByToolSessionId transformed into service method

Also introduce ICommonToolService that will hold methods shared by all

tools.

Options
    • -1
    • +1
    ./IndividualLearnerResults.jsp
    • -1
    • +1
    ./LearnerRep.jsp
    • -1
    • +1
    ./Notebook.jsp
    • -1
    • +1
    ./RevisitedLearnerRep.jsp
    • -1
    • +1
    ./submissionDeadline.jsp
  6. … 138 more files in changeset.
Thursday 06 Dec 2018
9:44 am

Andrey Balan

LDEV-4720 Fix LAMS issues that prevented TestHarness to work correctly

Options
    • -4
    • +3
    ./AnswersContent.jsp
    • -1
    • +1
    ./SequentialAnswersContent.jsp
  3. … 1 more file in changeset.
Sunday 02 Dec 2018
1:22 am

Andrey Balan

LDEV-4720 Fix LAMS issues that prevented TestHarness to work correctly

Options
    • -8
    • +5
    ./LearnerRep.jsp
  2. … 5 more files in changeset.
Monday 19 Nov 2018
2:52 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4702 Leaders changed answers appear on refresh

Options
    • -3
    • +10
    ./LearnerRep.jsp
  2. … 2 more files in changeset.
Monday 01 Oct 2018
4:37 pm

Marcin Cieslak

LDEV-4440 Fix a link for redoing Q&A questions

Options
    • -2
    • +2
    ./RevisitedLearnerRep.jsp
Friday 28 Sep 2018
6:27 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4440 Error messages converted to new error tag

Options
    • -8
    • +1
    ./AnswersContent.jsp
  2. … 129 more files in changeset.
Friday 21 Sep 2018
6:31 am

Andrey Balan

LDEV-4440 Fix bug with tablesorter parameter

Options
    • -1
    • +1
    ./RevisitedLearnerRep.jsp
Monday 06 Aug 2018
5:06 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Scribe fixes

Options
    • -1
    • +1
    ./AnswersContent.jsp
    • -1
    • +1
    ./IndividualLearnerResults.jsp
    • -1
    • +1
    ./LearnerRep.jsp
    • -1
    • +1
    ./RevisitedLearnerRep.jsp
    • -1
    • +1
    ./submissionDeadline.jsp
  6. … 5 more files in changeset.
Thursday 02 Aug 2018
11:05 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Pixlr fixes

Options
    • -2
    • +2
    ./Notebook.jsp
  2. … 6 more files in changeset.
9:28 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Scribe tool

Options
    • -1
    • +0
    ./IndividualLearnerResults.jsp
  2. … 51 more files in changeset.
Wednesday 01 Aug 2018
7:22 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Q&A nostruts library

Options
    • -7
    • +7
    ./submissionDeadline.jsp
  2. … 19 more files in changeset.
6:37 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Pixlr fixes

Options
    • -1
    • +2
    ./SequentialAnswersContent.jsp
  2. … 37 more files in changeset.
3:56 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Q&A learning

Options
    • -4
    • +4
    ./AnswersContent.jsp
    • -2
    • +2
    ./IndividualLearnerResults.jsp
    • -1
    • +1
    ./Notebook.jsp
    • -2
    • +2
    ./RevisitedLearnerRep.jsp
  5. … 6 more files in changeset.