lams-github / lams_tool_scratchie / web

pages

Clone Tools

Stats

Commits this week: 0
Total Committers: 12
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 09 Apr 2024
7:16 am

Andrey Balan

Merge branch 'v4.8' into LDEV-5424

# Conflicts:

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java

# lams_tool_assessment/web/pages/monitoring/parts/masterDetailLoadUp.jsp

# lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp

# lams_tool_assessment/web/pages/monitoring/summary.jsp

# lams_tool_daco/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_daco/web/pages/monitoring/listRecords.jsp

# lams_tool_forum/web/jsps/monitoring/updatemarks.jsp

# lams_tool_forum/web/jsps/monitoring/viewmarks.jsp

# lams_tool_images/web/pages/monitoring/imagesummary.jsp

# lams_tool_laqa/web/monitoring/PrintAnswers.jsp

# lams_tool_larsrc/web/pages/monitoring/userlist.jsp

# lams_tool_leader/web/pages/monitoring/changeLeaderDialog5.jsp

# lams_tool_leader/web/pages/monitoring/manageLeaders.jsp

# lams_tool_leader/web/pages/monitoring/summary.jsp

# lams_tool_mindmap/web/pages/monitoring/mindmapDisplay.jsp

# lams_tool_preview/web/pages/monitoring/rubricspart.jsp

# lams_tool_sbmt/web/monitoring/mark/fileinfo.jsp

Options
    • -0
    • +5
    ./tblmonitoring/burningQuestions.jsp
  2. … 30 more files in changeset.
Friday 29 Mar 2024
1:20 am

Marcin Cieslak

Merge remote-tracking branch 'origin/v4.7' into v4.8

# Conflicts:

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java

# lams_tool_scratchie/web/pages/authoring/authoring.jsp

Options
    • -2
    • +4
    ./authoring/authoring.jsp
  2. … 5 more files in changeset.
Sunday 17 Mar 2024
1:17 am

Marcin Cieslak

LDEV-5452 Allow changing question version in live Assessment and Scratchie

Also fix existing learners' answers rewiring.

Options
    • -8
    • +10
    ./authoring/authoring.jsp
  2. … 8 more files in changeset.
Wednesday 13 Mar 2024
10:18 pm

Marcin Cieslak

LDEV-5083 Adjust size of discussion sentiment widget

Options
    • -0
    • +5
    ./monitoring/parts/burningQuestions5.jsp
  2. … 2 more files in changeset.
Thursday 29 Feb 2024
7:32 pm

Marcin Cieslak

Merge branch 'LDEV-5436' into v4.8

# Conflicts:

# lams_learning/src/java/org/lamsfoundation/lams/learning/presence/PresenceWebsocketServer.java

# lams_learning/web/presenceChat.jsp

# lams_monitoring/web/gate/gateStatus.jsp

# lams_tool_assessment/web/pages/learning/parts/allquestions.jsp

# lams_tool_assessment/web/pages/monitoring/parts/masterDetailLoadUp.jsp

# lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp

# lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dto/MessageDTO.java

# lams_tool_images/web/pages/learning/learning.jsp

Options
    • -1
    • +1
    ./learning/scratchies.jsp
  2. … 34 more files in changeset.
5:00 am

Andrey Balan

LDEV-5424 distribute updated RestrictedUsageAccordian.tag to all tools using it

Options
    • -1
    • +1
    ./monitoring/summary.jsp
  2. … 26 more files in changeset.
4:12 am

Andrey Balan

Merge branch 'v4.8' into LDEV-5424

# Conflicts:

# lams_admin/web/WEB-INF/tags/PageLearner.tag

# lams_central/web/WEB-INF/tags/PageLearner.tag

# lams_central/web/includes/javascript/rating5.js

# lams_gradebook/web/WEB-INF/tags/PageLearner.tag

# lams_learning/web/WEB-INF/tags/PageLearner.tag

# lams_learning/web/css/components-learner.scss

# lams_monitoring/web/WEB-INF/tags/PageLearner.tag

# lams_tool_assessment/web/WEB-INF/tags/PageLearner.tag

# lams_tool_assessment/web/pages/learning/results/essay.jsp

# lams_tool_assessment/web/pages/monitoring/monitoring.jsp

# lams_tool_assessment/web/pages/monitoring/parts/advanceoptions.jsp

# lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp

# lams_tool_assessment/web/pages/monitoring/statisticpart.jsp

# lams_tool_chat/web/WEB-INF/tags/PageLearner.tag

# lams_tool_daco/web/WEB-INF/tags/PageLearner.tag

# lams_tool_doku/web/WEB-INF/tags/PageLearner.tag

# lams_tool_forum/web/WEB-INF/tags/PageLearner.tag

# lams_tool_gmap/web/WEB-INF/tags/PageLearner.tag

# lams_tool_images/web/WEB-INF/tags/PageLearner.tag

# lams_tool_images/web/pages/learning/parts/commentsarea.jsp

# lams_tool_imscc/web/WEB-INF/tags/PageLearner.tag

# lams_tool_lamc/web/WEB-INF/tags/PageLearner.tag

# lams_tool_laqa/web/WEB-INF/tags/PageLearner.tag

# lams_tool_larsrc/web/WEB-INF/tags/PageLearner.tag

# lams_tool_leader/web/WEB-INF/tags/PageLearner.tag

# lams_tool_mindmap/web/WEB-INF/tags/PageLearner.tag

# lams_tool_nb/web/WEB-INF/tags/PageLearner.tag

# lams_tool_notebook/web/WEB-INF/tags/PageLearner.tag

# lams_tool_pixlr/web/WEB-INF/tags/PageLearner.tag

# lams_tool_preview/web/WEB-INF/tags/PageLearner.tag

# lams_tool_sbmt/web/WEB-INF/tags/PageLearner.tag

# lams_tool_scratchie/web/WEB-INF/tags/PageLearner.tag

# lams_tool_scribe/web/WEB-INF/tags/PageLearner.tag

# lams_tool_spreadsheet/web/WEB-INF/tags/PageLearner.tag

# lams_tool_survey/web/WEB-INF/tags/PageLearner.tag

# lams_tool_task/web/WEB-INF/tags/PageLearner.tag

# lams_tool_vote/web/WEB-INF/tags/PageLearner.tag

# lams_tool_whiteboard/web/WEB-INF/tags/PageLearner.tag

# lams_tool_wiki/web/WEB-INF/tags/PageLearner.tag

# lams_tool_zoom/web/WEB-INF/tags/PageLearner.tag

# lams_www/web/WEB-INF/tags/PageLearner.tag

Options
    • -1
    • +2
    ./learning/learning.jsp
  2. … 13 more files in changeset.
Wednesday 28 Feb 2024
5:43 am

Andrey Balan

LDEV-5445 proper support for mode="teacher" (which is open learning interface from monitoring)

* Hide PageLearner's header if mode="teacher"

Options
    • -1
    • +2
    ./learning/learning.jsp
  2. … 52 more files in changeset.
Friday 23 Feb 2024
4:57 am

Andrey Balan

LDEV-5424 wrap timelimit widget with an accordion

Options
    • -1
    • +1
    ./monitoring/studentChoices.jsp
  2. … 1 more file in changeset.
4:42 am

Andrey Balan

LDEV-5424 fix jsp file name

Options
    • -0
    • +214
    ./monitoring/studentChoices.jsp
    • -214
    • +0
    ./monitoring/studentChoices5.jsp
4:23 am

Andrey Balan

LDEV-5424 bootstrap5 Scratchie monitoring

Options
    • -92
    • +4
    ./monitoring/monitoring.jsp
    • -233
    • +0
    ./monitoring/parts/burningQuestions.jsp
    • -71
    • +0
    ./monitoring/parts/burningQuestions5.jsp
    • -207
    • +0
    ./monitoring/parts/burningQuestionsTable.jsp
    • -29
    • +0
    ./monitoring/parts/dateRestriction.jsp
    • -69
    • +62
    ./monitoring/parts/itemSummary.jsp
    • -22
    • +25
    ./monitoring/parts/statisticpart.jsp
    • -414
    • +0
    ./monitoring/studentChoices.jsp
    • -50
    • +53
    ./monitoring/studentChoices5.jsp
    • -2
    • +1
    ./monitoring/studentChoicesTable.jsp
    • -89
    • +124
    ./monitoring/summary.jsp
    • -0
    • +93
    ./tblmonitoring/burningQuestions.jsp
    • -0
    • +210
    ./tblmonitoring/burningQuestionsTable.jsp
    • -2
    • +0
    ./tblmonitoring/teams.jsp
    • -62
    • +46
    ./tblmonitoring/tra.jsp
  16. … 2 more files in changeset.
Friday 09 Feb 2024
4:07 am

Andrey Balan

LDEV-5424 fix tooltips and switch to bootstrap5 versions of .js and .css files

Options
    • -1
    • +1
    ./learning/learning.jsp
    • -3
    • +1
    ./monitoring/monitoring.jsp
    • -2
    • +2
    ./monitoring/parts/itemSummary.jsp
    • -5
    • +5
    ./monitoring/parts/statisticpart.jsp
    • -2
    • +2
    ./monitoring/studentChoices.jsp
    • -1
    • +1
    ./monitoring/studentChoices5.jsp
    • -1
    • +1
    ./monitoring/summary.jsp
  8. … 24 more files in changeset.
Wednesday 07 Feb 2024
9:09 am

Andrey Balan

LDEV-5424 switch to bootstrap5 versions of JS files

Options
    • -1
    • +1
    ./monitoring/monitoring.jsp
  2. … 28 more files in changeset.
Sunday 28 Jan 2024
4:45 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/v4.7' into v4.8

# Conflicts:

# lams_tool_assessment/web/pages/learning/learning.jsp

# lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp

# lams_tool_lamc/web/learning/AnswersContent.jsp

# lams_tool_laqa/web/learning/AnswersContent.jsp

# lams_tool_scratchie/web/pages/learning/learning.jsp

Options
    • -5
    • +6
    ./learning/learning.jsp
  2. … 138 more files in changeset.
Tuesday 23 Jan 2024
12:43 am

Marcin Cieslak

LDEV-5290 Identify tabs better when checking for multiple open tabs

A minimised window can skip setInterval() ticks. This lead to incorrect detection of multiple tabs open - a single open tab could produce this message.

Options
    • -2
    • +3
    ./learning/learning.jsp
  2. … 69 more files in changeset.
Friday 12 Jan 2024
1:41 am

Andrey Balan

Merge branch 'LDEV-5397' into v4.8

# Conflicts:

# lams_tool_whiteboard/web/pages/learning/learning.jsp

Options
    • -3
    • +3
    ./learning/scratchies.jsp
Thursday 11 Jan 2024
8:07 am

Andrey Balan

LDEV-5397 fix expanding/collapsing icons

Options
    • -0
    • +10
    ./learning/results.jsp
Wednesday 10 Jan 2024
2:33 pm

Ernie Ghiglione

LDEV-5437 prevent questions and instructions to be copy/paste or print

Options
    • -0
    • +7
    ./learning/learning.jsp
    • -7
    • +1
    ./learning/questionlist.jsp
    • -0
    • +2
    ./learning/results.jsp
  4. … 1 more file in changeset.
2:33 pm

Ernie Ghiglione

LDEV-5437 prevent questions and instructions to be copy/paste or print

Options
    • -0
    • +7
    ./learning/learning.jsp
    • -7
    • +1
    ./learning/questionlist.jsp
    • -0
    • +2
    ./learning/results.jsp
  4. … 1 more file in changeset.
2:20 pm

Marcin Cieslak

LDEV-5397 Fix scratchies not being revealed for non-leaders

Options
    • -3
    • +12
    ./learning/scratchies.jsp
Tuesday 09 Jan 2024
4:41 pm

Marcin Cieslak

LDEV-5436 Project-wide user sorting by last then first name

Options
    • -2
    • +2
    ./learning/scratchies.jsp
  2. … 150 more files in changeset.
1:02 am

Andrey Balan

LDEV-5397 fix portraits sources

Options
    • -3
    • +4
    ./learning/results.jsp
  2. … 1 more file in changeset.
Monday 08 Jan 2024
4:32 am

Ernie Ghiglione

LDEV-5397 Enhanced mobile experience

Options
    • -4
    • +5
    ./learning/learning.jsp
    • -0
    • +10
    ./learning/results.jsp
    • -3
    • +3
    ./learning/scratchies.jsp
  4. … 8 more files in changeset.
Tuesday 02 Jan 2024
10:33 pm

Marcin Cieslak

LDEV-5420 Add questions print button to Scratchie

Options
    • -94
    • +91
    ./authoring/authoring.jsp
    • -0
    • +11
    ./authoring/basic.jsp
  3. … 2 more files in changeset.
Friday 29 Dec 2023
8:19 pm

Ernie Ghiglione

LDEV-5397 round scratchies

Options
    • -1
    • +1
    ./learning/parts/scratchieSvg.jsp
Thursday 28 Dec 2023
4:04 am

Andrey Balan

LDEV-5425 Remove "End of activity" notebook from *all* tools

Options
    • -29
    • +1
    ./authoring/advance.jsp
    • -5
    • +2
    ./learning/learning.jsp
    • -9
    • +0
    ./learning/notebook.jsp
    • -14
    • +3
    ./learning/questionlist.jsp
    • -45
    • +0
    ./learning/results.jsp
    • -5
    • +0
    ./learning/submissionDeadline.jsp
    • -34
    • +0
    ./monitoring/notebook.jsp
    • -30
    • +0
    ./monitoring/parts/advanceOptions.jsp
    • -68
    • +0
    ./monitoring/summary.jsp
  10. … 511 more files in changeset.
Wednesday 27 Dec 2023
9:13 pm

Marcin Cieslak

LDEV-5363 Make RAT questions sync optional

Options
    • -1
    • +8
    ./authoring/authoring.jsp
    • -1
    • +6
    ./authoring/basic.jsp
    • -1
    • +3
    ./authoring/parts/itemlist.jsp
  4. … 11 more files in changeset.
Friday 22 Dec 2023
12:57 am

Andrey Balan

LDEV-5397 fix inability to double click when such option is ON

Options
    • -2
    • +2
    ./learning/learning.jsp
    • -0
    • +1
    ./learning/scratchies.jsp
Thursday 21 Dec 2023
6:46 pm

Marcin Cieslak

LDEV-5401 Display individual extensions in time limit widget

Options
    • -2
    • +2
    ./monitoring/studentChoices5.jsp
  2. … 5 more files in changeset.
8:13 am

Andrey Balan

LDEV-5397 improve burning questions' CSS at the results page

Options
    • -28
    • +42
    ./learning/results.jsp