lams-github / lams_learning

web

Clone Tools

Stats

Commits this week: 0
Total Committers: 27
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 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
    • -24
    • +7
    ./includes/javascript/learnerPage.js
  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
    • -24
    • +7
    ./includes/javascript/learnerPage.js
  2. … 34 more files in changeset.
4:14 am

Andrey Balan

LDEV-5425 copy-tags

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

Andrey Balan

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

Options
    • -86
    • +0
    ./notebook/addnew.jsp
    • -174
    • +0
    ./notebook/view.jsp
    • -170
    • +0
    ./notebook/viewall.jsp
    • -109
    • +0
    ./notebook/viewalljournals.jsp
  5. … 516 more files in changeset.
Wednesday 27 Dec 2023
5:28 pm

Marcin Cieslak

LDEV-5397 Allow jumping to incomplete activity in Preview mode

Also open Preview in separate tab

Options
    • -45
    • +49
    ./includes/javascript/learnerPage.js
  2. … 1 more file in changeset.
Friday 22 Dec 2023
1:09 am

Andrey Balan

LDEV-5397 use the same icons for gates as for all other activities

Options
    • -4
    • +1
    ./WEB-INF/tags/PageLearner.tag
    • -28
    • +10
    ./includes/javascript/learnerPage.js
  3. … 1 more file in changeset.
Thursday 21 Dec 2023
6:11 am

Andrey Balan

LDEV-5397 divs not having any special roles can't have aria-labels

Options
    • -5
    • +4
    ./discussion/learner.jsp
    • -4
    • +2
    ./discussion/monitor5.jsp
  3. … 10 more files in changeset.
Wednesday 20 Dec 2023
11:02 pm

Ernie Ghiglione

LDEV-5397 button not spelled properly

Options
    • -3
    • +3
    ./grouping/show.jsp
8:39 am

Andrey Balan

LDEV-5397 remove .table-responsive as it creates horizaontal scrollbar in certain cases on FF

Options
    • -1
    • +1
    ./discussion/learner.jsp
    • -48
    • +46
    ./grouping/choose.jsp
    • -28
    • +26
    ./grouping/show.jsp
  4. … 5 more files in changeset.
8:24 am

Andrey Balan

LDEV-5397 fix CSS for FF

Options
    • -0
    • +1
    ./css/components-learner.scss
8:24 am

Andrey Balan

LDEV-5397 make sure all buttons have proper "type" attribute

Options
    • -1
    • +1
    ./grouping/choose.jsp
    • -1
    • +1
    ./grouping/show.jsp
    • -1
    • +1
    ./grouping/wait.jsp
    • -1
    • +1
    ./optionsActivity.jsp
  5. … 21 more files in changeset.
4:27 am

Andrey Balan

LDEV-5397 bootstrap5 page

Options
    • -31
    • +16
    ./progressBroken.jsp
Tuesday 19 Dec 2023
4:53 am

Andrey Balan

LDEV-5397 remove unnecessary horizontal scroller

Options
    • -0
    • +1
    ./css/components-learner.scss
Saturday 16 Dec 2023
2:40 am

Andrey Balan

LDEV-5397 minor bug fixes

Options
    • -1
    • +4
    ./css/components-learner.scss
  2. … 3 more files in changeset.
12:31 am

Andrey Balan

LDEV-5397 copy-tags

Options
    • -2
    • +1
    ./WEB-INF/tags/Comments.tag
    • -11
    • +10
    ./WEB-INF/tags/LeaderDisplay.tag
    • -1
    • +1
    ./WEB-INF/tags/Notebook.tag
    • -29
    • +47
    ./WEB-INF/tags/PageLearner.tag
    • -2
    • +2
    ./WEB-INF/tags/Rating5.tag
  6. … 154 more files in changeset.
12:20 am

Andrey Balan

LDEV-5397 Improve offcanvas progress bar + various other fixes as mentioned in the JIRA's comment

* Improved offcanvas progress bar:

icon for not completed activity should a hollow square, not a full one;

gate icons: hourglass icons replaced with locks;

support for long activity names;

tooltips on icon hover explaining what it means, for example “current activity”;

improved CSS

* Teams table should have maximum width and/or highlight on hover

* “Burning questions” button should have standard size (not small) and have the same primary colour as “Justification” button

* In burning questions summary the title does not have sufficient contrast

* In Chat the font should have standard and not reduced size

* In Daco there is an empty alert

* In Task List (and Share Resources) button to complete an item should say something like “Mark as completed” or “Complete” instead of “Completed”

* Admin pages: restored background colour to ghostly white

Options
    • -5
    • +17
    ./css/components-learner.scss
    • -1
    • +1
    ./grouping/show.jsp
    • -25
    • +51
    ./includes/javascript/learnerPage.js
    • -1
    • +1
    ./optionsActivity.jsp
  5. … 12 more files in changeset.
Thursday 14 Dec 2023
5:41 am

Andrey Balan

LDEV-5397 redesign "choose branch page". add modal confirmation dialog

* add onhover effect to choose group page

Options
    • -27
    • +29
    ./grouping/choose.jsp
    • -89
    • +116
    ./optionsActivity.jsp
Wednesday 13 Dec 2023
11:16 pm

Andrey Balan

LDEV-5397 standartize the way modal-dialogs look like

Options
    • -3
    • +6
    ./grouping/choose.jsp
  2. … 1 more file in changeset.
Wednesday 06 Dec 2023
10:46 am

Andrey Balan

LDEV-5397 fix lessonComplete.jsp title

Options
    • -1
    • +1
    ./lessonComplete.jsp
10:07 am

Andrey Balan

LDEV-5397 introduce hideHeader and hideTitle attributes to PageLearner tag

* bootstrap5 lessonIntro.jsp, loadToolActivity.jsp, and similar pages. Use new attributes there

Options
    • -131
    • +143
    ./WEB-INF/tags/PageLearner.tag
    • -86
    • +63
    ./loadToolActivity.jsp
  3. … 8 more files in changeset.
Tuesday 05 Dec 2023
6:01 am

Andrey Balan

LDEV-5397 add 'Enter' keypress handler to password gate

Options
    • -1
    • +1
    ./gate/gateNext.jsp
    • -0
    • +8
    ./gate/passwordGateContent.jsp
5:42 am

Andrey Balan

LDEV-5397 improve CSS of autosave notification

* make it identical in Scratchie and Assessment

Options
    • -0
    • +2
    ./css/components-learner.scss
  2. … 2 more files in changeset.
Thursday 30 Nov 2023
3:16 am

Andrey Balan

LDEV-5397 Q&A: prevent Refresh and Redo buttons being hidden

*remove hr from individual results page

Options
    • -8
    • +0
    ./css/components-learner.scss
  2. … 3 more files in changeset.
1:54 am

Andrey Balan

LDEV-5397 display gate alerts on top of the page

* combine them into single one where possible

Options
    • -7
    • +12
    ./gate/gateDescription.jsp
    • -14
    • +0
    ./gate/gateNext.jsp
    • -0
    • +2
    ./gate/permissionGateContent.jsp
    • -0
    • +1
    ./gate/scheduleGateContent.jsp
    • -8
    • +7
    ./gate/synchGateContent.jsp
  6. … 2 more files in changeset.
12:51 am

Andrey Balan

LDEV-5397 fix html header title

Options
    • -1
    • +11
    ./gate/conditionGateContent.jsp
    • -1
    • +11
    ./gate/passwordGateContent.jsp
    • -1
    • +11
    ./gate/permissionGateContent.jsp
    • -1
    • +11
    ./gate/scheduleGateContent.jsp
    • -1
    • +11
    ./gate/synchGateContent.jsp
Wednesday 22 Nov 2023
7:26 am

Andrey Balan

LDEV-5397 copy-tags

Options
    • -4
    • +2
    ./WEB-INF/tags/PageLearner.tag
    • -3
    • +3
    ./WEB-INF/tags/StyledRating5.tag
  3. … 62 more files in changeset.
4:44 am

Andrey Balan

LDEV-5397 import bootstrap5.scss into components.scss

* Subsequently import components.scss into components-learner.scss

* It will allow using bootstrap5 CSS rules in components CSS classes

Options
    • -3
    • +1
    ./WEB-INF/tags/PageLearner.tag
    • -14
    • +3
    ./css/components-learner.scss
  3. … 48 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-INF/tags/PageLearner.tag
    • -78
    • +35
    ./includes/javascript/learnerPage.js
  3. … 35 more files in changeset.
7:28 am

Marcin Cieslak

Merge v4.7 into LDEV-5397

Options
    • -97
    • +45
    ./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-INF/tags/Alert5.tag
    • -15
    • +12
    ./WEB-INF/tags/NotebookReedit.tag
    • -12
    • +6
    ./WEB-INF/tags/Rating5.tag
    • -4
    • +4
    ./WEB-INF/tags/StyledRating5.tag
  5. … 123 more files in changeset.