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 13 Apr 2020
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
1:21 pm

Marcin Cieslak

LDEV-5002 Add question Etherpads in Scratchie

Options
    • -3
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/etherpad/util/EtherpadUtil.java
    • -1
    • +2
    /lams_tool_scratchie/conf/language/lams/ApplicationResources.properties
    • -10
    • +14
    /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
    • -4
    • +5
    /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
    • -9
    • +0
    /lams_tool_scratchie/web/pages/learning/learning.jsp
    • -1
    • +27
    /lams_tool_scratchie/web/pages/learning/scratchies.jsp
11:11 am

Ernie Ghiglione

LDEV-4995 UI improvements

User management page completed

Added widgets types

Shadows for Alerts

Options
    • -1
    • +1
    /lams_admin/web/WEB-INF/tags/Alert.tag
    • -1
    • +30
    /lams_admin/web/WEB-INF/tags/Widget.tag
    • -3
    • +3
    /lams_admin/web/organisation/list.jsp
    • -18
    • +1
    /lams_admin/web/user.jsp
    • -64
    • +82
    /lams_admin/web/userlist.jsp
Sunday 12 Apr 2020
2:57 pm

Ernie Ghiglione

LDEV-4995 a11y improvements

Options
    • -8
    • +6
    /lams_admin/web/WEB-INF/tags/Page.tag
    • -131
    • +139
    /lams_admin/web/organisation/createOrEdit.jsp
    • -343
    • +297
    /lams_admin/web/user.jsp
    • -79
    • +83
    /lams_admin/web/userChangePass.jsp
    • -26
    • +22
    /lams_admin/web/userlist.jsp
2:27 am

Ernie Ghiglione

LDEV-3995 a11y improvements

Options
    • -1
    • +1
    /lams_admin/web/config/editconfig.jsp
    • -3
    • +3
    /lams_admin/web/organisation/createOrEdit.jsp
    • -1
    • +1
    /lams_admin/web/organisation/list.jsp
    • -1
    • +1
    /lams_admin/web/user.jsp
    • -1
    • +1
    /lams_central/web/includes/javascript/readmore.min.js
Saturday 11 Apr 2020
12:20 am

Marcin Cieslak

LDEV-5006 Adjust password message

Options
    • -1
    • +1
    /lams_tool_zoom/web/pages/learning/learning.jsp
12:17 am

Marcin Cieslak

LDEV-5006 Protect Zoom meetings with passwords

Options
    • -0
    • +1
    /lams_tool_zoom/conf/language/lams/ApplicationResources.properties
    • -0
    • +12
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/dbupdates/patch20200410.sql
    • -0
    • +11
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/model/Zoom.java
    • -3
    • +1
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/service/IZoomService.java
    • -4
    • +9
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/service/ZoomService.java
    • -0
    • +1
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/util/ZoomConstants.java
    • -1
    • +3
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/util/ZoomUtil.java
    • -0
    • +1
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/controller/LearningController.java
    • -0
    • +2
    /lams_tool_zoom/web/pages/learning/learning.jsp
Friday 10 Apr 2020
5:16 pm

Ernie Ghiglione

LDEV-4739 Updating labels

Greek, Spanish, Norwegian

Options
    • -2
    • +7
    /lams_admin/conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +7
    /lams_admin/conf/language/lams/ApplicationResources_es_ES.properties
    • -2
    • +7
    /lams_admin/conf/language/lams/ApplicationResources_no_NO.properties
5:13 pm

Ernie Ghiglione

LDEV-4995 Course manager changes

Important changes for accessibility, specially in tablesorter and page tag. New labels to better reflect new layout -work in progress

Options
    • -13
    • +16
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -14
    • +15
    /lams_admin/web/WEB-INF/tags/Page.tag
    • -8
    • +14
    /lams_admin/web/WEB-INF/tags/TSTable.tag
    • -26
    • +30
    /lams_admin/web/organisation/createOrEdit.jsp
    • -37
    • +98
    /lams_admin/web/organisation/list.jsp
4:46 pm

Marcin Cieslak

Merge branch 'LDEV-5005' into v4.0

Options
4:46 pm

Marcin Cieslak

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

Conflicts:

lams_common/src/java/org/lamsfoundation/lams/dao/IBaseDAO.java

lams_common/src/java/org/lamsfoundation/lams/dao/hibernate/LAMSBaseDAO.java

Options
    • -301
    • +303
    /lams_common/src/java/org/lamsfoundation/lams/dao/IBaseDAO.java
    • -0
    • +9
    /lams_common/src/java/org/lamsfoundation/lams/dao/hibernate/LAMSBaseDAO.java
    • -4
    • +19
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java
    • -6
    • +16
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
Thursday 09 Apr 2020
10:50 pm

Ernie Ghiglione

LDEV-4995 redesign course management page

Simplify course management page

Fixed issues with readmore-js and jquery3+

Add textarea to edit/create course

Options
    • -1
    • +2
    /lams_admin/web/organisation/createOrEdit.jsp
    • -232
    • +76
    /lams_admin/web/organisation/list.jsp
    • -1
    • +1
    /lams_central/web/includes/javascript/readmore.min.js
    • -1
    • +1
    /lams_monitoring/web/monitor.jsp
1:55 pm

Marcin Cieslak

LDEV-5005 Add "recent learning designs" section to Add Lesson dialog

Options
    • -0
    • +3
    /lams_central/web/addLesson.jsp
    • -1
    • +25
    /lams_central/web/css/addLesson.scss
    • -1
    • +65
    /lams_central/web/includes/javascript/addLesson.js
10:22 am

Marcin Cieslak

Merge branch 'LDEV-5003'

Options
Wednesday 08 Apr 2020
12:04 pm

Marcin Cieslak

LDEV-5003 Change the way subcourses are grouped

Options
    • -6
    • +11
    /lams_central/src/java/org/lamsfoundation/lams/webservice/SPEnrolmentServlet.java
Tuesday 07 Apr 2020
5:29 pm

Andrey Balan

LDEV-4995 Fix sticky footer

Options
    • -1
    • +1
    /lams_central/web/css/_main_base.scss
    • -1
    • +1
    /lams_central/web/main.jsp
9:24 am

Andrey Balan

LDEV-4995 Improve index page

* Add paging

* Sticky footer

* Cosmetic CSS improvements

Options
    • -26
    • +12
    /lams_central/web/css/_main_base.scss
    • -1
    • +1
    /lams_central/web/css/defaultHTML_main.scss
    • -3
    • +174
    /lams_central/web/includes/javascript/main.js
    • -194
    • +29
    /lams_central/web/main.jsp
Monday 06 Apr 2020
4:42 pm

Ernie Ghiglione

LDEV-4995 Changes to course management layout

Options
    • -1
    • +3
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgManageController.java
    • -1
    • +3
    /lams_admin/web/WEB-INF/tags/Page.tag
    • -0
    • +61
    /lams_admin/web/WEB-INF/tags/Widget.tag
    • -1
    • +5
    /lams_admin/web/WEB-INF/tlds/lams/lams.tld
    • -112
    • +263
    /lams_admin/web/organisation/list.jsp
Sunday 05 Apr 2020
1:46 am

Marcin Cieslak

LDEV-5003 Detect subcourses correctly

Options
    • -1
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/webservice/SPEnrolmentServlet.java
Saturday 04 Apr 2020
8:47 pm

Marcin Cieslak

LDEV-5003 Load all necessary objects in one go instead of one by one

Options
    • -154
    • +121
    /lams_central/src/java/org/lamsfoundation/lams/webservice/SPEnrolmentServlet.java
    • -0
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/dao/IBaseDAO.java
    • -2
    • +11
    /lams_common/src/java/org/lamsfoundation/lams/dao/hibernate/LAMSBaseDAO.java
    • -3
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IOrganisationDAO.java
    • -18
    • +25
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationDAO.java
    • -4
    • +19
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java
    • -10
    • +21
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
9:13 am

Andrey Balan

LDEV-4995 Revert accidentally committed code

Options
    • -1
    • +1
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/ContributeDTOFactory.java
9:02 am

Andrey Balan

LDEV-4995 Introduce "fa-spin" icon back

Options
    • -6
    • +2
    /lams_central/web/includes/javascript/main.js
    • -5
    • +1
    /lams_central/web/main.jsp
8:28 am

Andrey Balan

LDEV-4995 Improvements to the index page

* Make vertical scroller work properly even for orgs with lengthy names

* Vertically align fa-chevron-circle icon

* Remove "fa-spin". fadeOut, fadeIn the page instead

Options
    • -2
    • +6
    /lams_central/web/css/_main_base.scss
    • -1
    • +1
    /lams_central/web/css/defaultHTML_main.scss
    • -208
    • +865
    /lams_central/web/includes/javascript/jquery.slimscroll.js
    • -30
    • +29
    /lams_central/web/includes/javascript/main.js
    • -2
    • +5
    /lams_central/web/main.jsp
1:14 am

Marcin Cieslak

LDEV-5004 Fix checking a new question if it is a default question

Options
    • -1
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/qb/QbUtils.java
1:06 am

Marcin Cieslak

LDEV-4997 Fix path in library file

Options
    • -1
    • +1
    /lams_build/3rdParty.userlibraries
Friday 03 Apr 2020
9:42 am

Andrey Balan

LDEV-4995 Improvements to the index page

* Fix offcanvas bar search and organisation tablesorter markup in case

of big amount of available organisations

* Optimise DB queries

* Introduce hasContributeActivities Lesson's flag

* Show "fa-spin" when loading an organisation

Options
    • -2
    • +2
    /lams_central/conf/scss/_lams_variables.scss
    • -1
    • +1
    /lams_central/conf/scss/_lams_variables_purple.scss
    • -43
    • +11
    /lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupController.java
    • -14
    • +15
    /lams_central/web/css/_main_base.scss
    • -1
    • +9
    /lams_central/web/includes/javascript/main.js
    • -3
    • +2
    /lams_central/web/main.jsp
    • -1
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20200316.sql
    • -3
    • +13
    /lams_common/src/java/org/lamsfoundation/lams/index/IndexLessonBean.java
    • -3
    • +18
    /lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java
    • -0
    • +11
    /lams_common/src/java/org/lamsfoundation/lams/lesson/dao/ILearnerProgressDAO.java
    • -2
    • +10
    /lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LearnerProgressDAO.java
    • -0
    • +10
    /lams_common/src/java/org/lamsfoundation/lams/lesson/service/ILessonService.java
    • -2
    • +9
    /lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java
    • -2
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -0
    • +1
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml
  16. … 5 more files in changeset.
Thursday 02 Apr 2020
11:16 pm

Marcin Cieslak

LDEV-4746 Fix QB answer removal on activity removal

Using JPQL caused errors, so a native query has been used.

Options
    • -0
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/IQbDAO.java
    • -0
    • +9
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
    • -0
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java
    • -3
    • +6
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java
    • -0
    • +2
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java
3:28 pm

Marcin Cieslak

LDEV-4997 Fix learner search when registering on Doku websocket server

Options
    • -3
    • +6
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dao/DokumaranUserDAO.java
    • -3
    • +14
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dao/hibernate/DokumaranUserDAOHibernate.java
    • -2
    • +2
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
3:28 pm

Marcin Cieslak

LDEV-4997 Fix learner search when registering on Doku websocket server

Options
    • -3
    • +6
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dao/DokumaranUserDAO.java
    • -3
    • +14
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dao/hibernate/DokumaranUserDAOHibernate.java
    • -2
    • +2
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
3:23 pm

Marcin Cieslak

LDEV-4997 Introduce Etherpad as a JSP tag

Options
    • -0
    • +67
    /lams_central/src/java/org/lamsfoundation/lams/web/EtherpadController.java
    • -9
    • +40
    /lams_common/src/java/org/lamsfoundation/lams/etherpad/service/EtherpadService.java
    • -5
    • +25
    /lams_common/src/java/org/lamsfoundation/lams/etherpad/service/IEtherpadService.java
    • -0
    • +12
    /lams_common/src/java/org/lamsfoundation/lams/etherpad/util/EtherpadUtil.java
    • -0
    • +261
    /lams_tool_doku/conf/etherpad-lite/src/node/db/SecurityManager.js
    • -15
    • +7
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
    • -1
    • +1
    /lams_tool_doku/web/pages/learning/learning.jsp
    • -1
    • +1
    /lams_tool_doku/web/pages/monitoring/summary.jsp
    • -0
    • +81
    /lams_tool_scratchie/web/WEB-INF/tags/Etherpad.tag
    • -0
    • +4
    /lams_tool_scratchie/web/WEB-INF/tlds/lams/lams.tld
    • -0
    • +9
    /lams_tool_scratchie/web/pages/learning/learning.jsp