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
Tuesday 09 Apr 2024
1: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
    ./pages/tblmonitoring/burningQuestions.jsp
  2. … 30 more files in changeset.
Friday 05 Apr 2024
1:12 pm

Marcin Cieslak

LDEV-5440 Use version 3 of JSP and JSTL and their schemas

Make IntelliJ understand the Web aspect of LAMS projects.

Options
    • -2
    • +2
    ./403.jsp
    • -4
    • +2
    ./404.jsp
    • -4
    • +3
    ./WEB-INF/tags/AdvancedAccordian.tag
    • -2
    • +2
    ./WEB-INF/tags/Alert.tag
    • -2
    • +2
    ./WEB-INF/tags/Alert5.tag
    • -4
    • +4
    ./WEB-INF/tags/Arrow.tag
    • -2
    • +2
    ./WEB-INF/tags/AuthoringButton.tag
    • -3
    • +3
    ./WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
    • -3
    • +3
    ./WEB-INF/tags/AuthoringRatingCriteria.tag
    • -3
    • +3
    ./WEB-INF/tags/CKEditor.tag
    • -3
    • +3
    ./WEB-INF/tags/Comments.tag
    • -5
    • +3
    ./WEB-INF/tags/CommentsAuthor.tag
    • -2
    • +2
    ./WEB-INF/tags/Date.tag
    • -3
    • +3
    ./WEB-INF/tags/DefineLater.tag
    • -2
    • +2
    ./WEB-INF/tags/Dropdown.tag
  16. … 2088 more files in changeset.
Sunday 31 Mar 2024
9:28 pm

Marcin Cieslak

LDEV-5440 Reintroduce more strict security rules in web.xml

Options
    • -1
    • +1
    ./WEB-INF/web.xml
  2. … 38 more files in changeset.
1:31 pm

Marcin Cieslak

LDEV-5440 Fix file uploads

Options
    • -2
    • +1
    ./WEB-INF/web.xml
  2. … 38 more files in changeset.
Thursday 28 Mar 2024
6:20 pm

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
    ./pages/authoring/authoring.jsp
  2. … 5 more files in changeset.
Wednesday 27 Mar 2024
11:54 am

Marcin Cieslak

LDEV-5440 Fix multipart config in web.xml files

Options
    • -1
    • +1
    ./WEB-INF/web.xml
  2. … 35 more files in changeset.
Tuesday 26 Mar 2024
11:19 am

Marcin Cieslak

LDEV-5440 Configure file uploads in Spring servlet

Options
    • -0
    • +1
    ./WEB-INF/web.xml
  2. … 34 more files in changeset.
Wednesday 20 Mar 2024
12:30 pm

Marcin Cieslak

LDEV-5440 Update web.xml version

Options
    • -4
    • +4
    ./WEB-INF/web.xml
  2. … 40 more files in changeset.
9:56 am

Marcin Cieslak

LDEV-5440 Update code to match dependencies

In particular javax -> jakarta package change and new JPA not accepting some attributes.

Options
    • -3
    • +3
    ./WEB-INF/tlds/jstl/c.tld
    • -2
    • +2
    ./WEB-INF/tlds/jstl/fmt.tld
    • -2
    • +2
    ./WEB-INF/tlds/jstl/permittedTaglibs.tld
    • -2
    • +2
    ./WEB-INF/tlds/jstl/scriptfree.tld
    • -2
    • +2
    ./WEB-INF/tlds/jstl/x.tld
    • -1
    • +1
    ./WEB-INF/web.xml
  7. … 218 more files in changeset.
Saturday 16 Mar 2024
6:17 pm

Marcin Cieslak

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

Also fix existing learners' answers rewiring.

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

Marcin Cieslak

LDEV-5083 Adjust size of discussion sentiment widget

Options
    • -0
    • +5
    ./pages/monitoring/parts/burningQuestions5.jsp
  2. … 2 more files in changeset.
Thursday 29 Feb 2024
12: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
    ./pages/learning/scratchies.jsp
  2. … 34 more files in changeset.
Wednesday 28 Feb 2024
10:00 pm

Andrey Balan

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

Options
    • -1
    • +1
    ./pages/monitoring/summary.jsp
  2. … 26 more files in changeset.
9:25 pm

Andrey Balan

LDEV-5424 update to RestrictedUsageAccordian.tag and copy-tags

Options
    • -3
    • +3
    ./WEB-INF/tags/RestrictedUsageAccordian.tag
  2. … 62 more files in changeset.
9:12 pm

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
    ./pages/learning/learning.jsp
  2. … 13 more files in changeset.
Tuesday 27 Feb 2024
10:43 pm

Andrey Balan

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

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

Options
    • -9
    • +11
    ./WEB-INF/tags/PageLearner.tag
    • -1
    • +2
    ./pages/learning/learning.jsp
  3. … 51 more files in changeset.
Thursday 22 Feb 2024
9:57 pm

Andrey Balan

LDEV-5424 wrap timelimit widget with an accordion

Options
    • -1
    • +1
    ./pages/monitoring/studentChoices.jsp
  2. … 1 more file in changeset.
9:42 pm

Andrey Balan

LDEV-5424 fix jsp file name

Options
    • -0
    • +214
    ./pages/monitoring/studentChoices.jsp
    • -214
    • +0
    ./pages/monitoring/studentChoices5.jsp
9:28 pm

Andrey Balan

LDEV-5424 tag's title attribute is no longer required

Options
    • -4
    • +7
    ./WEB-INF/tags/RestrictedUsageAccordian.tag
  2. … 6 more files in changeset.
9:23 pm

Andrey Balan

LDEV-5424 bootstrap5 Scratchie monitoring

Options
    • -12
    • +35
    ./WEB-INF/tags/PageMonitor.tag
    • -92
    • +4
    ./pages/monitoring/monitoring.jsp
    • -233
    • +0
    ./pages/monitoring/parts/burningQuestions.jsp
    • -71
    • +0
    ./pages/monitoring/parts/burningQuestions5.jsp
    • -207
    • +0
    ./pages/monitoring/parts/burningQuestionsTable.jsp
    • -29
    • +0
    ./pages/monitoring/parts/dateRestriction.jsp
    • -69
    • +62
    ./pages/monitoring/parts/itemSummary.jsp
    • -22
    • +25
    ./pages/monitoring/parts/statisticpart.jsp
    • -414
    • +0
    ./pages/monitoring/studentChoices.jsp
    • -50
    • +53
    ./pages/monitoring/studentChoices5.jsp
    • -2
    • +1
    ./pages/monitoring/studentChoicesTable.jsp
    • -89
    • +124
    ./pages/monitoring/summary.jsp
    • -0
    • +93
    ./pages/tblmonitoring/burningQuestions.jsp
    • -0
    • +210
    ./pages/tblmonitoring/burningQuestionsTable.jsp
    • -2
    • +0
    ./pages/tblmonitoring/teams.jsp
    • -62
    • +46
    ./pages/tblmonitoring/tra.jsp
  17. … 1 more file in changeset.
Thursday 08 Feb 2024
11:06 pm

Andrey Balan

LDEV-5424 copy-tags

Options
    • -12
    • +12
    ./WEB-INF/tags/AdvancedAccordian.tag
    • -0
    • +84
    ./WEB-INF/tags/PageAdmin.tag
    • -2
    • +2
    ./WEB-INF/tags/PageLearner.tag
    • -0
    • +146
    ./WEB-INF/tags/PageMonitor.tag
    • -15
    • +48
    ./WEB-INF/tags/RestrictedUsageAccordian.tag
    • -2
    • +6
    ./WEB-INF/tlds/lams/lams.tld
  7. … 186 more files in changeset.
10:50 pm

Andrey Balan

LDEV-5424 rename Page5.tag->PageAdmin.tag

Options
    • -467
    • +0
    ./WEB-INF/tags/Page5.tag
  2. … 71 more files in changeset.
9:07 pm

Andrey Balan

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

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

Andrey Balan

LDEV-5424 switch to bootstrap5 versions of JS files

Options
    • -1
    • +1
    ./pages/monitoring/monitoring.jsp
  2. … 28 more files in changeset.
Tuesday 30 Jan 2024
7:46 pm

Andrey Balan

LDEV-5442 rename StyledRating5.tag -> StyledRating.tag

Options
    • -565
    • +0
    ./WEB-INF/tags/StyledRating5.tag
  2. … 30 more files in changeset.
7:15 pm

Andrey Balan

LDEV-5442 copy-tags

Options
    • -20
    • +1
    ./WEB-INF/tags/Page.tag
    • -19
    • +0
    ./WEB-INF/tags/Page5.tag
    • -100
    • +136
    ./WEB-INF/tags/Rating.tag
    • -270
    • +248
    ./WEB-INF/tags/StyledRating.tag
    • -9
    • +1
    ./WEB-INF/tlds/lams/lams.tld
  6. … 155 more files in changeset.
7:08 pm

Andrey Balan

LDEV-5442 rename Rating5.tag -> Rating.tag

Options
    • -257
    • +0
    ./WEB-INF/tags/Rating5.tag
  2. … 42 more files in changeset.
1:23 am

Andrey Balan

LDEV-5442 rename StyledRating5.tag -> StyledRating.tag

Options
    • -553
    • +0
    ./WEB-INF/tags/StyledRating5.tag
  2. … 35 more files in changeset.
Sunday 28 Jan 2024
9:45 am

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
    • -23
    • +7
    ./WEB-INF/tags/Page.tag
    • -22
    • +6
    ./WEB-INF/tags/Page5.tag
    • -14
    • +17
    ./WEB-INF/tags/PageLearner.tag
    • -9
    • +21
    ./WEB-INF/tags/StyledRating5.tag
    • -5
    • +6
    ./pages/learning/learning.jsp
  6. … 134 more files in changeset.
Saturday 27 Jan 2024
1:03 am

Andrey Balan

LDEV-5442 copy-tags

Options
    • -26
    • +66
    ./WEB-INF/tags/Rating5.tag
  2. … 30 more files in changeset.