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
Friday 09 Oct 2020
10:26 pm

Marcin Cieslak

Merge branch 'LDEV-5091' into v4.0

Options
10:25 pm

Marcin Cieslak

LDEV-5091 Initialise Etherpads on Discussion panel expand

Options
    • -6
    • +17
    /lams_admin/web/WEB-INF/tags/Etherpad.tag
    • -6
    • +17
    /lams_central/web/WEB-INF/tags/Etherpad.tag
    • -6
    • +17
    /lams_gradebook/web/WEB-INF/tags/Etherpad.tag
    • -6
    • +17
    /lams_learning/web/WEB-INF/tags/Etherpad.tag
    • -6
    • +17
    /lams_monitoring/web/WEB-INF/tags/Etherpad.tag
    • -6
    • +17
    /lams_tool_assessment/web/WEB-INF/tags/Etherpad.tag
    • -0
    • +10
    /lams_tool_assessment/web/pages/learning/learning.jsp
    • -2
    • +2
    /lams_tool_assessment/web/pages/learning/parts/allquestions.jsp
    • -2
    • +12
    /lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp
    • -6
    • +17
    /lams_tool_chat/web/WEB-INF/tags/Etherpad.tag
    • -6
    • +17
    /lams_tool_daco/web/WEB-INF/tags/Etherpad.tag
    • -6
    • +17
    /lams_tool_doku/web/WEB-INF/tags/Etherpad.tag
    • -6
    • +17
    /lams_tool_forum/web/WEB-INF/tags/Etherpad.tag
    • -6
    • +17
    /lams_tool_gmap/web/WEB-INF/tags/Etherpad.tag
    • -6
    • +17
    /lams_tool_images/web/WEB-INF/tags/Etherpad.tag
  16. … 22 more files in changeset.
7:36 pm

Marcin Cieslak

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

Conflicts:

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/util/AssessmentEscapeUtils.java

Options
    • -1
    • +3
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/util/AssessmentEscapeUtils.java
7:34 pm

Marcin Cieslak

Merge branch 'LDEV-5090'

Options
7:34 pm

Marcin Cieslak

LDEV-5090 Use "-" char when displaying blank Essay answer

Options
    • -6
    • +5
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/util/AssessmentEscapeUtils.java
1:32 pm

Marcin Cieslak

LDEV-5083 Refactor sidebar and top menu. Add custom tags.

Conflicts:

lams_central/web/css/components.css

lams_monitoring/web/WEB-INF/tlds/lams/lams.tld

Options
    • -0
    • +619
    /lams_central/web/css/components.css
    • -0
    • +40
    /lams_monitoring/web/WEB-INF/tags/Dropdown.tag
    • -0
    • +41
    /lams_monitoring/web/WEB-INF/tags/Input.tag
    • -0
    • +29
    /lams_monitoring/web/WEB-INF/tags/PageComponent.tag
    • -0
    • +76
    /lams_monitoring/web/WEB-INF/tags/Panel.tag
    • -0
    • +40
    /lams_monitoring/web/WEB-INF/tags/Switch.tag
    • -0
    • +20
    /lams_monitoring/web/WEB-INF/tlds/lams/lams.tld
    • -197
    • +36
    /lams_monitoring/web/css/components-monitoring.css
    • -11
    • +14
    /lams_monitoring/web/monitor5.jsp
1:32 pm

Marcin Cieslak

LDEV-5083 Refactor sidebar and top menu. Add custom tags.

Options
    • -55
    • +145
    /lams_central/web/css/components.css
    • -0
    • +40
    /lams_monitoring/web/WEB-INF/tags/Dropdown.tag
    • -0
    • +41
    /lams_monitoring/web/WEB-INF/tags/Input.tag
    • -0
    • +29
    /lams_monitoring/web/WEB-INF/tags/PageComponent.tag
    • -0
    • +76
    /lams_monitoring/web/WEB-INF/tags/Panel.tag
    • -0
    • +40
    /lams_monitoring/web/WEB-INF/tags/Switch.tag
    • -1
    • +20
    /lams_monitoring/web/WEB-INF/tlds/lams/lams.tld
    • -197
    • +36
    /lams_monitoring/web/css/components-monitoring.css
    • -11
    • +14
    /lams_monitoring/web/monitor5.jsp
Thursday 08 Oct 2020
9:36 pm

Marcin Cieslak

LDEV-5083 Add non-standard fonts

Options
    • binary
    /lams_central/web/includes/fonts/FontsFree-Net-Mont-Bold.ttf
    • binary
    /lams_central/web/includes/fonts/FontsFree-Net-Mont1.ttf
    • binary
    /lams_central/web/includes/fonts/mont-semibold.ttf
    • -3
    • +3
    /lams_monitoring/web/css/components-monitoring.css
9:36 pm

Marcin Cieslak

LDEV-5083 Add non-standard fonts

Options
    • binary
    /lams_central/web/includes/fonts/FontsFree-Net-Mont-Bold.ttf
    • binary
    /lams_central/web/includes/fonts/FontsFree-Net-Mont1.ttf
    • binary
    /lams_central/web/includes/fonts/mont-semibold.ttf
    • -3
    • +3
    /lams_monitoring/web/css/components-monitoring.css
9:28 pm

Marcin Cieslak

LDEV-5083 Add redesign CSS files otherwise ignored by git

Options
    • -0
    • +1
    /lams_monitoring/.gitignore
    • -0
    • +107
    /lams_monitoring/web/css/components-monitoring-responsive.css
    • -0
    • +1078
    /lams_monitoring/web/css/components-monitoring.css
9:28 pm

Marcin Cieslak

LDEV-5083 Add redesign CSS files otherwise ignored by git

Options
    • -0
    • +1
    /lams_monitoring/.gitignore
    • -0
    • +107
    /lams_monitoring/web/css/components-monitoring-responsive.css
    • -0
    • +1078
    /lams_monitoring/web/css/components-monitoring.css
2:03 am

Marcin Cieslak

Merge branch 'LDEV-5089' into v4.0

Options
2:03 am

Marcin Cieslak

LDEV-5089 Prevent scratching until Ajax response is received

Options
    • -1
    • +24
    /lams_tool_scratchie/web/pages/learning/learning.jsp
Wednesday 07 Oct 2020
11:59 pm

Marcin Cieslak

Merge branch 'LDEV-5087' into v4.0

Options
11:59 pm

Marcin Cieslak

LDEV-5087 Do not show question title on Assessment results screen

Options
    • -3
    • +3
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
    • -4
    • +8
    /lams_tool_assessment/web/pages/learning/results/allquestions.jsp
3:33 am

Marcin Cieslak

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

Options
    • -4
    • +3
    /lams_admin/web/WEB-INF/tags/CKEditor.tag
    • -4
    • +3
    /lams_central/web/WEB-INF/tags/CKEditor.tag
    • -4
    • +3
    /lams_gradebook/web/WEB-INF/tags/CKEditor.tag
    • -4
    • +3
    /lams_learning/web/WEB-INF/tags/CKEditor.tag
    • -4
    • +3
    /lams_monitoring/web/WEB-INF/tags/CKEditor.tag
    • -4
    • +3
    /lams_tool_assessment/web/WEB-INF/tags/CKEditor.tag
    • -4
    • +3
    /lams_tool_chat/web/WEB-INF/tags/CKEditor.tag
    • -4
    • +3
    /lams_tool_daco/web/WEB-INF/tags/CKEditor.tag
    • -4
    • +3
    /lams_tool_doku/web/WEB-INF/tags/CKEditor.tag
    • -4
    • +3
    /lams_tool_forum/web/WEB-INF/tags/CKEditor.tag
    • -4
    • +3
    /lams_tool_gmap/web/WEB-INF/tags/CKEditor.tag
    • -4
    • +3
    /lams_tool_images/web/WEB-INF/tags/CKEditor.tag
    • -4
    • +3
    /lams_tool_imscc/web/WEB-INF/tags/CKEditor.tag
    • -4
    • +3
    /lams_tool_lamc/web/WEB-INF/tags/CKEditor.tag
    • -4
    • +3
    /lams_tool_laqa/web/WEB-INF/tags/CKEditor.tag
  16. … 17 more files in changeset.
3:25 am

Marcin Cieslak

LDEV-5085 Run CKEditor initialisation immediately

If CKEditor.tag is loaded dynamically, binding it to page load event

does not work.

Options
    • -4
    • +2
    /lams_admin/web/WEB-INF/tags/CKEditor.tag
    • -4
    • +2
    /lams_central/web/WEB-INF/tags/CKEditor.tag
    • -4
    • +2
    /lams_gradebook/web/WEB-INF/tags/CKEditor.tag
    • -4
    • +2
    /lams_learning/web/WEB-INF/tags/CKEditor.tag
    • -4
    • +2
    /lams_monitoring/web/WEB-INF/tags/CKEditor.tag
    • -4
    • +2
    /lams_tool_assessment/web/WEB-INF/tags/CKEditor.tag
    • -4
    • +2
    /lams_tool_chat/web/WEB-INF/tags/CKEditor.tag
    • -4
    • +2
    /lams_tool_daco/web/WEB-INF/tags/CKEditor.tag
    • -4
    • +2
    /lams_tool_doku/web/WEB-INF/tags/CKEditor.tag
    • -4
    • +2
    /lams_tool_forum/web/WEB-INF/tags/CKEditor.tag
    • -4
    • +2
    /lams_tool_gmap/web/WEB-INF/tags/CKEditor.tag
    • -4
    • +2
    /lams_tool_images/web/WEB-INF/tags/CKEditor.tag
    • -4
    • +2
    /lams_tool_imscc/web/WEB-INF/tags/CKEditor.tag
    • -4
    • +2
    /lams_tool_lamc/web/WEB-INF/tags/CKEditor.tag
    • -4
    • +2
    /lams_tool_laqa/web/WEB-INF/tags/CKEditor.tag
  16. … 17 more files in changeset.
Monday 05 Oct 2020
6:16 pm

Marcin Cieslak

LDEV-4425 Do not escape user names. Add padding to portrait.

Options
    • -4
    • +4
    /lams_admin/web/WEB-INF/tags/StyledRating.tag
    • -4
    • +4
    /lams_central/web/WEB-INF/tags/StyledRating.tag
    • -4
    • +4
    /lams_gradebook/web/WEB-INF/tags/StyledRating.tag
    • -4
    • +4
    /lams_learning/web/WEB-INF/tags/StyledRating.tag
    • -4
    • +4
    /lams_monitoring/web/WEB-INF/tags/StyledRating.tag
    • -4
    • +4
    /lams_tool_assessment/web/WEB-INF/tags/StyledRating.tag
    • -4
    • +4
    /lams_tool_chat/web/WEB-INF/tags/StyledRating.tag
    • -4
    • +4
    /lams_tool_daco/web/WEB-INF/tags/StyledRating.tag
    • -4
    • +4
    /lams_tool_doku/web/WEB-INF/tags/StyledRating.tag
    • -4
    • +4
    /lams_tool_forum/web/WEB-INF/tags/StyledRating.tag
    • -4
    • +4
    /lams_tool_gmap/web/WEB-INF/tags/StyledRating.tag
    • -4
    • +4
    /lams_tool_images/web/WEB-INF/tags/StyledRating.tag
    • -4
    • +4
    /lams_tool_imscc/web/WEB-INF/tags/StyledRating.tag
    • -4
    • +4
    /lams_tool_lamc/web/WEB-INF/tags/StyledRating.tag
    • -4
    • +4
    /lams_tool_laqa/web/WEB-INF/tags/StyledRating.tag
  16. … 17 more files in changeset.
12:27 pm

Marcin Cieslak

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

Options
    • -21
    • +25
    /lams_admin/web/WEB-INF/tags/CKEditor.tag
    • -21
    • +25
    /lams_central/web/WEB-INF/tags/CKEditor.tag
    • -21
    • +25
    /lams_gradebook/web/WEB-INF/tags/CKEditor.tag
    • -21
    • +25
    /lams_learning/web/WEB-INF/tags/CKEditor.tag
    • -21
    • +25
    /lams_monitoring/web/WEB-INF/tags/CKEditor.tag
    • -21
    • +25
    /lams_tool_assessment/web/WEB-INF/tags/CKEditor.tag
    • -21
    • +25
    /lams_tool_chat/web/WEB-INF/tags/CKEditor.tag
    • -21
    • +25
    /lams_tool_daco/web/WEB-INF/tags/CKEditor.tag
    • -21
    • +25
    /lams_tool_doku/web/WEB-INF/tags/CKEditor.tag
    • -21
    • +25
    /lams_tool_forum/web/WEB-INF/tags/CKEditor.tag
    • -21
    • +25
    /lams_tool_gmap/web/WEB-INF/tags/CKEditor.tag
    • -21
    • +25
    /lams_tool_images/web/WEB-INF/tags/CKEditor.tag
    • -21
    • +25
    /lams_tool_imscc/web/WEB-INF/tags/CKEditor.tag
    • -21
    • +25
    /lams_tool_lamc/web/WEB-INF/tags/CKEditor.tag
    • -21
    • +25
    /lams_tool_laqa/web/WEB-INF/tags/CKEditor.tag
  16. … 17 more files in changeset.
12:20 pm

Marcin Cieslak

Merge branch 'LDEV-5085'

Options
12:19 pm

Marcin Cieslak

LDEV-5085 Make editor init method parametrized

It seems that multiple instances of CKEditor tag were interacting with

each other, probably with request attributes. Now initialisation method

is parametrised so CKEditor starts with own set of attributes.

Options
    • -22
    • +28
    /lams_admin/web/WEB-INF/tags/CKEditor.tag
    • -22
    • +28
    /lams_central/web/WEB-INF/tags/CKEditor.tag
    • -22
    • +28
    /lams_gradebook/web/WEB-INF/tags/CKEditor.tag
    • -22
    • +28
    /lams_learning/web/WEB-INF/tags/CKEditor.tag
    • -22
    • +28
    /lams_monitoring/web/WEB-INF/tags/CKEditor.tag
    • -22
    • +28
    /lams_tool_assessment/web/WEB-INF/tags/CKEditor.tag
    • -22
    • +28
    /lams_tool_chat/web/WEB-INF/tags/CKEditor.tag
    • -22
    • +28
    /lams_tool_daco/web/WEB-INF/tags/CKEditor.tag
    • -22
    • +28
    /lams_tool_doku/web/WEB-INF/tags/CKEditor.tag
    • -22
    • +28
    /lams_tool_forum/web/WEB-INF/tags/CKEditor.tag
    • -22
    • +28
    /lams_tool_gmap/web/WEB-INF/tags/CKEditor.tag
    • -22
    • +28
    /lams_tool_images/web/WEB-INF/tags/CKEditor.tag
    • -22
    • +28
    /lams_tool_imscc/web/WEB-INF/tags/CKEditor.tag
    • -22
    • +28
    /lams_tool_lamc/web/WEB-INF/tags/CKEditor.tag
    • -22
    • +28
    /lams_tool_laqa/web/WEB-INF/tags/CKEditor.tag
  16. … 17 more files in changeset.
Sunday 04 Oct 2020
2:09 pm

Marcin Cieslak

LDEV-5083 Initial refactoring of redesigned monitoring into LAMS 5 JSP

Options
    • -0
    • +1
    /lams_central/web/css/components-timeline.css
    • binary
    /lams_central/web/images/components/001.png
    • -0
    • +8
    /lams_central/web/images/components/001.svg
    • binary
    /lams_central/web/images/components/002.png
    • binary
    /lams_central/web/images/components/003.png
    • binary
    /lams_central/web/images/components/004.png
    • -0
    • +4
    /lams_central/web/images/components/cd-icon-location.svg
    • -0
    • +4
    /lams_central/web/images/components/cd-icon-movie.svg
    • -0
    • +5
    /lams_central/web/images/components/cd-icon-picture.svg
    • binary
    /lams_central/web/images/components/icon1.png
    • binary
    /lams_central/web/images/components/icon2.png
    • binary
    /lams_central/web/images/components/img2.png
    • binary
    /lams_central/web/images/components/star.png
    • -1
    • +1
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
    • -61
    • +0
    /lams_monitoring/web/assets/styles/main.css
  16. … 3 more files in changeset.
2:09 pm

Marcin Cieslak

LDEV-5083 Initial refactoring of redesigned monitoring into LAMS 5 JSP

Options
    • -0
    • +1
    /lams_central/web/css/components-timeline.css
    • binary
    /lams_central/web/images/components/001.png
    • -0
    • +8
    /lams_central/web/images/components/001.svg
    • binary
    /lams_central/web/images/components/002.png
    • binary
    /lams_central/web/images/components/003.png
    • binary
    /lams_central/web/images/components/004.png
    • -0
    • +4
    /lams_central/web/images/components/cd-icon-location.svg
    • -0
    • +4
    /lams_central/web/images/components/cd-icon-movie.svg
    • -0
    • +5
    /lams_central/web/images/components/cd-icon-picture.svg
    • binary
    /lams_central/web/images/components/icon1.png
    • binary
    /lams_central/web/images/components/icon2.png
    • binary
    /lams_central/web/images/components/img2.png
    • binary
    /lams_central/web/images/components/star.png
    • -1
    • +1
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
    • -61
    • +0
    /lams_monitoring/web/assets/styles/main.css
  16. … 3 more files in changeset.
10:29 am

Ernie Ghiglione

LDEV-4769 Updating labels Green, Norwegian, English

Options
    • -0
    • +1
    /lams_admin/conf/language/lams/ApplicationResources_el_GR.properties
    • -5
    • +5
    /lams_central/conf/language/lams/ApplicationResources_el_GR.properties
    • -6
    • +6
    /lams_learning/conf/language/lams/ApplicationResources_el_GR.properties
    • -1
    • +1
    /lams_monitoring/conf/language/lams/ApplicationResources_el_GR.properties
    • -0
    • +1
    /lams_tool_scratchie/conf/language/lams/ApplicationResources.properties
    • -0
    • +1
    /lams_tool_scratchie/conf/language/lams/ApplicationResources_el_GR.properties
    • -0
    • +1
    /lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +1
    /lams_tool_scratchie/conf/language/lams/ApplicationResources_es_ES.properties
    • -0
    • +1
    /lams_tool_scratchie/conf/language/lams/ApplicationResources_no_NO.properties
Saturday 03 Oct 2020
2:02 am

Marcin Cieslak

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

Options
    • -1
    • +1
    /lams_central/web/lti/addLesson.jsp
2:01 am

Marcin Cieslak

LDEV-5084 Identify the button to disable correctly

Options
    • -1
    • +1
    /lams_central/web/lti/addLesson.jsp
Friday 02 Oct 2020
10:53 pm

Marcin Cieslak

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

Options
    • -1
    • +1
    /lams_build/3rdParty.userlibraries
    • -1
    • +6
    /lams_central/web/lti/addLesson.jsp
10:51 pm

Marcin Cieslak

LDEV-5084 Disable Save button on LTI lesson create

Fetching memberships can take a while and an user can double click the

button.

Options
    • -1
    • +1
    /lams_build/3rdParty.userlibraries
    • -1
    • +6
    /lams_central/web/lti/addLesson.jsp
9:09 pm

Marcin Cieslak

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

Conflicts:

lams_common/src/java/org/lamsfoundation/lams/integration/service/IIntegrationService.java

Options
    • -0
    • +1
    /lams_central/web/lti/addLesson.jsp
    • -2
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/integration/service/IIntegrationService.java
    • -5
    • +12
    /lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java
9:08 pm

Marcin Cieslak

Merge branch 'LDEV-5084'

Options