lams-github / lams_tool_lamc / web

authoring

Clone Tools

Stats

Commits this week: 0
Total Committers: 18
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
Tuesday 22 Sep 2020
1:48 pm

Marcin Cieslak

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

Conflicts:

lams_tool_assessment/web/pages/authoring/parts/optionlist.jsp

lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp

lams_tool_assessment/web/pages/authoring/parts/questionlistRestricted.jsp

lams_tool_laqa/web/authoring/itemlist.jsp

lams_tool_scratchie/web/pages/authoring/parts/answerlist.jsp

Options
    • -2
    • +2
    ./candidateAnswersList.jsp
  2. … 3 more files in changeset.
1:40 pm

Marcin Cieslak

LDEV-5078 Fix i18n labels in Arrow tag

Options
    • -2
    • +2
    ./candidateAnswersList.jsp
  2. … 52 more files in changeset.
Monday 17 Aug 2020
10:34 pm

Marcin Cieslak

LDEV-4917 Add Uppy file uploads to QTI question import

Options
    • -1
    • +1
    ./BasicContent.jsp
  2. … 6 more files in changeset.
Friday 05 Jun 2020
7:29 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4886 Automated tests for v4.0

Options
    • -1
    • +1
    ./editQuestionBox.jsp
    • -1
    • +1
    ./itemlist.jsp
  3. … 18 more files in changeset.
Thursday 30 Apr 2020
2:43 pm

Marcin Cieslak

LDEV-5014 Add spinner while QB panel loads in authoring

Options
    • -0
    • +1
    ./BasicContent.jsp
  2. … 3 more files in changeset.
Tuesday 18 Feb 2020
10:21 pm

Andrey Balan

LDEV-4951 Remove traces of MCQ tool from other modules

Options
    • -124
    • +0
    ./AdvancedContent.jsp
    • -108
    • +0
    ./AuthoringTabsHolder.jsp
    • -131
    • +0
    ./BasicContent.jsp
    • -84
    • +0
    ./candidateAnswersList.jsp
    • -219
    • +0
    ./editQuestionBox.jsp
    • -128
    • +0
    ./itemlist.jsp
    • -148
    • +0
    ./pedagogicalPlannerForm.jsp
  8. … 186 more files in changeset.
Tuesday 21 Jan 2020
4:23 am

Andrey Balan

LDEV-4948 Prevent adding enctype="multipart/form-data" to forms

Options
    • -1
    • +0
    ./AuthoringTabsHolder.jsp
    • -1
    • +0
    ./BasicContent.jsp
  3. … 3 more files in changeset.
Friday 10 Jan 2020
9:08 pm

Andrey Balan

LKC-231 Calculate percentages properly in Excel export

(cherry picked from commit 1dc5f5ec294283f43ce1deaa33066bdf1190ff1d)

Options
    • -1
    • +1
    ./AuthoringTabsHolder.jsp
  2. … 2 more files in changeset.
9:08 pm

Andrey Balan

LKC-231 Calculate percentages properly in Excel export

Options
    • -1
    • +1
    ./AuthoringTabsHolder.jsp
  2. … 2 more files in changeset.
6:10 am

Andrey Balan

LDEV-4932 Add CSRF to QB bank calls

Options
    • -2
    • +2
    ./BasicContent.jsp
  2. … 32 more files in changeset.
Thursday 09 Jan 2020
3:59 pm

Andrey Balan

Merge branch 'master' into v4.0

# Conflicts:

# lams_admin/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_build/build.xml

# lams_build/liblist.txt

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

# lams_central/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_central/web/authoringConfirm.jsp

# lams_central/web/common/taglibs.jsp

# lams_central/web/includes/javascript/authoring/authoringGeneral.js

# lams_central/web/includes/javascript/outcome.js

# lams_central/web/outcome/outcomeEdit.jsp

# lams_central/web/outcome/outcomeManage.jsp

# lams_common/src/java/org/lamsfoundation/lams/util/WebUtil.java

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookController.java

# lams_gradebook/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_learning/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_monitoring/web/WEB-INF/tags/OutcomeAuthor.tag

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

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

# lams_tool_assessment/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_chat/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_daco/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_doku/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_forum/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_gmap/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_images/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_imscc/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McController.java

# lams_tool_lamc/web/WEB-INF/tags/OutcomeAuthor.tag

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

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

# lams_tool_laqa/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp

# lams_tool_laqa/web/authoring/newQuestionBox.jsp

# lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp

# lams_tool_larsrc/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_leader/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_mindmap/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbMonitoringController.java

# lams_tool_nb/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_notebook/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_pixlr/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_preview/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_sbmt/web/WEB-INF/tags/OutcomeAuthor.tag

# 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/MonitoringController.java

# lams_tool_scratchie/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_scratchie/web/pages/authoring/basic.jsp

# lams_tool_scribe/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_spreadsheet/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_survey/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_task/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_vote/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_wiki/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_zoom/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_www/web/WEB-INF/tags/OutcomeAuthor.tag

Options
    • -2
    • +2
    ./AuthoringTabsHolder.jsp
  2. … 94 more files in changeset.
Wednesday 01 Jan 2020
7:43 am

Ernie Ghiglione

LDEV-4932 Passing CSRF token as a post rather than get

Options
    • -3
    • +3
    ./AuthoringTabsHolder.jsp
  2. … 41 more files in changeset.
Tuesday 31 Dec 2019
5:14 am

Andrey Balan

LDEV-4932 Secure save tool authoring with CSRF Guard

Options
    • -2
    • +2
    ./AuthoringTabsHolder.jsp
  2. … 42 more files in changeset.
Thursday 05 Dec 2019
9:41 pm

Marcin Cieslak

LDEV-4921 Add question numbering in Authoring for MCQ

Options
    • -0
    • +6
    ./itemlist.jsp
7:18 am

Marcin Cieslak

LDEV-4920 Import QTI questions to Scratchie after adding them to QB

Options
    • -0
    • +1
    ./BasicContent.jsp
  2. … 4 more files in changeset.
Wednesday 04 Dec 2019
9:44 pm

Marcin Cieslak

LDEV-4920 Import QTI questions to MCQ after adding them to QB

Options
    • -0
    • +35
    ./BasicContent.jsp
    • -3
    • +0
    ./itemlist.jsp
  3. … 7 more files in changeset.
Monday 02 Dec 2019
2:09 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4911 Adding ides to test monitor starting new lesson

Options
    • -1
    • +1
    ./editQuestionBox.jsp
    • -2
    • +2
    ./itemlist.jsp
  3. … 3 more files in changeset.
Friday 22 Nov 2019
4:12 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4911 Create structure for monitoring learning

Options
    • -2
    • +2
    ./itemlist.jsp
  2. … 4 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
    • -0
    • +10
    ./itemlist.jsp
  2. … 27 more files in changeset.
Wednesday 06 Nov 2019
9:04 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4887 Adding id, classes to make automated testing faster

Options
    • -2
    • +2
    ./itemlist.jsp
  2. … 8 more files in changeset.
Tuesday 15 Oct 2019
6:13 pm

Marcin Cieslak

LDEV-4836 Set QB question content folder ID for new MCQ questions

Also add a default content folder ID to template activities during

migration.

Options
    • -1
    • +1
    ./candidateAnswersList.jsp
    • -2
    • +3
    ./editQuestionBox.jsp
  3. … 5 more files in changeset.
Wednesday 24 Jul 2019
5:10 pm

Andrey Balan

LDEV-4836 Hide ${questionDto.version} from jsp processing

As questionDto doesn't have version property yet

Options
    • -2
    • +2
    ./itemlist.jsp
Thursday 18 Jul 2019
10:04 pm

Andrey Balan

LDEV-4839 Refine import QB questions feature

Options
    • -4
    • +44
    ./BasicContent.jsp
    • -17
    • +8
    ./itemlist.jsp
  3. … 8 more files in changeset.
Thursday 04 Jul 2019
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
    • -7
    • +10
    ./BasicContent.jsp
    • -41
    • +42
    ./candidateAnswersList.jsp
    • -3
    • +1
    ./editQuestionBox.jsp
    • -14
    • +20
    ./itemlist.jsp
  5. … 51 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
    • -3
    • +1
    ./editQuestionBox.jsp
    • -6
    • +11
    ./itemlist.jsp
  3. … 93 more files in changeset.
Thursday 30 May 2019
8:06 am

Andrey Balan

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

Options
    • -29
    • +0
    ./BasicContent.jsp
    • -9
    • +0
    ./itemlist.jsp
  3. … 11 more files in changeset.
Wednesday 15 May 2019
5:23 am

Andrey Balan

LDEV-4818 Add title property to MCQ questions

Options
    • -0
    • +5
    ./BasicContent.jsp
    • -4
    • +15
    ./editQuestionBox.jsp
    • -14
    • +12
    ./itemlist.jsp
    • -13
    • +17
    ./pedagogicalPlannerForm.jsp
  5. … 32 more files in changeset.
Wednesday 27 Feb 2019
3:56 am

Andrey Balan

LDEV-4777 Search QB interface is now available in MCQ tool

* Further development of QB search feature

Options
    • -1
    • +1
    ./AuthoringTabsHolder.jsp
    • -3
    • +3
    ./BasicContent.jsp
    • -1
    • +1
    ./editQuestionBox.jsp
    • -1
    • +15
    ./itemlist.jsp
  5. … 5 more files in changeset.
Friday 15 Feb 2019
6:27 am

Andrey Balan

LDEV-4775 update marks more skillfully after edit in monitor

Options
    • -10
    • +19
    ./BasicContent.jsp
    • -39
    • +40
    ./candidateAnswersList.jsp
    • -3
    • +1
    ./editQuestionBox.jsp
    • -6
    • +11
    ./itemlist.jsp
  5. … 10 more files in changeset.
6:27 am

Andrey Balan

LDEV-4775 update marks more skillfully after edit in monitor

(cherry picked from commit c5920711a0c7a8b4da40893f4d30d2dc26a0fba1)

Options
    • -10
    • +19
    ./BasicContent.jsp
    • -39
    • +40
    ./candidateAnswersList.jsp
    • -3
    • +1
    ./editQuestionBox.jsp
    • -6
    • +11
    ./itemlist.jsp
  5. … 10 more files in changeset.