lams-github / lams_tool_scratchie

web

Clone Tools

Stats

Commits this week: 0
Total Committers: 13
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 19 Jul 2019
4:21 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/develop' into LDEV-4745

Conflicts:

lams_central/conf/language/lams/ApplicationResources.properties

lams_central/conf/language/lams/ApplicationResources_en_AU.properties

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

Options
    • -1
    • +1
    ./pages/tblmonitoring/tra.jsp
  2. … 4 more files in changeset.
Thursday 18 Jul 2019
10:04 pm

Andrey Balan

LDEV-4839 Refine import QB questions feature

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

Andrey Balan

LDEV-4838 Refine import from QB feature

Options
    • -10
    • +13
    ./pages/authoring/authoring.jsp
    • -25
    • +46
    ./pages/authoring/basic.jsp
    • -39
    • +30
    ./pages/authoring/parts/itemlist.jsp
  4. … 4 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.
8:24 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4829 Supports multiple response app ex, improved font on TRA chart

Options
    • -1
    • +1
    ./pages/tblmonitoring/tra.jsp
  2. … 11 more files in changeset.
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
    • -34
    • +24
    ./pages/learning/learning.jsp
    • -12
    • +0
    ./pages/learning/results.jsp
    • -9
    • +13
    ./pages/learning/scratchies.jsp
    • -5
    • +14
    ./pages/monitoring/parts/itemSummary.jsp
    • -12
    • +23
    ./pages/monitoring/summary.jsp
    • -32
    • +87
    ./pages/tblmonitoring/burningQuestions.jsp
    • -1
    • +7
    ./pages/tblmonitoring/tra.jsp
    • -9
    • +40
    ./pages/tblmonitoring/traStudentChoices.jsp
  9. … 47 more files in changeset.
Tuesday 25 Jun 2019
3:41 am

Andrey Balan

LKC-203 Fix location of the first column

Options
    • -9
    • +34
    ./pages/tblmonitoring/traStudentChoices.jsp
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
    • -0
    • +52
    ./includes/css/scratchie-learning.scss
    • -1
    • +1
    ./pages/authoring/parts/additem.jsp
    • -34
    • +24
    ./pages/learning/learning.jsp
    • -12
    • +0
    ./pages/learning/results.jsp
    • -11
    • +15
    ./pages/learning/scratchies.jsp
    • -3
    • +2
    ./pages/monitoring/monitoring.jsp
    • -5
    • +14
    ./pages/monitoring/parts/itemSummary.jsp
    • -14
    • +24
    ./pages/monitoring/summary.jsp
    • -31
    • +86
    ./pages/tblmonitoring/burningQuestions.jsp
    • -1
    • +7
    ./pages/tblmonitoring/tra.jsp
    • -0
    • +6
    ./pages/tblmonitoring/traStudentChoices.jsp
  13. … 83 more files in changeset.
Thursday 30 May 2019
8:06 am

Andrey Balan

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

Options
    • -30
    • +2
    ./pages/authoring/basic.jsp
    • -18
    • +7
    ./pages/authoring/parts/itemlist.jsp
  3. … 11 more files in changeset.
Wednesday 29 May 2019
10:20 pm

Marcin Cieslak

LDEV-4825 Show links to activity monitoring on QB stats page

Also fix displaying QB stats in tools' monitoring pages.

Options
    • -3
    • +2
    ./pages/monitoring/parts/statisticpart.jsp
  2. … 9 more files in changeset.
8:36 pm

Marcin Cieslak

LDEV-4825 Display QB stats in Scratchie tool monitoring

Options
    • -69
    • +124
    ./pages/monitoring/parts/statisticpart.jsp
  2. … 2 more files in changeset.
Saturday 25 May 2019
4:20 am

Andrey Balan

LDEV-4820 Show user names as tooltips

Options
    • -0
    • +52
    ./includes/css/scratchie-learning.scss
    • -41
    • +24
    ./pages/learning/learning.jsp
    • -10
    • +8
    ./pages/learning/scratchies.jsp
Saturday 18 May 2019
5:26 am

Andrey Balan

LDEV-4746 Rename ScratchieAnswer to QbOptionDTO to reduce ambiguity

Options
    • -25
    • +25
    ./pages/authoring/parts/additem.jsp
    • -37
    • +0
    ./pages/authoring/parts/answerlist.jsp
    • -0
    • +37
    ./pages/authoring/parts/optionlist.jsp
    • -7
    • +7
    ./pages/learning/learning.jsp
    • -3
    • +3
    ./pages/learning/questionlist.jsp
    • -15
    • +15
    ./pages/learning/scratchies.jsp
    • -7
    • +7
    ./pages/monitoring/parts/itemSummary.jsp
    • -4
    • +4
    ./pages/tblmonitoring/teams.jsp
    • -2
    • +2
    ./pages/tblmonitoring/tra.jsp
    • -9
    • +9
    ./pages/tblmonitoring/traStudentChoices.jsp
  11. … 17 more files in changeset.
Thursday 16 May 2019
2:53 am

Andrey Balan

LDEV-4820 Show user names for confidence levels

Options
    • -0
    • +7
    ./pages/learning/learning.jsp
    • -6
    • +12
    ./pages/learning/scratchies.jsp
  3. … 4 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.
4:54 am

Andrey Balan

LDEV-4746 Fix issues that arose after migration to QB questions

Options
    • -5
    • +6
    ./pages/monitoring/parts/itemSummary.jsp
    • -3
    • +3
    ./pages/tblmonitoring/burningQuestions.jsp
    • -3
    • +3
    ./pages/tblmonitoring/teams.jsp
    • -2
    • +2
    ./pages/tblmonitoring/tra.jsp
    • -7
    • +7
    ./pages/tblmonitoring/traStudentChoices.jsp
  6. … 2 more files in changeset.
Monday 13 May 2019
6: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
    ./pages/authoring/parts/additem.jsp
Thursday 25 Apr 2019
5:04 am

Andrey Balan

LDEV-4814 Wrap text properly in jqGrid

Move responsible CSS rules to the _learner_base.scss, so it affects all

jqGrid instances.

Options
    • -12
    • +0
    ./pages/learning/results.jsp
    • -3
    • +0
    ./pages/monitoring/summary.jsp
  3. … 6 more files in changeset.
Wednesday 24 Apr 2019
6:24 am

Andrey Balan

LDEV-4805 Finally switch to using free-jqGrid

Options
    • -3
    • +2
    ./pages/monitoring/monitoring.jsp
    • -5
    • +14
    ./pages/monitoring/parts/itemSummary.jsp
    • -11
    • +24
    ./pages/monitoring/summary.jsp
  4. … 25 more files in changeset.
Friday 19 Apr 2019
1:45 am

Andrey Balan

LDEV-4809 Don't display number prior to general burning question

Options
    • -6
    • +18
    ./pages/tblmonitoring/burningQuestions.jsp
Saturday 30 Mar 2019
2:10 am

Andrey Balan

LDEV-4793 Show horizontal scrollbar on iPads

Options
    • -0
    • +6
    ./pages/tblmonitoring/traStudentChoices.jsp
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.
Tuesday 26 Mar 2019
4:09 am

Andrey Balan

LDEV-4796 Fix refresh button issue after clicking "Expand all" one

Options
    • -2
    • +2
    ./pages/tblmonitoring/burningQuestions.jsp
  2. … 1 more file in changeset.
3:31 am

Andrey Balan

LDEV-4793 Fixing TBLmonitor's issues with iPad

Options
    • -1
    • +7
    ./pages/tblmonitoring/tra.jsp
  2. … 1 more file 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 07 Mar 2019
5:45 pm

Marcin Cieslak

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

Options
    • -1
    • +1
    ./pages/authoring/parts/additem.jsp
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.
7:12 am

Andrey Balan

LDEV-4777 Initial implementation of question bank search feature

Options
    • -2
    • +16
    ./pages/authoring/parts/itemlist.jsp
  2. … 10 more files in changeset.