lams-github / lams_tool_scratchie / web / pages

authoring

Clone Tools

Stats

Commits this week: 0
Total Committers: 11
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
Wednesday 01 Apr 2020
6:08 am

Marcin Cieslak

LDEV-4998, LDEV-4941 Fix public question editing for Q&A and Scratchie

Options
    • -1
    • +2
    ./parts/addItemFooter.jsp
  2. … 3 more files in changeset.
Saturday 21 Mar 2020
2:47 am

Andrey Balan

LDEV-4995 Upgrade to bootstrap 4

* Update LAMS code to use bootstrap 4

* Update and redesign index page

Options
    • -2
    • +2
    ./parts/addItemFooter.jsp
    • -2
    • +2
    ./parts/addVsa.jsp
  3. … 197 more files in changeset.
Wednesday 22 Jan 2020
2:38 pm

Marcin Cieslak

LDEV-4950 Drag&drop item sorting in Scratchie authoring

Also in Scratchie and Assessment update visible question numbering on

sort.

Options
    • -26
    • +1
    ./basic.jsp
    • -14
    • +50
    ./parts/itemlist.jsp
  3. … 3 more files in changeset.
2:38 pm

Marcin Cieslak

LDEV-4950 Drag&drop item sorting in Scratchie authoring

Also in Scratchie and Assessment update visible question numbering on

sort.

Conflicts:

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java

lams_tool_scratchie/web/pages/authoring/basic.jsp

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

Options
    • -26
    • +1
    ./basic.jsp
    • -2
    • +47
    ./parts/itemlist.jsp
  3. … 3 more files in changeset.
Thursday 09 Jan 2020
11:10 pm

Andrey Balan

LDEV-4932 Add CSRF to QB bank calls

Options
    • -2
    • +2
    ./basic.jsp
    • -1
    • +1
    ./parts/addMcq.jsp
    • -0
    • +1
    ./parts/addVsa.jsp
  4. … 30 more files in changeset.
8:59 am

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
    • -1
    • +1
    ./authoring.jsp
    • -1
    • +1
    ./basic.jsp
    • -0
    • +1
    ./parts/addMcq.jsp
  4. … 92 more files in changeset.
Sunday 05 Jan 2020
4:49 pm

Ernie Ghiglione

LDEV Adding CSRF to Scratchie authoring

Options
    • -2
    • +2
    ./basic.jsp
    • -0
    • +1
    ./parts/additem.jsp
  3. … 2 more files in changeset.
Wednesday 01 Jan 2020
12:43 am

Ernie Ghiglione

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

Options
    • -2
    • +2
    ./authoring.jsp
  2. … 41 more files in changeset.
Monday 30 Dec 2019
10:14 pm

Andrey Balan

LDEV-4932 Secure save tool authoring with CSRF Guard

Options
    • -2
    • +2
    ./authoring.jsp
  2. … 42 more files in changeset.
Thursday 05 Dec 2019
12:07 pm

Marcin Cieslak

LDEV-4921 Add question numbering in Scratchie

Options
    • -0
    • +3
    ./parts/itemlist.jsp
  2. … 4 more files in changeset.
12:18 am

Marcin Cieslak

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

Options
    • -0
    • +35
    ./basic.jsp
    • -0
    • +5
    ./parts/itemlist.jsp
  3. … 3 more files in changeset.
Thursday 21 Nov 2019
9:12 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4911 Create structure for monitoring learning

Options
    • -2
    • +2
    ./parts/itemlist.jsp
  2. … 4 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
    • -1
    • +1
    ./start.jsp
  2. … 27 more files in changeset.
Monday 04 Nov 2019
9:51 pm

Marcin Cieslak

LDEV-4898 Fix notifyCloseURL passing in Scratchie

Options
    • -1
    • +1
    ./start.jsp
  2. … 1 more file in changeset.
Tuesday 29 Oct 2019
10:40 am

Marcin Cieslak

LDEV-4875 Fix JS validation after field name change

Options
    • -5
    • +5
    ./parts/addMcq.jsp
Wednesday 09 Oct 2019
11:32 pm

Andrey Balan

LDEV-4875 Fixes for VSA feature

Options
    • -16
    • +12
    ./parts/addVsa.jsp
  2. … 22 more files in changeset.
Saturday 05 Oct 2019
12:02 am

Andrey Balan

LDEV-4875 Add VSA question type to Assessment and Scratchie

Options
    • -4
    • +32
    ./advance.jsp
    • -2
    • +2
    ./authoring.jsp
    • -6
    • +16
    ./basic.jsp
    • -0
    • +29
    ./parts/addItemFooter.jsp
    • -0
    • +267
    ./parts/addMcq.jsp
    • -0
    • +237
    ./parts/addVsa.jsp
    • -292
    • +0
    ./parts/additem.jsp
    • -1
    • +12
    ./parts/itemlist.jsp
    • -2
    • +2
    ./parts/optionlist.jsp
  10. … 67 more files in changeset.
Saturday 03 Aug 2019
11:10 pm

Andrey Balan

LDEV-4838 Scratchie authoring to work similarly to Assessment (instantaneous changes to QbQuestions)

* Also changed addItem.jsp to look similarly to Assessment add question

pages

* Proper handling of collections in Scratchie

Options
    • -0
    • +2
    ./authoring.jsp
    • -25
    • +28
    ./basic.jsp
    • -41
    • +58
    ./parts/additem.jsp
    • -14
    • +21
    ./parts/itemlist.jsp
    • -14
    • +19
    ./parts/optionlist.jsp
    • -1
    • +1
    ./start.jsp
  7. … 9 more files in changeset.
Thursday 18 Jul 2019
4:04 pm

Andrey Balan

LDEV-4839 Refine import QB questions feature

Options
    • -0
    • +3
    ./authoring.jsp
    • -5
    • +3
    ./basic.jsp
  3. … 8 more files in changeset.
3:13 pm

Andrey Balan

LDEV-4838 Refine import from QB feature

Options
    • -10
    • +13
    ./authoring.jsp
    • -25
    • +46
    ./basic.jsp
    • -39
    • +30
    ./parts/itemlist.jsp
  4. … 4 more files in changeset.
Friday 14 Jun 2019
7:11 am

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
    • -1
    • +1
    ./parts/additem.jsp
  2. … 94 more files in changeset.
Thursday 30 May 2019
2:06 am

Andrey Balan

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

Options
    • -30
    • +2
    ./basic.jsp
    • -18
    • +7
    ./parts/itemlist.jsp
  3. … 11 more files in changeset.
Friday 17 May 2019
11:26 pm

Andrey Balan

LDEV-4746 Rename ScratchieAnswer to QbOptionDTO to reduce ambiguity

Options
    • -25
    • +25
    ./parts/additem.jsp
    • -37
    • +0
    ./parts/answerlist.jsp
    • -0
    • +37
    ./parts/optionlist.jsp
  4. … 24 more files in changeset.
Monday 13 May 2019
12:57 pm

Marcin Cieslak

LDEV-4746 Ignore CKEditor during validation

There is no rule for Scratchie description anyway. And validate plugin

tries to validate a CKEditor div with contenteditable="true" but with no

id or name. There is no point in doing it as contents get moved to a

named textarea before submit.

Options
    • -1
    • +2
    ./parts/additem.jsp
Thursday 07 Mar 2019
10:45 am

Marcin Cieslak

LDEV-4785 Fix a reference to incorrect form when displaying description

Options
    • -1
    • +1
    ./parts/additem.jsp
Tuesday 26 Feb 2019
12:12 am

Andrey Balan

LDEV-4777 Initial implementation of question bank search feature

Options
    • -2
    • +16
    ./parts/itemlist.jsp
  2. … 10 more files in changeset.
Thursday 14 Feb 2019
3:00 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 DateTimePicker and Accordians updated

Options
    • -1
    • +1
    ./parts/answerlist.jsp
    • -1
    • +1
    ./parts/itemlist.jsp
  3. … 390 more files in changeset.
Tuesday 12 Feb 2019
11:15 am

Marcin Cieslak

LDEV-4746 Migrate Scratchie to QB

Options
    • -1
    • +1
    ./parts/additem.jsp
    • -3
    • +3
    ./parts/answerlist.jsp
    • -1
    • +23
    ./parts/itemlist.jsp
  4. … 29 more files in changeset.
Wednesday 06 Feb 2019
4:04 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Panels are now cards.

Options
    • -1
    • +1
    ./advance.jsp
    • -4
    • +4
    ./parts/additem.jsp
    • -2
    • +2
    ./parts/itemlist.jsp
  4. … 504 more files in changeset.
Friday 05 Oct 2018
9:05 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4440 Clean up shared files

Options
    • -1
    • +1
    ./authoring.jsp
    • -1
    • +1
    ./parts/additem.jsp
    • -1
    • +1
    ./pedagogicalPlannerForm.jsp
  4. … 204 more files in changeset.