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 30 Dec 2020
10:05 am

Marcin Cieslak

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

Conflicts:

lams_build/3rdParty.userlibraries

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/qb/collection.jsp

lams_central/web/questions/questionFile.jsp

lams_common/db/sql/create_lams_11_tables.sql

lams_common/db/sql/insert_lams_config_data.sql

lams_common/db/sql/insert_types_data.sql

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

lams_common/src/java/org/lamsfoundation/lams/questions/QuestionWordParser.java

lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_assessment/db/sql/create_lams_tool_assessment.sql

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/model/McContent.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McUsrAttempt.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/WEB-INF/tags/CKEditor.tag

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

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

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

lams_tool_lamc/web/authoring/candidateAnswersList.jsp

lams_tool_lamc/web/authoring/itemlist.jsp

lams_tool_scratchie/web/pages/authoring/basic.jsp

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

Options
    • -2
    • +45
    ./basic.jsp
    • -16
    • +91
    ./parts/itemlist.jsp
  3. … 28 more files in changeset.
Friday 18 Dec 2020
1:22 am

Ernie Ghiglione

LDEV-5136 labels and tooltips

Options
    • -0
    • +1
    ./advance.jsp
  2. … 2 more files in changeset.
Monday 14 Dec 2020
9:58 am

Marcin Cieslak

LDEV-5136 Enable double click revealing in Scratchie

Options
    • -0
    • +7
    ./advance.jsp
  2. … 5 more files in changeset.
Saturday 21 Nov 2020
11:16 am

Marcin Cieslak

Merge branch 'LDEV-5101' into v4.0

Conflicts:

lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

Options
    • -0
    • +31
    ./basic.jsp
    • -11
    • +82
    ./parts/itemlist.jsp
  3. … 8 more files in changeset.
Thursday 19 Nov 2020
8:16 am

Ernie Ghiglione

LDEV-5108 Oopps.. forgot to remove old IMS QTI link

Options
    • -5
    • +0
    ./parts/itemlist.jsp
Wednesday 18 Nov 2020
6:33 pm

Marcin Cieslak

LDEV-5114 Add "Save as new version" button to Scratchie

Options
    • -3
    • +27
    ./parts/addItemFooter.jsp
  2. … 2 more files in changeset.
Friday 13 Nov 2020
1:16 am

Ernie Ghiglione

LDEV-5101 Enhacing tooltips

Options
    • -3
    • +3
    ./parts/itemlist.jsp
Thursday 12 Nov 2020
12:18 pm

Marcin Cieslak

LDEV-5101 Add stats button to each question in Scratchie

Also align icons better.

Options
    • -4
    • +3
    ./authoring.jsp
    • -7
    • +14
    ./parts/itemlist.jsp
11:54 am

Marcin Cieslak

LDEV-5101 Avoid name clash between bootstrap and jQuery UI

Options
    • -3
    • +3
    ./authoring.jsp
    • -0
    • +4
    ./parts/itemlist.jsp
Wednesday 11 Nov 2020
10:06 pm

Ernie Ghiglione

LDEV-5101 Ui changes

Options
    • -0
    • +5
    ./authoring.jsp
    • -2
    • +2
    ./parts/itemlist.jsp
7:19 pm

Marcin Cieslak

LDEV-5101 Add labels

Options
    • -6
    • +6
    ./parts/itemlist.jsp
  2. … 1 more file in changeset.
7:00 pm

Marcin Cieslak

LDEV-5101 Add links to question version stats page

Options
    • -0
    • +11
    ./authoring.jsp
    • -0
    • +4
    ./basic.jsp
    • -5
    • +14
    ./parts/itemlist.jsp
6:42 pm

Marcin Cieslak

LDEV-5101 Check if other activities require question version upgrade

Options
    • -1
    • +12
    ./basic.jsp
    • -1
    • +3
    ./parts/itemlist.jsp
10:48 am

Marcin Cieslak

LDEV-5101 Allow easy change of question version in Scratchie

Options
    • -0
    • +12
    ./authoring.jsp
    • -0
    • +16
    ./basic.jsp
    • -6
    • +39
    ./parts/itemlist.jsp
  4. … 1 more file in changeset.
Sunday 08 Nov 2020
3:15 pm

Marcin Cieslak

LDEV-5101 Allow applying new question version to other activities in LD

Options
    • -2
    • +18
    ./parts/itemlist.jsp
  2. … 13 more files in changeset.
12:36 pm

Ernie Ghiglione

LDEV-5108 Adding MS Word to scratchie

Options
    • -2
    • +14
    ./basic.jsp
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.