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
Thursday 07 May 2020
6:28 pm

Marcin Cieslak

LDEV-5020 Show question options in burning question in TBL monitor

Options
    • -7
    • +34
    ./pages/tblmonitoring/burningQuestions.jsp
  2. … 1 more file in changeset.
2:38 pm

Marcin Cieslak

LDEV-5019 Link Scratchie learner view to student choices in monitoring

Options
    • -1
    • +17
    ./pages/monitoring/studentChoices.jsp
  2. … 1 more file in changeset.
Wednesday 06 May 2020
7: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
    ./pages/authoring/basic.jsp
  2. … 30 more files in changeset.
Thursday 30 Apr 2020
2:43 pm

Marcin Cieslak

LDEV-5014 Add spinner while QB panel loads in authoring

Options
    • -0
    • +1
    ./pages/authoring/basic.jsp
  2. … 3 more files in changeset.
Wednesday 22 Apr 2020
9:48 pm

Marcin Cieslak

LDEV-4997 Do not import jQuery in Etherpad tag

It overwrites other imports made by pages which use the tag.

Options
    • -1
    • +1
    ./WEB-INF/tags/Etherpad.tag
  2. … 32 more files in changeset.
9:48 pm

Marcin Cieslak

LDEV-4997 Do not import jQuery in Etherpad tag

It overwrites other imports made by pages which use the tag.

Options
    • -1
    • +1
    ./WEB-INF/tags/Etherpad.tag
  2. … 32 more files in changeset.
Tuesday 21 Apr 2020
6:07 pm

Marcin Cieslak

LDEV-4999 Fix monitor role detection when updating learner mark

Options
    • -37
    • +37
    ./WEB-INF/tags/ImgButtonWrapper.tag
  2. … 463 more files in changeset.
Monday 20 Apr 2020
8:46 pm

Marcin Cieslak

LDEV-5002 Distribute Etherpad tag to all projects

Options
    • -37
    • +37
    ./WEB-INF/tags/ImgButtonWrapper.tag
  2. … 88 more files in changeset.
8:46 pm

Marcin Cieslak

LDEV-5002 Distribute Etherpad tag to all projects

Options
    • -37
    • +37
    ./WEB-INF/tags/ImgButtonWrapper.tag
  2. … 88 more files in changeset.
Wednesday 15 Apr 2020
7:57 pm

Marcin Cieslak

LDEV-4997 Add height auto grow feature and parameter

Options
    • -1
    • +18
    ./WEB-INF/tags/Etherpad.tag
    • -1
    • +1
    ./pages/learning/scratchies.jsp
  3. … 2 more files in changeset.
7:57 pm

Marcin Cieslak

LDEV-4997 Add height auto grow feature and parameter

Options
    • -1
    • +18
    ./WEB-INF/tags/Etherpad.tag
    • -1
    • +1
    ./pages/learning/scratchies.jsp
  3. … 2 more files in changeset.
1:16 am

Marcin Cieslak

LDEV-5002 Make discussion panel collapsible

Conflicts:

lams_tool_scratchie/web/pages/learning/scratchies.jsp

Options
    • -2
    • +2
    ./includes/css/scratchie-learning.scss
    • -10
    • +13
    ./pages/learning/scratchies.jsp
1:16 am

Marcin Cieslak

LDEV-5002 Make discussion panel collapsible

Options
    • -2
    • +2
    ./includes/css/scratchie-learning.scss
    • -10
    • +14
    ./pages/learning/scratchies.jsp
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: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.