lams-github

lams_tool_pixlr

Clone Tools

Stats

Commits this week: 0
Total Committers: 18
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 Jan 2024
4:41 pm

Marcin Cieslak

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

Options
    • -7
    • +13
    ./src/java/org/lamsfoundation/lams/tool/pixlr/model/PixlrUser.java
    • -2
    • +2
    ./web/pages/learning/viewAll.jsp
    • -2
    • +2
    ./web/pages/monitoring/pixlrDisplay.jsp
    • -2
    • +2
    ./web/pages/monitoring/summary.jsp
  5. … 147 more files in changeset.
Saturday 30 Dec 2023
8:23 am

Andrey Balan

LDEV-5397 copy-tags

Options
    • -6
    • +6
    ./web/WEB-INF/tags/PageLearner.tag
  2. … 31 more files in changeset.
Thursday 28 Dec 2023
5:09 am

Andrey Balan

Merge branch 'LDEV-5397' into v4.8

# Conflicts:

# lams_learning/web/includes/javascript/learnerPage.js

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

# lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java

# lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java

# lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java

# lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java

# lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java

# lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java

# lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java

# lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java

# lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java

# lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardService.java

# lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java

# lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/PixlrService.java

# lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java

# lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java

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

# lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java

# lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java

# lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java

# lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java

# lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java

# lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/service/WhiteboardService.java

# lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java

# lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/service/ZoomService.java

Options
    • -51
    • +0
    ./src/java/org/lamsfoundation/lams/tool/pixlr/service/PixlrService.java
  2. … 34 more files in changeset.
5:09 am

Andrey Balan

Merge branch 'LDEV-5397' into v4.8

# Conflicts:

# lams_learning/web/includes/javascript/learnerPage.js

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

# lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java

# lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java

# lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java

# lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java

# lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java

# lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java

# lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java

# lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java

# lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java

# lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardService.java

# lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java

# lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/PixlrService.java

# lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java

# lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java

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

# lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java

# lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java

# lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java

# lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java

# lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java

# lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/service/WhiteboardService.java

# lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java

# lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/service/ZoomService.java

Options
    • -51
    • +0
    ./src/java/org/lamsfoundation/lams/tool/pixlr/service/PixlrService.java
  2. … 34 more files in changeset.
4:14 am

Andrey Balan

LDEV-5425 copy-tags

Options
    • -107
    • +0
    ./web/WEB-INF/tags/Notebook.tag
    • -67
    • +0
    ./web/WEB-INF/tags/NotebookReedit.tag
    • -4
    • +1
    ./web/WEB-INF/tags/PageLearner.tag
    • -71
    • +10
    ./web/WEB-INF/tags/SubmissionDeadline.tag
    • -8
    • +0
    ./web/WEB-INF/tlds/lams/lams.tld
  6. … 154 more files in changeset.
4:04 am

Andrey Balan

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

Options
    • -0
    • +15
    ./src/java/org/lamsfoundation/lams/tool/pixlr/dbupdates/patch20231221.sql
    • -56
    • +0
    ./src/java/org/lamsfoundation/lams/tool/pixlr/dto/NotebookEntryDTO.java
    • -23
    • +1
    ./src/java/org/lamsfoundation/lams/tool/pixlr/dto/PixlrDTO.java
    • -20
    • +0
    ./src/java/org/lamsfoundation/lams/tool/pixlr/dto/PixlrUserDTO.java
    • -21
    • +0
    ./src/java/org/lamsfoundation/lams/tool/pixlr/model/Pixlr.java
    • -2
    • +1
    ./src/java/org/lamsfoundation/lams/tool/pixlr/pixlrApplicationContext.xml
    • -25
    • +0
    ./src/java/org/lamsfoundation/lams/tool/pixlr/service/IPixlrService.java
    • -51
    • +0
    ./src/java/org/lamsfoundation/lams/tool/pixlr/service/PixlrService.java
    • -4
    • +0
    ./src/java/org/lamsfoundation/lams/tool/pixlr/web/controller/AuthoringController.java
    • -62
    • +0
    ./src/java/org/lamsfoundation/lams/tool/pixlr/web/controller/LearningController.java
    • -57
    • +0
    ./src/java/org/lamsfoundation/lams/tool/pixlr/web/controller/MonitoringController.java
    • -20
    • +0
    ./src/java/org/lamsfoundation/lams/tool/pixlr/web/forms/AuthoringForm.java
    • -38
    • +0
    ./web/pages/authoring/advanced.jsp
    • -67
    • +0
    ./web/pages/learning/notebook.jsp
    • -42
    • +0
    ./web/pages/learning/pixlr.jsp
  16. … 505 more files in changeset.
Friday 22 Dec 2023
11:00 pm

Marcin Cieslak

LDEV-5433 Squash DB patches and update versions

Options
    • -0
    • +13
    ./src/java/org/lamsfoundation/lams/tool/pixlr/dbupdates/patch20230325.sql
  2. … 107 more files in changeset.
Thursday 21 Dec 2023
4:42 pm

Marcin Cieslak

LDEV-5431 Reset activity completion on force uncomplete in Monitor

Options
    • -34
    • +46
    ./src/java/org/lamsfoundation/lams/tool/pixlr/service/PixlrService.java
  2. … 38 more files in changeset.
Saturday 16 Dec 2023
12:31 am

Andrey Balan

LDEV-5397 copy-tags

Options
    • -2
    • +1
    ./web/WEB-INF/tags/Comments.tag
    • -11
    • +10
    ./web/WEB-INF/tags/LeaderDisplay.tag
    • -1
    • +1
    ./web/WEB-INF/tags/Notebook.tag
    • -133
    • +163
    ./web/WEB-INF/tags/PageLearner.tag
    • -2
    • +2
    ./web/WEB-INF/tags/Rating5.tag
  6. … 154 more files in changeset.
Wednesday 22 Nov 2023
7:26 am

Andrey Balan

LDEV-5397 copy-tags

Options
    • -7
    • +3
    ./web/WEB-INF/tags/PageLearner.tag
    • -3
    • +3
    ./web/WEB-INF/tags/StyledRating5.tag
  3. … 62 more files in changeset.
Thursday 16 Nov 2023
7:31 am

Marcin Cieslak

LDEV-5397 Reintroduce websocket library to Page tag

Options
    • -0
    • +3
    ./web/WEB-INF/tags/PageLearner.tag
  2. … 36 more files in changeset.
7:28 am

Marcin Cieslak

Merge v4.7 into LDEV-5397

Options
    • -97
    • +45
    ./web/WEB-INF/tags/Page5.tag
  2. … 79 more files in changeset.
Wednesday 08 Nov 2023
6:42 am

Andrey Balan

LDEV-5397 copy-tags

Options
    • -2
    • +2
    ./web/WEB-INF/tags/Alert5.tag
    • -15
    • +12
    ./web/WEB-INF/tags/NotebookReedit.tag
    • -12
    • +6
    ./web/WEB-INF/tags/Rating5.tag
    • -4
    • +4
    ./web/WEB-INF/tags/StyledRating5.tag
  5. … 123 more files in changeset.
Friday 27 Oct 2023
12:18 am

Andrey Balan

LDEV-5397 copy-tags

Options
    • -7
    • +17
    ./web/WEB-INF/tags/Alert5.tag
    • -36
    • +60
    ./web/WEB-INF/tags/PageLearner.tag
    • -1
    • +1
    ./web/WEB-INF/tags/WaitForLeader.tag
  4. … 87 more files in changeset.
Wednesday 11 Oct 2023
5:21 am

Andrey Balan

LDEV-5397 copy-tags

Options
    • -8
    • +14
    ./web/WEB-INF/tags/CKEditor.tag
    • -29
    • +28
    ./web/WEB-INF/tags/Comments.tag
    • -1
    • +1
    ./web/WEB-INF/tags/DefineLater.tag
    • -28
    • +30
    ./web/WEB-INF/tags/Notebook.tag
    • -2
    • +2
    ./web/WEB-INF/tags/NotebookReedit.tag
    • -7
    • +8
    ./web/WEB-INF/tags/PageLearner.tag
    • -2
    • +2
    ./web/WEB-INF/tags/Rating5.tag
    • -1
    • +1
    ./web/WEB-INF/tags/SubmissionDeadline.tag
    • -2
    • +2
    ./web/WEB-INF/tags/WaitForLeader.tag
  10. … 275 more files in changeset.
Sunday 01 Oct 2023
10:23 pm

Marcin Cieslak

LDEV-5414 Reattach message handlers to websocket after reconnect

Options
    • -39
    • +35
    ./web/WEB-INF/tags/Page.tag
    • -39
    • +35
    ./web/WEB-INF/tags/Page5.tag
  3. … 76 more files in changeset.
Saturday 30 Sep 2023
9:15 pm

Marcin Cieslak

LDEV-5414 Refactor and improve resilience of websockets thorough LAMS

Options
    • -1
    • +2
    ./web/WEB-INF/tags/AuthoringButton.tag
    • -30
    • +31
    ./web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
    • -4
    • +5
    ./web/WEB-INF/tags/AuthoringRatingCriteria.tag
    • -3
    • +4
    ./web/WEB-INF/tags/OutcomeAuthor.tag
    • -96
    • +49
    ./web/WEB-INF/tags/Page.tag
    • -98
    • +51
    ./web/WEB-INF/tags/Page5.tag
  7. … 127 more files in changeset.
Friday 29 Sep 2023
1:59 am

Andrey Balan

LDEV-5397 spread changes to tags across all projects

Options
    • -2
    • +2
    ./web/WEB-INF/tags/NotebookReedit.tag
    • -10
    • +3
    ./web/WEB-INF/tags/Rating5.tag
    • -0
    • +553
    ./web/WEB-INF/tags/StyledRating5.tag
    • -18
    • +27
    ./web/WEB-INF/tags/TSTable5.tag
    • -0
    • +4
    ./web/WEB-INF/tlds/lams/lams.tld
  6. … 150 more files in changeset.
Tuesday 19 Sep 2023
8:53 am

Andrey Balan

LDEV-5397 switch to using updated DefineLater.tag

Options
    • -5
    • +5
    ./src/java/org/lamsfoundation/lams/tool/pixlr/web/controller/LearningController.java
    • -17
    • +20
    ./web/WEB-INF/tags/DefineLater.tag
    • -0
    • +4
    ./web/WEB-INF/tags/PageLearner.tag
    • -35
    • +2
    ./web/pages/learning/defineLater.jsp
  5. … 92 more files in changeset.
Sunday 17 Sep 2023
9:53 am

Andrey Balan

LDEV-5397 Propagade changes done to LAMS tags to all projects

Options
    • -1
    • +1
    ./web/WEB-INF/tags/Alert5.tag
    • -2
    • +2
    ./web/WEB-INF/tags/FileUpload5.tag
    • -2
    • +2
    ./web/WEB-INF/tags/LeaderDisplay.tag
    • -1
    • +1
    ./web/WEB-INF/tags/Notebook.tag
    • -2
    • +2
    ./web/WEB-INF/tags/Page5.tag
    • -95
    • +96
    ./web/WEB-INF/tags/Rating.tag
    • -0
    • +230
    ./web/WEB-INF/tags/Rating5.tag
    • -1
    • +1
    ./web/WEB-INF/tags/StyledRating.tag
    • -1
    • +1
    ./web/WEB-INF/tags/TSTable5.tag
    • -0
    • +4
    ./web/WEB-INF/tlds/lams/lams.tld
  11. … 310 more files in changeset.
9:49 am

Andrey Balan

LDEV-5397 Migrate old Bootstrap3 class names into Bootstrap5 in *all* tools' learning

* Did this following 2 guides:

https://getbootstrap.com/docs/4.1/migration/

https://getbootstrap.com/docs/5.2/migration/

* Apart from changing class names, also performed other updates required in aforementioned guides.

For instance, checkboxes, radios, selects have now proper Bootstrap5 structure; removed "media" objects.

* Replaced some outdated LAMS class names

Options
    • -3
    • +3
    ./web/pages/learning/pixlr.jsp
    • -1
    • +1
    ./web/pages/learning/viewAll.jsp
  3. … 104 more files in changeset.
Thursday 07 Sep 2023
6:33 am

Andrey Balan

LDEV-5397 propagate tag changes to all tools

Options
    • -1
    • +2
    ./web/WEB-INF/tags/AuthoringButton.tag
    • -30
    • +31
    ./web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
    • -4
    • +5
    ./web/WEB-INF/tags/AuthoringRatingCriteria.tag
    • -1
    • +8
    ./web/WEB-INF/tags/CKEditor.tag
    • -1
    • +1
    ./web/WEB-INF/tags/DefineLater.tag
    • -2
    • +1
    ./web/WEB-INF/tags/Notebook.tag
    • -0
    • +70
    ./web/WEB-INF/tags/NotebookReedit.tag
    • -3
    • +4
    ./web/WEB-INF/tags/OutcomeAuthor.tag
    • -1
    • +2
    ./web/WEB-INF/tags/Page.tag
    • -1
    • +2
    ./web/WEB-INF/tags/Page5.tag
    • -0
    • +1
    ./web/WEB-INF/tags/PageLearner.tag
    • -4
    • +4
    ./web/WEB-INF/tags/Rating.tag
    • -2
    • +2
    ./web/WEB-INF/tags/WaitForLeader.tag
    • -1
    • +5
    ./web/WEB-INF/tlds/lams/lams.tld
  15. … 345 more files in changeset.
Saturday 26 Aug 2023
2:27 pm

Marcin Cieslak

LDEV-5397 Boostrap 5 bundle already has got Popper included

Options
    • -13
    • +12
    ./web/WEB-INF/tags/PageLearner.tag
  2. … 33 more files in changeset.
Friday 25 Aug 2023
8:02 am

Andrey Balan

LDEV-5397 add icons to finish and refresh buttons

Options
    • -1
    • +1
    ./web/WEB-INF/tags/SubmissionDeadline.tag
    • -1
    • +1
    ./web/WEB-INF/tags/WaitForLeader.tag
  3. … 64 more files in changeset.
7:48 am

Andrey Balan

LDEV-5397 add icons to finish and refresh buttons

Options
    • -1
    • +1
    ./web/WEB-INF/tags/DefineLater.tag
    • -8
    • +6
    ./web/WEB-INF/tags/Notebook.tag
  3. … 66 more files in changeset.
6:46 am

Andrey Balan

LDEV-5397 make SubmissionDeadline.tag call checkNextGateActivity()

Options
    • -2
    • +4
    ./web/WEB-INF/tags/SubmissionDeadline.tag
  2. … 32 more files in changeset.
Thursday 24 Aug 2023
7:41 am

Andrey Balan

LDEV-5397 introduce submissionDeadline.tag

* switched to using this tag in all tools

* fixed a few existing issues with submissionDeadline feature in Vote and MCQ tools

Options
    • -0
    • +117
    ./web/WEB-INF/tags/SubmissionDeadline.tag
    • -0
    • +4
    ./web/WEB-INF/tlds/lams/lams.tld
  3. … 80 more files in changeset.
Friday 18 Aug 2023
9:28 am

Andrey Balan

LDEV-5397 spread change to LeaderDisplay.tag to all tools

Options
    • -4
    • +6
    ./web/WEB-INF/tags/LeaderDisplay.tag
  2. … 32 more files in changeset.
Tuesday 15 Aug 2023
7:29 am

Andrey Balan

LDEV-5397 Introduce Notebook.tag

Options
    • -0
    • +108
    ./web/WEB-INF/tags/Notebook.tag
    • -193
    • +153
    ./web/WEB-INF/tlds/lams/lams.tld
  3. … 71 more files in changeset.
Sunday 13 Aug 2023
9:17 am

Andrey Balan

LDEV-5397 center leader alert

Options
    • -1
    • +1
    ./web/WEB-INF/tags/LeaderDisplay.tag
  2. … 32 more files in changeset.