lams-github / lams_tool_scratchie / web

includes

Clone Tools

Stats

Commits this week: 0
Total Committers: 9
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 14 Apr 2020
7:16 pm

Marcin Cieslak

LDEV-5002 Make discussion panel collapsible

Options
    • -2
    • +2
    ./css/scratchie-learning.scss
  2. … 1 more file 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
    • +4
    ./css/scratchie-learning.scss
  2. … 12 more files in changeset.
7:21 am

Marcin Cieslak

LDEV-5002 Add question Etherpads in Scratchie

Options
    • -0
    • +4
    ./css/scratchie-learning.scss
  2. … 12 more files in changeset.
Thursday 12 Mar 2020
6:55 am

Marcin Cieslak

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

Conflicts:

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieItem.java

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/LearningController.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java

lams_tool_scratchie/web/pages/learning/scratchies.jsp

Options
    • -0
    • +4
    ./css/scratchie-learning.scss
  2. … 10 more files in changeset.
Tuesday 10 Mar 2020
11:29 pm

Marcin Cieslak

LDEV-4987 Display Scratchie item score on monitoring page

Options
    • -0
    • +4
    ./css/scratchie-learning.scss
  2. … 3 more files in changeset.
Saturday 05 Oct 2019
12:02 am

Andrey Balan

LDEV-4875 Add VSA question type to Assessment and Scratchie

Options
    • -3
    • +3
    ./css/scratchie-learning.scss
  2. … 75 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
    • -0
    • +52
    ./css/scratchie-learning.scss
  2. … 94 more files in changeset.
Friday 24 May 2019
10:20 pm

Andrey Balan

LDEV-4820 Show user names as tooltips

Options
    • -0
    • +52
    ./css/scratchie-learning.scss
  2. … 2 more files in changeset.
Wednesday 30 Jan 2019
1:44 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Upgraded bootstrap-tour, dialogs opening at appropriate size

Options
    • -1
    • +1
    ./css/scratchie-learning.scss
  2. … 17 more files in changeset.
Monday 30 Apr 2018
4:47 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4566: add reference to questions in burning questions

Adding underline to burning question titles

Options
    • -1
    • +5
    ./css/scratchie.scss
  2. … 1 more file in changeset.
Friday 03 Nov 2017
11:24 pm

Andrey Balan

LDEV-4455 Move burning question to the learning.jsp

We need a change in the flow for Burning questions in learner, so the

burning question text for each question is entered as the students

answer select the answers.

So each question would have a "burning question?" label that would

expand/collapse on request for students to enter the text as they answer

each question.

Options
    • -2
    • +1
    ./css/scratchie-learning.scss
  2. … 11 more files in changeset.
Monday 10 Jul 2017
4:45 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4367 CSS Files removed if they are now generated files using SASS

Options
    • -29
    • +0
    ./css/scratchie-learning.css
    • -10
    • +0
    ./css/scratchie.css
  3. … 41 more files in changeset.
Saturday 01 Jul 2017
5:12 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4367 SASS Used for CSS Development

First pass of converting our .css development to use SASS. Autobuild to

convert .scss to .css files has been set up for all projects where

target .css files were found. The overall ANT build has been modified

so the normal build will generate the .css files from .scss files. The

base variables are defined in lams_build/conf/sccs.

Options
    • -50
    • +29
    ./css/scratchie-learning.css
    • -0
    • +37
    ./css/scratchie-learning.scss
    • -39
    • +8
    ./css/scratchie.css
    • -0
    • +14
    ./css/scratchie.scss
  5. … 155 more files in changeset.
Tuesday 13 Jun 2017
7:03 am

Marcin Cieslak

After migration clean up

Options
    • -1
    • +0
    ./images/.cvsignore
  2. … 314 more files in changeset.
Friday 21 Oct 2016
2:37 am

erniegx <ernieg@gmail.com>

LDEV-2951: removing unused images from lams_tool_scratchie

Options
    • binary
    ./images/cross.gif
    • binary
    ./images/downarrow.gif
    • binary
    ./images/downarrow_disabled.gif
    • binary
    ./images/edit.gif
    • binary
    ./images/indicator.gif
    • binary
    ./images/req.gif
    • binary
    ./images/spacer.gif
    • binary
    ./images/tick.gif
    • binary
    ./images/uparrow.gif
    • binary
    ./images/uparrow_disabled.gif
    • binary
    ./images/warning.gif
  12. … 1 more file in changeset.
Wednesday 20 Jul 2016
5:44 pm

Andrey Balan

LDEV-3741 Add a time limit to scratchie

Options
    • -0
    • +50
    ./css/scratchie-learning.css
  2. … 8 more files in changeset.
4:33 pm

Andrey Balan

LDEV-3741 Add a time limit to scratchie

Options
    • -0
    • +50
    ./css/scratchie-learning.css
  2. … 9 more files in changeset.
Tuesday 02 Sep 2014
11:49 pm

Andrey Balan

LDEV-3273 switched to the latest version of jQuery Validation Plugin

Options
    • -2
    • +10
    ./css/scratchie.css
    • -0
    • +0
    ./javascript/scratchiecommon.js
  3. … 16 more files in changeset.
Friday 01 Aug 2014
6:04 pm

Andrey Balan

LDEV-3273 switched to the latest version of jQuery Validation Plugin

Options
    • -2
    • +10
    ./css/scratchie.css
    • -0
    • +0
    ./javascript/scratchiecommon.js
  3. … 16 more files in changeset.
Thursday 09 Aug 2012
11:55 pm

Andrey Balan

LDEV-2895 Multiple scratches is allowed in scratchie tool

Options
    • binary
    ./images/req.gif
    • binary
    ./images/warning.gif
  3. … 30 more files in changeset.
Thursday 19 Jul 2012
9:20 pm

Andrey Balan

LDEV-2895 introducing new scratchie tool

Options
    • -0
    • +33
    ./css/scratchie.css
    • -0
    • +1
    ./images/.cvsignore
    • binary
    ./images/answer-1.png
    • binary
    ./images/answer-10.png
    • binary
    ./images/answer-2.png
    • binary
    ./images/answer-3.png
    • binary
    ./images/answer-4.png
    • binary
    ./images/answer-5.png
    • binary
    ./images/answer-6.png
    • binary
    ./images/answer-7.png
    • binary
    ./images/answer-8.png
    • binary
    ./images/answer-9.png
    • binary
    ./images/cross.gif
    • binary
    ./images/downarrow.gif
    • binary
    ./images/downarrow_disabled.gif
  16. … 150 more files in changeset.