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
Wednesday 15 Apr 2020
12:49 am

Marcin Cieslak

LDEV-5002 Display user list only when Scratchie is grouped

Options
    • -2
    • +2
    ./pages/learning/scratchies.jsp
  2. … 1 more file in changeset.
12:24 am

Marcin Cieslak

LDEV-5002 Reduce gap between user names

Options
    • -1
    • +0
    ./pages/learning/scratchies.jsp
12:24 am

Marcin Cieslak

LDEV-5002 Reduce gap between user names

Options
    • -1
    • +0
    ./pages/learning/scratchies.jsp
Monday 13 Apr 2020
6:40 pm

Marcin Cieslak

LDEV-5002 Initialise multiple Etherpad instances in cascade

Options
    • -5
    • +4
    ./WEB-INF/tags/Etherpad.tag
6:40 pm

Marcin Cieslak

LDEV-5002 Initialise multiple Etherpad instances in cascade

Options
    • -5
    • +4
    ./WEB-INF/tags/Etherpad.tag
1:21 pm

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
    • +81
    ./WEB-INF/tags/Etherpad.tag
    • -0
    • +4
    ./includes/css/scratchie-learning.scss
    • -0
    • +14
    ./pages/authoring/advance.jsp
    • -0
    • +26
    ./pages/learning/scratchies.jsp
  5. … 9 more files in changeset.
1:21 pm

Marcin Cieslak

LDEV-5002 Add question Etherpads in Scratchie

Options
    • -4
    • +5
    ./WEB-INF/tags/Etherpad.tag
    • -0
    • +4
    ./includes/css/scratchie-learning.scss
    • -0
    • +14
    ./pages/authoring/advance.jsp
    • -9
    • +0
    ./pages/learning/learning.jsp
    • -1
    • +27
    ./pages/learning/scratchies.jsp
  6. … 8 more files in changeset.
Thursday 02 Apr 2020
3:23 pm

Marcin Cieslak

LDEV-4997 Introduce Etherpad as a JSP tag

Options
    • -0
    • +81
    ./WEB-INF/tags/Etherpad.tag
    • -0
    • +4
    ./WEB-INF/tlds/lams/lams.tld
    • -0
    • +9
    ./pages/learning/learning.jsp
  4. … 8 more files in changeset.
Wednesday 01 Apr 2020
12:08 pm

Marcin Cieslak

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

Options
    • -1
    • +2
    ./pages/authoring/parts/addItemFooter.jsp
  2. … 3 more files in changeset.
Thursday 26 Mar 2020
6:59 pm

Marcin Cieslak

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

Conflicts:

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

Options
    • -6
    • +19
    ./pages/monitoring/summary.jsp
  2. … 7 more files in changeset.
Tuesday 24 Mar 2020
1:17 am

Marcin Cieslak

LDEV-4992 Display all learners in group in Scratchie monitoring summary

Mark ones who reached the activity.

Options
    • -6
    • +19
    ./pages/monitoring/summary.jsp
  2. … 3 more files in changeset.
Saturday 21 Mar 2020
9: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
    ./pages/authoring/parts/addItemFooter.jsp
    • -2
    • +2
    ./pages/authoring/parts/addVsa.jsp
    • -1
    • +1
    ./pages/monitoring/parts/statisticpart.jsp
    • -2
    • +2
    ./pages/tblmonitoring/burningQuestions.jsp
    • -5
    • +5
    ./pages/tblmonitoring/tra.jsp
    • -4
    • +4
    ./pages/tblmonitoring/traStudentChoices.jsp
  7. … 193 more files in changeset.
Friday 20 Mar 2020
1:35 pm

Marcin Cieslak

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

Conflicts:

lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GateController.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dto/GroupSummary.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

Options
    • -11
    • +38
    ./pages/monitoring/summary.jsp
  2. … 21 more files in changeset.
1:31 pm

Marcin Cieslak

LDEV-4992 Add icon to a leader in Scratchie monitoring summary

Options
    • -1
    • +10
    ./pages/monitoring/summary.jsp
Thursday 19 Mar 2020
9:10 pm

Marcin Cieslak

LDEV-4992 Show all learners in Scratchie monitoring summary

Options
    • -12
    • +30
    ./pages/monitoring/summary.jsp
  2. … 4 more files in changeset.
2:51 pm

Marcin Cieslak

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

Conflicts:

lams_common/src/java/org/lamsfoundation/lams/outcome/dao/hibernate/OutcomeDAO.java

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

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java

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

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

lams_tool_scratchie/web/pages/tblmonitoring/traStudentChoices.jsp

Options
    • -0
    • +252
    ./pages/monitoring/studentChoices.jsp
    • -17
    • +8
    ./pages/monitoring/summary.jsp
  3. … 5 more files in changeset.
Wednesday 18 Mar 2020
10:09 pm

Ernie Ghiglione

LDEV-4993 Slight layout changes

Options
    • -1
    • +3
    ./pages/monitoring/summary.jsp
8:55 pm

Marcin Cieslak

LDEV-4993 Move files to reflect logical assignment better

Options
    • -0
    • +244
    ./pages/monitoring/studentChoices.jsp
    • -1
    • +1
    ./pages/monitoring/summary.jsp
    • -244
    • +0
    ./pages/tblmonitoring/traStudentChoices.jsp
  4. … 1 more file in changeset.
8:48 pm

Marcin Cieslak

LDEV-4993 Redesign Scratchie monitoring summary tab

Options
    • -16
    • +5
    ./pages/monitoring/summary.jsp
    • -52
    • +69
    ./pages/tblmonitoring/traStudentChoices.jsp
  3. … 7 more files in changeset.
Thursday 12 Mar 2020
1:55 pm

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
    ./includes/css/scratchie-learning.scss
    • -0
    • +11
    ./pages/learning/learning.jsp
    • -2
    • +9
    ./pages/learning/results.jsp
    • -2
    • +8
    ./pages/learning/scratchies.jsp
  5. … 7 more files in changeset.
1:33 pm

Marcin Cieslak

LDEV-4990 Style results page the same way as learning page in Scratchie

Options
    • -1
    • +3
    ./pages/learning/results.jsp
10:12 am

Ernie Ghiglione

LDEV-4987 Minor adjustments in layout

Options
    • -7
    • +8
    ./pages/learning/scratchies.jsp
Wednesday 11 Mar 2020
6:29 am

Marcin Cieslak

LDEV-4987 Display Scratchie item score on monitoring page

Options
    • -0
    • +4
    ./includes/css/scratchie-learning.scss
    • -0
    • +11
    ./pages/learning/learning.jsp
    • -4
    • +6
    ./pages/learning/scratchies.jsp
  4. … 1 more file in changeset.
5:56 am

Marcin Cieslak

LDEV-4987 Show score by each Scratchie in results. Show negative percent

Options
    • -1
    • +6
    ./pages/learning/results.jsp
    • -0
    • +4
    ./pages/learning/scratchies.jsp
  3. … 7 more files in changeset.
Wednesday 19 Feb 2020
1:51 pm

Ernie Ghiglione

LDEV-4975 Upgrade jquery to version 3.4.1

Options
    • -1
    • +1
    ./pages/learning/learning.jsp
  2. … 16 more files in changeset.
Thursday 23 Jan 2020
6:40 am

Andrey Balan

LDEV-4953 Set pageEncoding and contentType in web.xml instead of jsps

Options
    • -1
    • +0
    ./403.jsp
    • -1
    • +0
    ./404.jsp
    • -0
    • +6
    ./WEB-INF/web.xml
    • -1
    • +1
    ./common/taglibs.jsp
    • -1
    • +1
    ./error.jsp
    • -1
    • +0
    ./login.jsp
  7. … 167 more files in changeset.
Wednesday 22 Jan 2020
9: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
    ./pages/authoring/basic.jsp
    • -14
    • +50
    ./pages/authoring/parts/itemlist.jsp
  3. … 3 more files in changeset.
9: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
    ./pages/authoring/basic.jsp
    • -2
    • +47
    ./pages/authoring/parts/itemlist.jsp
  3. … 3 more files in changeset.
Tuesday 21 Jan 2020
4:23 am

Andrey Balan

LDEV-4948 Prevent adding enctype="multipart/form-data" to forms

Options
    • -4
    • +4
    ./pages/learning/learning.jsp
  2. … 4 more files in changeset.
Wednesday 15 Jan 2020
5:57 am

Andrey Balan

LDEV-4928 Update TBL monitor and Excel export to fully support VSA type

Options
    • -1
    • +1
    ./pages/tblmonitoring/traStudentChoices.jsp
  2. … 4 more files in changeset.