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
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: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
1:16 am

Marcin Cieslak

LDEV-5002 Make discussion panel collapsible

Options
    • -2
    • +2
    /lams_tool_scratchie/web/includes/css/scratchie-learning.scss
    • -10
    • +14
    /lams_tool_scratchie/web/pages/learning/scratchies.jsp
12:49 am

Marcin Cieslak

LDEV-5002 Display user list only when Scratchie is grouped

Options
    • -1
    • +1
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
    • -2
    • +2
    /lams_tool_scratchie/web/pages/learning/scratchies.jsp
12:49 am

Marcin Cieslak

LDEV-5002 Display user list only when Scratchie is grouped

Options
    • -1
    • +1
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
    • -2
    • +2
    /lams_tool_scratchie/web/pages/learning/scratchies.jsp
12:48 am

Marcin Cieslak

LDEV-5002 Allow non-breaking space in Etherpad initial content

Options
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/etherpad/util/EtherpadUtil.java
12:48 am

Marcin Cieslak

LDEV-5002 Allow non-breaking space in Etherpad initial content

Options
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/etherpad/util/EtherpadUtil.java
12:24 am

Marcin Cieslak

LDEV-5002 Reduce gap between user names

Options
    • -1
    • +0
    /lams_tool_scratchie/web/pages/learning/scratchies.jsp
12:24 am

Marcin Cieslak

LDEV-5002 Reduce gap between user names

Options
    • -1
    • +0
    /lams_tool_scratchie/web/pages/learning/scratchies.jsp
12:03 am

Andrey Balan

LDEV-4995 Increase lesson name font-size

Also move CSS rules to .css file.

Options
    • -0
    • +214
    /lams_central/web/css/_main_base.scss
    • -2
    • +1
    /lams_central/web/css/defaultHTML_main.scss
    • -216
    • +0
    /lams_central/web/main.jsp
Tuesday 14 Apr 2020
4:02 pm

Ernie Ghiglione

LDEV-4995 Added user roles in course updates

Random updates to breadcrums and Alert tag

Options
    • -0
    • +3
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserManageController.java
    • -0
    • +4
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgController.java
    • -0
    • +1
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRoleController.java
    • -0
    • +9
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/dto/UserListDTO.java
    • -0
    • +10
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/UserOrgForm.java
    • -13
    • +13
    /lams_admin/web/WEB-INF/tags/Alert.tag
    • -1
    • +2
    /lams_admin/web/organisation/createOrEdit.jsp
    • -3
    • +1
    /lams_admin/web/user/basiclist.jsp
    • -4
    • +4
    /lams_admin/web/userlist.jsp
    • -32
    • +34
    /lams_admin/web/userorg.jsp
    • -2
    • +2
    /lams_admin/web/userrole.jsp
2:57 pm

Marcin Cieslak

LDEV-5002 Do not set cookie domain if it is "localhost"

Edge browser does not set a cookie if domain is "localhost".

Options
    • -1
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/etherpad/service/EtherpadService.java
2:57 pm

Marcin Cieslak

LDEV-5002 Do not set cookie domain if it is "localhost"

Edge browser does not set a cookie if domain is "localhost".

Options
    • -1
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/etherpad/service/EtherpadService.java
Monday 13 Apr 2020
6:40 pm

Marcin Cieslak

LDEV-5002 Initialise multiple Etherpad instances in cascade

Options
    • -5
    • +4
    /lams_tool_scratchie/web/WEB-INF/tags/Etherpad.tag
6:40 pm

Marcin Cieslak

LDEV-5002 Initialise multiple Etherpad instances in cascade

Options
    • -5
    • +4
    /lams_tool_scratchie/web/WEB-INF/tags/Etherpad.tag
1:39 pm

Ernie Ghiglione

LDEV-4995 layout changes

Options
    • -1
    • +1
    /lams_admin/web/orgPasswordChange.jsp
    • -12
    • +18
    /lams_admin/web/user.jsp
    • -1
    • +1
    /lams_admin/web/usersearchlist.jsp
1:21 pm

Marcin Cieslak

Merge branch 'LDEV-5002' into LDEV-4997

Options
1:21 pm

Marcin Cieslak

LDEV-5002 Add question Etherpads in Scratchie

Conflicts:

lams_common/src/java/org/lamsfoundation/lams/etherpad/util/EtherpadUtil.java

lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java

lams_tool_scratchie/web/WEB-INF/tags/Etherpad.tag

lams_tool_scratchie/web/pages/learning/scratchies.jsp

Options
    • -0
    • +12
    /lams_common/src/java/org/lamsfoundation/lams/etherpad/util/EtherpadUtil.java
    • -2
    • +3
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dao/hibernate/DokumaranUserDAOHibernate.java
    • -0
    • +2
    /lams_tool_scratchie/conf/language/lams/ApplicationResources.properties
    • -0
    • +4
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
    • -0
    • +15
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20200413.sql
    • -0
    • +11
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java
    • -3
    • +3
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -1
    • +5
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -0
    • +17
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
    • -0
    • +81
    /lams_tool_scratchie/web/WEB-INF/tags/Etherpad.tag
    • -0
    • +4
    /lams_tool_scratchie/web/includes/css/scratchie-learning.scss
    • -0
    • +14
    /lams_tool_scratchie/web/pages/authoring/advance.jsp
    • -0
    • +26
    /lams_tool_scratchie/web/pages/learning/scratchies.jsp