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
Monday 20 Apr 2020
8:46 pm

Marcin Cieslak

LDEV-5002 Distribute Etherpad tag to all projects

Options
    • -0
    • +98
    /lams_admin/web/WEB-INF/tags/Etherpad.tag
    • -37
    • +37
    /lams_admin/web/WEB-INF/tags/ImgButtonWrapper.tag
    • -0
    • +4
    /lams_admin/web/WEB-INF/tlds/lams/lams.tld
    • -0
    • +98
    /lams_central/web/WEB-INF/tags/Etherpad.tag
    • -0
    • +4
    /lams_central/web/WEB-INF/tlds/lams/lams.tld
    • -0
    • +98
    /lams_gradebook/web/WEB-INF/tags/Etherpad.tag
    • -37
    • +37
    /lams_gradebook/web/WEB-INF/tags/ImgButtonWrapper.tag
    • -0
    • +4
    /lams_gradebook/web/WEB-INF/tlds/lams/lams.tld
    • -0
    • +98
    /lams_learning/web/WEB-INF/tags/Etherpad.tag
    • -37
    • +37
    /lams_learning/web/WEB-INF/tags/ImgButtonWrapper.tag
    • -0
    • +4
    /lams_learning/web/WEB-INF/tlds/lams/lams.tld
    • -0
    • +98
    /lams_monitoring/web/WEB-INF/tags/Etherpad.tag
    • -37
    • +37
    /lams_monitoring/web/WEB-INF/tags/ImgButtonWrapper.tag
    • -0
    • +4
    /lams_monitoring/web/WEB-INF/tlds/lams/lams.tld
    • -0
    • +98
    /lams_tool_assessment/web/WEB-INF/tags/Etherpad.tag
  16. … 74 more files in changeset.
8:46 pm

Marcin Cieslak

LDEV-5002 Distribute Etherpad tag to all projects

Options
    • -0
    • +98
    /lams_admin/web/WEB-INF/tags/Etherpad.tag
    • -37
    • +37
    /lams_admin/web/WEB-INF/tags/ImgButtonWrapper.tag
    • -0
    • +4
    /lams_admin/web/WEB-INF/tlds/lams/lams.tld
    • -0
    • +98
    /lams_central/web/WEB-INF/tags/Etherpad.tag
    • -0
    • +4
    /lams_central/web/WEB-INF/tlds/lams/lams.tld
    • -0
    • +98
    /lams_gradebook/web/WEB-INF/tags/Etherpad.tag
    • -37
    • +37
    /lams_gradebook/web/WEB-INF/tags/ImgButtonWrapper.tag
    • -0
    • +4
    /lams_gradebook/web/WEB-INF/tlds/lams/lams.tld
    • -0
    • +98
    /lams_learning/web/WEB-INF/tags/Etherpad.tag
    • -37
    • +37
    /lams_learning/web/WEB-INF/tags/ImgButtonWrapper.tag
    • -0
    • +4
    /lams_learning/web/WEB-INF/tlds/lams/lams.tld
    • -0
    • +98
    /lams_monitoring/web/WEB-INF/tags/Etherpad.tag
    • -37
    • +37
    /lams_monitoring/web/WEB-INF/tags/ImgButtonWrapper.tag
    • -0
    • +4
    /lams_monitoring/web/WEB-INF/tlds/lams/lams.tld
    • -0
    • +98
    /lams_tool_assessment/web/WEB-INF/tags/Etherpad.tag
  16. … 74 more files in changeset.
6:56 pm

Marcin Cieslak

Merge branch 'LDEV-4999' into v4.0

Options
6:56 pm

Marcin Cieslak

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

Conflicts:

lams_admin/conf/language/lams/ApplicationResources_el_GR.properties

lams_admin/conf/language/lams/ApplicationResources_es_ES.properties

Options
    • -0
    • +5
    /lams_admin/conf/language/lams/ApplicationResources_el_GR.properties
    • -0
    • +2
    /lams_admin/conf/language/lams/ApplicationResources_es_ES.properties
6:55 pm

Marcin Cieslak

LDEV-4999 Allow marks update in Dokuy monitoring summary page

Options
    • -0
    • +1
    /lams_central/conf/security/Owasp.CsrfGuard.properties
    • -0
    • +4
    /lams_central/web/includes/javascript/jquery.tablesorter-editable.js
    • -0
    • +2
    /lams_tool_doku/conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +46
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/MonitoringController.java
    • -13
    • +68
    /lams_tool_doku/web/pages/monitoring/summary.jsp
5:00 pm

Ernie Ghiglione

LDEV-4995 fixed userorgrole page

Options
    • -0
    • +1
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRoleController.java
    • -55
    • +65
    /lams_admin/web/userorgrole.jsp
Sunday 19 Apr 2020
7:04 pm

Marcin Cieslak

SP-4 Fix an entity processing bug

Options
    • -2
    • +2
    /lams_central/src/java/org/lamsfoundation/lams/webservice/SPEnrolmentServlet.java
3:14 pm

Ernie Ghiglione

LDEV-4989 Password Gate initial implementation

Reverting random string in page

Options
    • -1
    • +0
    /lams_monitoring/web/monitor.jsp
12:39 pm

Marcin Cieslak

SP-4 In every mode inform that processing finished successfuly

Options
    • -0
    • +2
    /lams_central/src/java/org/lamsfoundation/lams/webservice/SPEnrolmentServlet.java
Saturday 18 Apr 2020
2:23 pm

Marcin Cieslak

LDEV-4999 Display users in tablesorter in Doku monitoring summary

Options
    • -0
    • +6
    /lams_tool_doku/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +69
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/MonitoringController.java
    • -0
    • +90
    /lams_tool_doku/web/pages/monitoring/summary.jsp
Friday 17 Apr 2020
10:10 pm

Marcin Cieslak

SP-4 Add group manager processing

Options
    • -34
    • +145
    /lams_central/src/java/org/lamsfoundation/lams/webservice/SPEnrolmentServlet.java
1:47 pm

Marcin Cieslak

LDEV-4997 Fetch API key for every call as it can change in config

Options
    • -13
    • +8
    /lams_common/src/java/org/lamsfoundation/lams/etherpad/service/EtherpadService.java
1:47 pm

Marcin Cieslak

LDEV-4997 Fetch API key for every call as it can change in config

Options
    • -13
    • +8
    /lams_common/src/java/org/lamsfoundation/lams/etherpad/service/EtherpadService.java
1:35 pm

Marcin Cieslak

LDEV-4996 Fix a typo preventing Etherpad module from loading

Options
    • -2
    • +3
    /lams_build/conf/etherpad/etherpad-lite/src/static/js/ace2_inner.js
1:35 pm

Marcin Cieslak

LDEV-4996 Fix a typo preventing Etherpad module from loading

Options
    • -2
    • +3
    /lams_build/conf/etherpad/etherpad-lite/src/static/js/ace2_inner.js
Thursday 16 Apr 2020
8:09 pm

Marcin Cieslak

LDEV-4997 Move Etherpad custom files to central

Options
    • -0
    • +70
    /lams_build/conf/etherpad/etherpad-lite/node_modules/ep_resize/static/js/index.js
    • -0
    • +535
    /lams_build/conf/etherpad/etherpad-lite/settings.json
    • -0
    • +242
    /lams_build/conf/etherpad/etherpad-lite/src/node/db/AuthorManager.js
    • -0
    • +5512
    /lams_build/conf/etherpad/etherpad-lite/src/static/js/ace2_inner.js
    • -0
    • +950
    /lams_build/conf/etherpad/etherpad-lite/src/static/js/pad.js
    • -0
    • +855
    /lams_build/conf/etherpad/etherpad-lite/src/static/js/pad_userlist.js
    • -0
    • +22
    /lams_build/conf/etherpad/readme.txt
    • -70
    • +0
    /lams_tool_doku/conf/etherpad-lite/node_modules/ep_resize/static/js/index.js
    • -535
    • +0
    /lams_tool_doku/conf/etherpad-lite/settings.json
    • -242
    • +0
    /lams_tool_doku/conf/etherpad-lite/src/node/db/AuthorManager.js
    • -5512
    • +0
    /lams_tool_doku/conf/etherpad-lite/src/static/js/ace2_inner.js
    • -950
    • +0
    /lams_tool_doku/conf/etherpad-lite/src/static/js/pad.js
    • -855
    • +0
    /lams_tool_doku/conf/etherpad-lite/src/static/js/pad_userlist.js
    • -20
    • +0
    /lams_tool_doku/readme.txt
8:09 pm

Marcin Cieslak

LDEV-4997 Move Etherpad custom files to central

Options
    • -0
    • +70
    /lams_build/conf/etherpad/etherpad-lite/node_modules/ep_resize/static/js/index.js
    • -0
    • +535
    /lams_build/conf/etherpad/etherpad-lite/settings.json
    • -0
    • +242
    /lams_build/conf/etherpad/etherpad-lite/src/node/db/AuthorManager.js
    • -0
    • +5512
    /lams_build/conf/etherpad/etherpad-lite/src/static/js/ace2_inner.js
    • -0
    • +950
    /lams_build/conf/etherpad/etherpad-lite/src/static/js/pad.js
    • -0
    • +855
    /lams_build/conf/etherpad/etherpad-lite/src/static/js/pad_userlist.js
    • -0
    • +22
    /lams_build/conf/etherpad/readme.txt
    • -70
    • +0
    /lams_tool_doku/conf/etherpad-lite/node_modules/ep_resize/static/js/index.js
    • -535
    • +0
    /lams_tool_doku/conf/etherpad-lite/settings.json
    • -242
    • +0
    /lams_tool_doku/conf/etherpad-lite/src/node/db/AuthorManager.js
    • -5512
    • +0
    /lams_tool_doku/conf/etherpad-lite/src/static/js/ace2_inner.js
    • -950
    • +0
    /lams_tool_doku/conf/etherpad-lite/src/static/js/pad.js
    • -855
    • +0
    /lams_tool_doku/conf/etherpad-lite/src/static/js/pad_userlist.js
    • -20
    • +0
    /lams_tool_doku/readme.txt
8:03 pm

Marcin Cieslak

LDEV-4996 Adjust Etherpad customised files for version 1.8.0

Options
    • -0
    • +535
    /lams_tool_doku/conf/etherpad-lite/settings.json
    • -157
    • +123
    /lams_tool_doku/conf/etherpad-lite/src/node/db/AuthorManager.js
    • -444
    • +0
    /lams_tool_doku/conf/etherpad-lite/src/node/utils/Settings.js
    • -13
    • +4
    /lams_tool_doku/conf/etherpad-lite/src/static/js/ace2_inner.js
    • -36
    • +39
    /lams_tool_doku/conf/etherpad-lite/src/static/js/pad.js
    • -2
    • +3
    /lams_tool_doku/conf/etherpad-lite/src/static/js/pad_userlist.js
    • -2
    • +2
    /lams_tool_doku/readme.txt
8:03 pm

Marcin Cieslak

LDEV-4996 Adjust Etherpad customised files for version 1.8.0

Options
    • -0
    • +535
    /lams_tool_doku/conf/etherpad-lite/settings.json
    • -157
    • +123
    /lams_tool_doku/conf/etherpad-lite/src/node/db/AuthorManager.js
    • -261
    • +0
    /lams_tool_doku/conf/etherpad-lite/src/node/db/SecurityManager.js
    • -444
    • +0
    /lams_tool_doku/conf/etherpad-lite/src/node/utils/Settings.js
    • -13
    • +4
    /lams_tool_doku/conf/etherpad-lite/src/static/js/ace2_inner.js
    • -36
    • +39
    /lams_tool_doku/conf/etherpad-lite/src/static/js/pad.js
    • -2
    • +3
    /lams_tool_doku/conf/etherpad-lite/src/static/js/pad_userlist.js
    • -2
    • +2
    /lams_tool_doku/readme.txt
7:04 pm

Marcin Cieslak

LDEV-4997 Fix highlighted lines overlapping

Options
    • -0
    • +5521
    /lams_tool_doku/conf/etherpad-lite/src/static/js/ace2_inner.js
7:04 pm

Marcin Cieslak

LDEV-4997 Fix highlighted lines overlapping

Options
    • -0
    • +5521
    /lams_tool_doku/conf/etherpad-lite/src/static/js/ace2_inner.js
Wednesday 15 Apr 2020
10:16 pm

Marcin Cieslak

LDEV-4997 Allow Etherpad instance sharing between LAMS instances

Conflicts:

lams_admin/conf/language/lams/ApplicationResources.properties

lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java

Options
    • -0
    • +1
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -3
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20200326.sql
    • -1
    • +6
    /lams_common/src/java/org/lamsfoundation/lams/etherpad/service/EtherpadService.java
    • -0
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java
10:16 pm

Marcin Cieslak

LDEV-4997 Allow Etherpad instance sharing between LAMS instances

Options
    • -0
    • +1
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -3
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20200326.sql
    • -1
    • +6
    /lams_common/src/java/org/lamsfoundation/lams/etherpad/service/EtherpadService.java
    • -0
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java
7:57 pm

Marcin Cieslak

LDEV-4997 Add height auto grow feature and parameter

Options
    • -0
    • +70
    /lams_tool_doku/conf/etherpad-lite/node_modules/ep_resize/static/js/index.js
    • -2
    • +5
    /lams_tool_doku/readme.txt
    • -1
    • +18
    /lams_tool_scratchie/web/WEB-INF/tags/Etherpad.tag
    • -1
    • +1
    /lams_tool_scratchie/web/pages/learning/scratchies.jsp
7:57 pm

Marcin Cieslak

LDEV-4997 Add height auto grow feature and parameter

Options
    • -0
    • +70
    /lams_tool_doku/conf/etherpad-lite/node_modules/ep_resize/static/js/index.js
    • -2
    • +5
    /lams_tool_doku/readme.txt
    • -1
    • +18
    /lams_tool_scratchie/web/WEB-INF/tags/Etherpad.tag
    • -1
    • +1
    /lams_tool_scratchie/web/pages/learning/scratchies.jsp
3:36 am

Andrey Balan

Merge branch 'LDEV-4949' into v5.0

Options
3:33 am

Andrey Balan

LDEV-4949 Format question's title properly

* remove html tags and custom "[IMAGE: ]" one

* trim title so it contains 200 characters at max while preserving the

last full word

Options
    • -1
    • +6
    /lams_common/src/java/org/lamsfoundation/lams/questions/QuestionWordParser.java
3:33 am

Andrey Balan

LDEV-4949 Format question's title properly

* remove html tags and custom "[IMAGE: ]" one

* trim title so it contains 200 characters at max while preserving the

last full word

Cherry pick from branch 5.0

Options
    • -1
    • +6
    /lams_common/src/java/org/lamsfoundation/lams/questions/QuestionWordParser.java
1:17 am

Marcin Cieslak

Merge branch 'LDEV-5002' into LDEV-4997

Options
1:16 am

Marcin Cieslak

LDEV-5002 Make discussion panel collapsible

Conflicts:

lams_tool_scratchie/web/pages/learning/scratchies.jsp

Options
    • -2
    • +2
    /lams_tool_scratchie/web/includes/css/scratchie-learning.scss
    • -10
    • +13
    /lams_tool_scratchie/web/pages/learning/scratchies.jsp