lams-github / lams_tool_laqa

web

Clone Tools

Stats

Commits this week: 0
Total Committers: 25
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
    ./learning/CombinedAnswersContent.jsp
    • -1
    • +1
    ./learning/LearnerRep.jsp
    • -6
    • +5
    ./learning/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
    ./learning/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
    ./learning/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
    ./learning/LearnerRep.jsp
    • -16
    • +8
    ./monitoring/MonitoringMaincontent.jsp
  3. … 9 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
    ./learning/LearnerRep.jsp
    • -16
    • +8
    ./monitoring/MonitoringMaincontent.jsp
  3. … 6 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
    ./learning/LearnerRep.jsp
    • -479
    • +0
    ./learning/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
    ./learning/CombinedAnswersContent.jsp
    • -4
    • +4
    ./learning/IndividualLearnerResults.jsp
    • -2
    • +2
    ./learning/LearnerRep.jsp
    • -2
    • +2
    ./learning/RevisitedLearnerRep.jsp
    • -10
    • +9
    ./learning/SequentialAnswersContent.jsp
    • -4
    • +4
    ./monitoring/SummaryContent.jsp
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
    ./learning/CombinedAnswersContent.jsp
    • -4
    • +7
    ./learning/IndividualLearnerResults.jsp
    • -8
    • +11
    ./learning/LearnerRep.jsp
    • -5
    • +3
    ./learning/RevisitedLearnerRep.jsp
    • -10
    • +10
    ./learning/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
    ./learning/AnswersContent.jsp
    • -8
    • +0
    ./learning/CombinedAnswersContent.jsp
    • -28
    • +23
    ./learning/Notebook.jsp
    • -11
    • +0
    ./learning/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
    ./learning/AnswersContent.jsp
    • -17
    • +8
    ./learning/CombinedAnswersContent.jsp
    • -29
    • +23
    ./learning/Notebook.jsp
    • -19
    • +3
    ./learning/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
    ./learning/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
    ./learning/AnswersContent.jsp
  2. … 2 more files in changeset.
9:28 pm

Marcin Cieslak

LDEV-4900 Distribute modified Page tag to all tools

Options
    • -1
    • +11
    ./WEB-INF/tags/Page.tag
  2. … 30 more files in changeset.
Tuesday 15 Oct 2019
6:14 pm

Marcin Cieslak

LDEV-4841 Set QB question content folder ID for new Q&A questions

Options
    • -1
    • +1
    ./authoring/BasicContent.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
    • -39
    • +54
    ./authoring/newQuestionBox.jsp
    • -6
    • +6
    ./learning/CombinedAnswersContent.jsp
    • -6
    • +6
    ./learning/LearnerRep.jsp
    • -6
    • +6
    ./learning/RevisitedLearnerRep.jsp
    • -14
    • +15
    ./learning/SequentialAnswersContent.jsp
  6. … 3 more files in changeset.
1:25 am

Andrey Balan

LDEV-4865 Show question description in monitor

Options
    • -1
    • +3
    ./monitoring/PrintAnswers.jsp
    • -1
    • +3
    ./monitoring/SummaryContent.jsp
1:18 am

Andrey Balan

LDEV-4864 Show question body in Q&A learner

Options
    • -44
    • +38
    ./learning/AnswersContent.jsp
    • -13
    • +10
    ./learning/CombinedAnswersContent.jsp
    • -62
    • +53
    ./learning/IndividualLearnerResults.jsp
    • -5
    • +5
    ./learning/LearnerRep.jsp
    • -5
    • +5
    ./learning/RevisitedLearnerRep.jsp
    • -2
    • +3
    ./learning/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
    • -29
    • +24
    ./authoring/AdvancedContent.jsp
    • -51
    • +51
    ./authoring/AuthoringTabsHolder.jsp
    • -51
    • +49
    ./authoring/BasicContent.jsp
    • -2
    • +2
    ./authoring/conditions.jsp
    • -11
    • +44
    ./authoring/itemlist.jsp
    • -44
    • +181
    ./authoring/newQuestionBox.jsp
    • -2
    • +2
    ./learning/AnswersContent.jsp
    • -2
    • +2
    ./learning/IndividualLearnerResults.jsp
    • -4
    • +4
    ./learning/LearnerRep.jsp
    • -1
    • +1
    ./learning/Notebook.jsp
    • -4
    • +4
    ./learning/RevisitedLearnerRep.jsp
    • -2
    • +2
    ./learning/submissionDeadline.jsp
    • -2
    • +2
    ./monitoring/MonitoringMaincontent.jsp
    • -4
    • +4
    ./monitoring/SummaryContent.jsp
  15. … 31 more files in changeset.
Thursday 25 Jul 2019
5:46 am

Andrey Balan

LDEV-4840 Refine import QB questions feature

Options
    • -11
    • +55
    ./authoring/BasicContent.jsp
    • -15
    • +2
    ./authoring/itemlist.jsp
    • -2
    • +5
    ./authoring/newQuestionBox.jsp
  4. … 2 more files in changeset.
Monday 22 Jul 2019
10:47 pm

Marcin Cieslak

LDEV-4834 Use panel-less LO widget in QB question authoring

Options
    • -1
    • +14
    ./WEB-INF/tags/CKEditor.tag
    • -10
    • +33
    ./WEB-INF/tags/OutcomeAuthor.tag
  3. … 69 more files in changeset.
Thursday 04 Jul 2019
11:48 pm

Marcin Cieslak

LDEV-4834 Initial implementation of Learning Outcomes in Question Bank

Options
    • -10
    • +19
    ./WEB-INF/tags/OutcomeAuthor.tag
  2. … 50 more files in changeset.
Friday 14 Jun 2019
1:11 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

Merge branch 'develop' into LDEV-4759

# Conflicts:

# lams_central/web/authoring/template/tool/mcquestion.jsp

# lams_central/web/authoringConfirm.jsp

# lams_central/web/css/_learner_base.scss

# lams_central/web/profile/editprofile.jsp

# lams_learning/web/optionsActivity.jsp

# lams_monitoring/web/monitor.jsp

# lams_monitoring/web/tblmonitor/sequence.jsp

# lams_monitoring/web/tblmonitor/teams.jsp

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

# lams_tool_lamc/web/authoring/candidateAnswersList.jsp

# lams_tool_lamc/web/common/monitoringheader.jsp

# lams_tool_preview/web/pages/monitoring/criteria.jsp

# lams_tool_preview/web/pages/monitoring/reflections.jsp

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

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

# lams_tool_task/web/common/monitorheader.jsp

Options
    • -5
    • +31
    ./WEB-INF/tags/OutcomeAuthor.tag
  2. … 94 more files in changeset.
Wednesday 15 May 2019
7:10 pm

Marcin Cieslak

LDEV-4819 Allow disabling Learning Outcome quick add in sysadmin

Options
    • -3
    • +10
    ./WEB-INF/tags/OutcomeAuthor.tag
  2. … 35 more files in changeset.
Wednesday 27 Mar 2019
7:18 pm

Marcin Cieslak

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

Options
    • -4
    • +7
    ./WEB-INF/tags/OutcomeAuthor.tag
  2. … 87 more files in changeset.
Wednesday 13 Mar 2019
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
    • -8
    • +10
    ./authoring/AuthoringTabsHolder.jsp
    • -2
    • +3
    ./authoring/BasicContent.jsp
    • -5
    • +24
    ./authoring/itemlist.jsp
  4. … 12 more files in changeset.
Tuesday 12 Mar 2019
10:41 pm

Marcin Cieslak

LDEV-4786 Allow creating learning outcomes on the fly

Options
    • -2
    • +18
    ./WEB-INF/tags/OutcomeAuthor.tag
  2. … 63 more files in changeset.
Thursday 28 Feb 2019
3:13 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Restyle File Upload widget, cleaned up comments in CSS files

Options
    • -3
    • +2
    ./WEB-INF/tags/FileUpload.tag
  2. … 34 more files in changeset.
10:25 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Autocomplete restyling, started Assessment updates

Options
    • -1
    • +0
    ./WEB-INF/tags/OutcomeAuthor.tag
  2. … 43 more files in changeset.
Tuesday 26 Feb 2019
5:18 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Fixing responsive behaviour on front page and tabs.

Options
    • -5
    • +7
    ./WEB-INF/tags/Tabs.tag
  2. … 43 more files in changeset.
Monday 25 Feb 2019
3:22 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Tablesorter, Learner Progress Bar tweaked

Options
    • -1
    • +1
    ./WEB-INF/tags/Alert.tag
    • -2
    • +1
    ./WEB-INF/tags/Page.tag
    • -1
    • +1
    ./WEB-INF/tags/TSTable.tag
  4. … 120 more files in changeset.