lams-github

Clone Tools

Stats

Commits this week: 0
Total Committers: 50
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
Wednesday 14 Jul 2021
1:00 am

Marcin Cieslak

LDEV-5219 Skip gate check in preview lessons

Options
    • -1
    • +5
    /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
Tuesday 13 Jul 2021
6:25 pm

Marcin Cieslak

LDEV-5219 Check gate after Assessment + Notebook activity

Options
    • -0
    • +5
    /lams_tool_assessment/web/pages/learning/notebook.jsp
6:20 pm

Marcin Cieslak

LDEV-5219 Check gate after Daco activity

Options
    • -2
    • +7
    /lams_tool_daco/web/pages/learning/learning.jsp
    • -5
    • +8
    /lams_tool_daco/web/pages/learning/notebook.jsp
6:09 pm

Marcin Cieslak

LDEV-5219 Get user from session instead of parameter

Options
    • -3
    • +9
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/LearnerController.java
    • -2
    • +2
    /lams_learning/web/includes/javascript/gate-check.js
    • -1
    • +1
    /lams_tool_assessment/web/pages/learning/results.jsp
    • -1
    • +0
    /lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/controller/LearningController.java
    • -1
    • +1
    /lams_tool_chat/web/pages/learning/notebook.jsp
    • -1
    • +1
    /lams_tool_chat/web/pages/learning/parts/finishButton.jsp
6:02 pm

Marcin Cieslak

LDEV-5219 Check gate after Chat activity

Options
    • -3
    • +3
    /lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/controller/LearningController.java
    • -2
    • +6
    /lams_tool_chat/web/pages/learning/notebook.jsp
    • -1
    • +6
    /lams_tool_chat/web/pages/learning/parts/finishButton.jsp
6:01 pm

Marcin Cieslak

LDEV-5219 Adjust gate check JS code for <a> tags

Options
    • -4
    • +9
    /lams_learning/web/includes/javascript/gate-check.js
5:19 pm

Marcin Cieslak

LDEV-5219 Allow gate check after branching activity

Options
    • -0
    • +9
    /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
5:07 pm

Marcin Cieslak

LDEV-5219 Move next-gate check to learner module

It will be used in various tools so we need a central place to keep the

code.

Options
    • -0
    • +65
    /lams_learning/web/includes/javascript/gate-check.js
    • -46
    • +4
    /lams_tool_assessment/web/pages/learning/results.jsp
4:33 pm

Marcin Cieslak

LDEV-5219 Prevent incompatible state for schedule gate

Stop-at-preceding-activity option may prevent preceding activity from

completion, meaning that timer-from-previous-activity-completion will

never start.

Options
    • -1
    • +18
    /lams_central/web/includes/javascript/authoring/authoringProperty.js
4:15 pm

Marcin Cieslak

LDEV-5219 Display customised messages for various gate types

Move i18n labels from tool to Learning module so they are the same for

all tools.

Options
    • -2
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/ConditionGateActivity.java
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/GateActivity.java
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/PermissionGateActivity.java
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/ScheduleGateActivity.java
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
    • -0
    • +3
    /lams_learning/conf/language/lams/ApplicationResources.properties
    • -9
    • +7
    /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -5
    • +49
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/LearnerController.java
    • -2
    • +1
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -13
    • +23
    /lams_tool_assessment/web/pages/learning/results.jsp
3:11 am

Marcin Cieslak

LDEV-5219 Stop learner from advancing to a closed gate in Assessment

Options
    • -0
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java
    • -0
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/ConditionGateActivity.java
    • -0
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/PermissionGateActivity.java
    • -0
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/ScheduleGateActivity.java
    • -1
    • +40
    /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -0
    • +17
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/LearnerController.java
    • -0
    • +1
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -3
    • +34
    /lams_tool_assessment/web/pages/learning/results.jsp
2:03 am

Marcin Cieslak

LDEV-5219 Introduce stop-at-preceding-activity flag for some gates

Options
    • -0
    • +1
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -4
    • +10
    /lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
    • -7
    • +15
    /lams_central/web/authoring/authoring.jsp
    • -1
    • +5
    /lams_central/web/includes/javascript/authoring/authoringActivity.js
    • -11
    • +15
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
    • -11
    • +17
    /lams_central/web/includes/javascript/authoring/authoringProperty.js
    • -0
    • +15
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20210712.sql
    • -1
    • +12
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/GateActivity.java
    • -0
    • +11
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
    • -0
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/util/AuthoringJsonTags.java
Monday 12 Jul 2021
5:40 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/LDEV-5220' into v4.0

Options
Friday 09 Jul 2021
5:26 pm

Marcin Cieslak

LDEV-5220 Introduce LAMS popover tag

Options
    • -118
    • +0
    /lams_central/web/includes/javascript/doc-popover.js
    • -0
    • +137
    /lams_central/web/includes/javascript/popover-tag.js
    • -0
    • +31
    /lams_tool_assessment/web/WEB-INF/tags/Popover.tag
    • -0
    • +4
    /lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld
    • -32
    • +31
    /lams_tool_assessment/web/pages/monitoring/statisticpart.jsp
3:20 pm

Marcin Cieslak

LDEV-5200 Rearrange activities of pre-redesign LDs

Keep authoring 4.5 patch on top for future users' upgrades.

Options
    • -3
    • +3
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
    • -14
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20210615.sql
    • -0
    • +18
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20210709.sql
9:29 am

Ernie Ghiglione

LDEV-5155 adding labels from lokalise

Options
    • -9
    • +9
    /lams_tool_preview/conf/language/lams/ApplicationResources.properties
    • -0
    • +9
    /lams_tool_preview/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +9
    /lams_tool_preview/conf/language/lams/ApplicationResources_es_ES.properties
Thursday 08 Jul 2021
8:30 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/v4.0' into v4.5

Options
8:29 pm

Marcin Cieslak

LDEV-5095 Rewrite Scratchie chart to currently used Chart JS

Old version of Chart JS overlapped with the newer one in TBL monitoring,

preventing charts from being displayed correctly. Since only one chart

in LAMS was using the old library version, it was rewritten and the old

library was removed.

Options
    • -11
    • +0
    /lams_central/web/includes/javascript/chartjs.js
    • -27
    • +38
    /lams_tool_scratchie/web/pages/tblmonitoring/tra.jsp
1:08 am

Marcin Cieslak

LDEV-5155 Bump DB patch version so it kicks in after all existing ones

Options
    • -27
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20210319.sql
    • -0
    • +27
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20210701.sql
Tuesday 06 Jul 2021
6:26 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/v4.0' into v4.5

Options
    • -3
    • +4
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -0
    • +4
    /lams_central/conf/language/lams/ApplicationResources_el_GR.properties
    • -0
    • +4
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +4
    /lams_central/conf/language/lams/ApplicationResources_es_ES.properties
    • -0
    • +4
    /lams_central/conf/language/lams/ApplicationResources_no_NO.properties
6:07 pm

Marcin Cieslak

Merge branch 'LDEV-5155' into v4.0

Options
    • -1
    • +1
    /lams_admin/web/WEB-INF/tags/Page.tag
    • -1
    • +1
    /lams_central/web/WEB-INF/tags/Page.tag
    • -1
    • +1
    /lams_gradebook/web/WEB-INF/tags/Page.tag
    • -1
    • +1
    /lams_learning/web/WEB-INF/tags/Page.tag
    • -1
    • +1
    /lams_monitoring/web/WEB-INF/tags/Page.tag
    • -1
    • +1
    /lams_tool_assessment/web/WEB-INF/tags/Page.tag
    • -1
    • +1
    /lams_tool_chat/web/WEB-INF/tags/Page.tag
    • -1
    • +1
    /lams_tool_daco/web/WEB-INF/tags/Page.tag
    • -1
    • +1
    /lams_tool_doku/web/WEB-INF/tags/Page.tag
    • -1
    • +1
    /lams_tool_forum/web/WEB-INF/tags/Page.tag
    • -1
    • +1
    /lams_tool_gmap/web/WEB-INF/tags/Page.tag
    • -1
    • +1
    /lams_tool_images/web/WEB-INF/tags/Page.tag
    • -1
    • +1
    /lams_tool_imscc/web/WEB-INF/tags/Page.tag
    • -1
    • +1
    /lams_tool_lamc/web/WEB-INF/tags/Page.tag
    • -1
    • +1
    /lams_tool_laqa/web/WEB-INF/tags/Page.tag
  16. … 19 more files in changeset.
5:53 pm

Marcin Cieslak

LDEV-5155 Fix a broken i18n label

Options
    • -1
    • +1
    /lams_tool_scratchie/conf/language/lams/ApplicationResources.properties
5:49 pm

Marcin Cieslak

LDEV-5155 Get necessary rubrics data for TBL monitoring

Options
    • -2
    • +9
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/IPeerreviewService.java
    • -0
    • +45
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java
    • -52
    • +4
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/controller/MonitoringController.java
    • -5
    • +19
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/controller/TblMonitoringController.java
5:45 pm

Marcin Cieslak

LDEV-5155 Scroll to email preview area on its open

Options
    • -0
    • +2
    /lams_tool_preview/web/pages/monitoring/criteriapart.jsp
    • -0
    • +2
    /lams_tool_preview/web/pages/monitoring/rubricspart.jsp
5:39 pm

Marcin Cieslak

LDEV-5155 Display email preview in corresponding group

Options
    • -0
    • +1
    /lams_tool_preview/conf/language/lams/ApplicationResources.properties
    • -30
    • +47
    /lams_tool_preview/web/pages/monitoring/criteriapart.jsp
    • -1
    • +1
    /lams_tool_preview/web/pages/monitoring/emailpreview.jsp
    • -27
    • +46
    /lams_tool_preview/web/pages/monitoring/rubricspart.jsp
    • -7
    • +11
    /lams_tool_preview/web/pages/monitoring/summary.jsp
4:36 pm

Marcin Cieslak

LDEV-5220 Add close button to popovers

Options
    • -3
    • +19
    /lams_central/web/includes/javascript/doc-popover.js
4:01 pm

Marcin Cieslak

LDEV-5220 Make popover more accessible

Options
    • -53
    • +67
    /lams_central/web/includes/javascript/doc-popover.js
    • -7
    • +7
    /lams_tool_assessment/web/pages/monitoring/statisticpart.jsp
3:43 pm

Marcin Cieslak

LDEV-5220 Prevent popover buttons to be decorated with collapse arrow

Options
    • -2
    • +2
    /lams_central/web/css/_learner_base.scss
3:29 pm

Marcin Cieslak

LDEV-5220 Dismiss popover on a click outside of its box

Options
    • -0
    • +26
    /lams_central/web/includes/javascript/doc-popover.js
11:47 am

Ernie Ghiglione

LDEV-4769 Updating Greek, English, Spanish, Norwegian

Options
    • -0
    • +2
    /lams_admin/conf/language/lams/ApplicationResources_es_ES.properties
    • -7
    • +4
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -0
    • +4
    /lams_central/conf/language/lams/ApplicationResources_el_GR.properties
    • -0
    • +4
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +4
    /lams_central/conf/language/lams/ApplicationResources_es_ES.properties
    • -0
    • +4
    /lams_central/conf/language/lams/ApplicationResources_no_NO.properties
    • -0
    • +1
    /lams_tool_assessment/conf/language/lams/ApplicationResources_el_GR.properties
    • -3
    • +3
    /lams_tool_assessment/conf/language/lams/ApplicationResources_es_ES.properties
    • -0
    • +1
    /lams_tool_preview/conf/language/lams/ApplicationResources_es_ES.properties
    • -3
    • +3
    /lams_tool_scratchie/conf/language/lams/ApplicationResources.properties
    • -3
    • +3
    /lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties
    • -3
    • +3
    /lams_tool_scratchie/conf/language/lams/ApplicationResources_es_ES.properties
    • -0
    • +1
    /lams_tool_whiteboard/conf/language/lams/ApplicationResources_el_GR.properties