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
Tuesday 22 Sep 2020
3:05 pm

Marcin Cieslak

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

Conflicts:

lams_central/conf/language/lams/ApplicationResources_en_AU.properties

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McContent.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

lams_tool_lamc/web/WEB-INF/tags/Arrow.tag

lams_tool_lamc/web/authoring/candidateAnswersList.jsp

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

Options
    • -1
    • +1
    ./parts/itemlist.jsp
  2. … 7 more files in changeset.
7:48 am

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
    ./parts/itemlist.jsp
    • -2
    • +2
    ./parts/optionlist.jsp
  3. … 2 more files in changeset.
7:40 am

Marcin Cieslak

LDEV-5078 Fix i18n labels in Arrow tag

Options
    • -2
    • +2
    ./parts/answerlist.jsp
    • -2
    • +2
    ./parts/itemlist.jsp
  3. … 51 more files in changeset.
Monday 24 Aug 2020
11:25 am

Marcin Cieslak

LDEV-5066 Do not show unconfigured Etherpad option in Scratchie

Options
    • -6
    • +8
    ./advance.jsp
  2. … 1 more file in changeset.
Thursday 20 Aug 2020
8:46 am

Marcin Cieslak

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

Conflicts:

lams_central/conf/language/lams/ApplicationResources_en_AU.properties

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java

lams_central/src/java/org/lamsfoundation/lams/web/QuestionsController.java

lams_central/web/questions/questionFile.jsp

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190722.sql

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190724.sql

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

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

lams_tool_assessment/web/pages/monitoring/summary.jsp

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_lamc/conf/language/lams/ApplicationResources_fr_FR.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_no_NO.properties

lams_tool_lamc/db/sql/activity_insert.sql

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

lams_tool_lamc/web/WEB-INF/tags/Etherpad.tag

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

lams_tool_lamc/web/WEB-INF/tags/Rating.tag

lams_tool_lamc/web/WEB-INF/tags/StyledRating.tag

lams_tool_lamc/web/authoring/BasicContent.jsp

lams_tool_lamc/web/authoring/editQuestionBox.jsp

lams_tool_lamc/web/authoring/itemlist.jsp

Options
    • -1
    • +1
    ./basic.jsp
    • -1
    • +1
    ./parts/itemlist.jsp
  3. … 24 more files in changeset.
Monday 17 Aug 2020
4:34 pm

Marcin Cieslak

LDEV-4917 Add Uppy file uploads to QTI question import

Options
    • -1
    • +1
    ./basic.jsp
  2. … 6 more files in changeset.
Tuesday 11 Aug 2020
9:12 pm

Ernie Ghiglione

LDEV-5061 remove duplicate shuffle items option 4a9a06a

Options
    • -7
    • +0
    ./advance.jsp
9:10 pm

Ernie Ghiglione

LDEV-5061 remove duplicate shuffle items option

Options
    • -7
    • +0
    ./advance.jsp
Friday 10 Jul 2020
10:52 am

Marcin Cieslak

LDEV-5050 Move "is required" attribute from QB question to tools

Options
    • -10
    • +0
    ./parts/addVsa.jsp
  2. … 29 more files in changeset.
Friday 05 Jun 2020
2:20 pm

Marcin Cieslak

LDEV-5032 Make a checkbox depend on a another checkbox being checked

Options
    • -3
    • +18
    ./advance.jsp
1:29 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4886 Automated tests for v4.0

Options
    • -1
    • +1
    ./parts/itemlist.jsp
  2. … 19 more files in changeset.
12:05 pm

Marcin Cieslak

LDEV-5032 Add anonymous confidence levels in Scratchie

Options
    • -0
    • +7
    ./advance.jsp
  2. … 6 more files in changeset.
Wednesday 06 May 2020
1:21 pm

Marcin Cieslak

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

Conflicts:

lams_build/3rdParty.userlibraries

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190119.sql

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190723.sql

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190724.sql

lams_common/src/java/org/lamsfoundation/lams/util/CommonConstants.java

lams_monitoring/web/tblmonitor/teams.jsp

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190517.sql

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190809.sql

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

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McUsrAttempt.java

lams_tool_lamc/web/WEB-INF/tags/ImgButtonWrapper.tag

lams_tool_lamc/web/WEB-INF/tlds/lams/lams.tld

lams_tool_lamc/web/authoring/BasicContent.jsp

lams_tool_lamc/web/learning/CombinedAnswersContent.jsp

lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp

lams_tool_lamc/web/learning/ViewAnswers.jsp

lams_tool_lamc/web/monitoring/SummaryContent.jsp

lams_tool_lamc/web/monitoring/parts/statsPart.jsp

lams_tool_lamc/web/tblmonitoring/mcqStudentChoices.jsp

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

Options
    • -0
    • +1
    ./basic.jsp
  2. … 30 more files in changeset.
Thursday 30 Apr 2020
8:43 am

Marcin Cieslak

LDEV-5014 Add spinner while QB panel loads in authoring

Options
    • -0
    • +1
    ./basic.jsp
  2. … 3 more files in changeset.
Monday 13 Apr 2020
7:21 am

Marcin Cieslak

LDEV-5002 Add question Etherpads in Scratchie

Conflicts:

lams_common/src/java/org/lamsfoundation/lams/etherpad/util/EtherpadUtil.java

lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

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

lams_tool_scratchie/web/WEB-INF/tags/Etherpad.tag

lams_tool_scratchie/web/pages/learning/scratchies.jsp

Options
    • -0
    • +14
    ./advance.jsp
  2. … 12 more files in changeset.
7:21 am

Marcin Cieslak

LDEV-5002 Add question Etherpads in Scratchie

Options
    • -0
    • +14
    ./advance.jsp
  2. … 12 more files in changeset.
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.