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 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
Wednesday 01 Apr 2020
8:14 pm

Marcin Cieslak

Merge branch 'LDEV-4998' into v4.0

Options
8:14 pm

Marcin Cieslak

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

Options
8:13 pm

Marcin Cieslak

LDEV-4994 Fix description field in authoring

Options
    • -1
    • +1
    /lams_tool_doku/web/pages/authoring/basic.jsp
7:44 pm

Marcin Cieslak

LDEV-4998 Protect activity default questions from modification

Options
    • -0
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
    • -2
    • +9
    /lams_common/src/java/org/lamsfoundation/lams/qb/QbUtils.java
    • -0
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java
    • -0
    • +13
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java
    • -4
    • +17
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/AuthoringController.java
    • -4
    • +17
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
12:08 pm

Marcin Cieslak

LDEV-4998, LDEV-4941 Fix public question editing for Q&A and Scratchie

Options
    • -7
    • +6
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/AuthoringController.java
    • -1
    • +2
    /lams_tool_laqa/web/authoring/newQuestionBox.jsp
    • -2
    • +2
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
    • -1
    • +2
    /lams_tool_scratchie/web/pages/authoring/parts/addItemFooter.jsp
Tuesday 31 Mar 2020
8:34 am

Andrey Balan

LDEV-4995 Improvements to the index page

* Fix favorite organisations markup

* Fix cards height

* Email notifications buttons moved under "Three dots" menu

* Hide reorder buttons for any order other than "Default" one

* Reintroduce chart labels

Options
    • -1
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupController.java
    • -6
    • +9
    /lams_central/web/css/_main_base.scss
    • -4
    • +4
    /lams_central/web/favoriteOrganisations.jsp
    • -1
    • +1
    /lams_central/web/groupContents.jsp
    • -3
    • +3
    /lams_central/web/includes/javascript/main.js
    • -39
    • +20
    /lams_central/web/main.jsp
6:00 am

Andrey Balan

LDEV-4949 import questions from Word files

Options
    • -0
    • +3
    /lams_build/3rdParty.userlibraries
    • -1
    • +8
    /lams_build/build.xml
    • -0
    • +1
    /lams_build/conf/j2ee/jboss-deployment-structure.xml
    • binary
    /lams_build/lib/apache-poi/poi-scratchpad-4.0.1.jar
    • -0
    • +1
    /lams_build/lib/apache-poi/poi.module.xml
    • binary
    /lams_build/lib/apache-tika/tika-core-1.24.jar
    • binary
    /lams_build/lib/apache-tika/tika-parsers-1.24.jar
    • -0
    • +39
    /lams_build/lib/apache-tika/tika.module.xml
    • -0
    • +4
    /lams_build/liblist.txt
    • -0
    • +3
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -10
    • +22
    /lams_central/src/java/org/lamsfoundation/lams/web/QuestionsController.java
    • -0
    • +15
    /lams_central/web/qb/collection.jsp
    • -25
    • +31
    /lams_central/web/questions/questionFile.jsp
    • -0
    • +9
    /lams_common/src/java/org/lamsfoundation/lams/questions/Answer.java
    • -0
    • +400
    /lams_common/src/java/org/lamsfoundation/lams/questions/QuestionWordParser.java
    • -3
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/util/zipfile/ZipFileUtil.java
6:00 am

Andrey Balan

LDEV-4949 import questions from Word files

Cherry-pick from 5.0 branch

Conflicts:

lams_build/3rdParty.userlibraries

lams_central/conf/language/lams/ApplicationResources_en_AU.properties

lams_central/src/java/org/lamsfoundation/lams/web/QuestionsController.java

lams_central/web/questions/questionFile.jsp

Options
    • -0
    • +3
    /lams_build/3rdParty.userlibraries
    • -1
    • +8
    /lams_build/build.xml
    • -0
    • +1
    /lams_build/conf/j2ee/jboss-deployment-structure.xml
    • binary
    /lams_build/lib/apache-poi/poi-scratchpad-4.0.1.jar
    • -0
    • +1
    /lams_build/lib/apache-poi/poi.module.xml
    • binary
    /lams_build/lib/apache-tika/tika-core-1.24.jar
    • binary
    /lams_build/lib/apache-tika/tika-parsers-1.24.jar
    • -0
    • +39
    /lams_build/lib/apache-tika/tika.module.xml
    • -0
    • +4
    /lams_build/liblist.txt
    • -0
    • +3
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -8
    • +22
    /lams_central/src/java/org/lamsfoundation/lams/web/QuestionsController.java
    • -0
    • +15
    /lams_central/web/qb/collection.jsp
    • -5
    • +11
    /lams_central/web/questions/questionFile.jsp
    • -0
    • +9
    /lams_common/src/java/org/lamsfoundation/lams/questions/Answer.java
    • -0
    • +404
    /lams_common/src/java/org/lamsfoundation/lams/questions/QuestionWordParser.java
    • -3
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/util/zipfile/ZipFileUtil.java
Monday 30 Mar 2020
9:58 pm

Marcin Cieslak

LDEV-4997 Move Etherpad Javascript code

Options
    • -0
    • +113
    /lams_central/web/includes/javascript/etherpad.js
    • -113
    • +0
    /lams_tool_doku/web/includes/javascript/etherpad.js
9:58 pm

Marcin Cieslak

LDEV-4997 Move Etherpad Javascript code

Options
    • -0
    • +113
    /lams_central/web/includes/javascript/etherpad.js
    • -113
    • +0
    /lams_tool_doku/web/includes/javascript/etherpad.js
1:30 pm

Marcin Cieslak

LDEV-4997 Initial migration of Doku tool to Etherpad as central service

Options
    • -1
    • +3
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -2
    • +2
    /lams_build/build.xml
    • -0
    • +1
    /lams_build/conf/j2ee/jboss-deployment-structure.xml
    • -0
    • +3
    /lams_build/lib/etherpad/etherpad.module.xml
    • -0
    • +22
    /lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
    • -0
    • +14
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20200326.sql
    • -0
    • +11
    /lams_common/src/java/org/lamsfoundation/lams/etherpad/EtherpadException.java
    • -0
    • +158
    /lams_common/src/java/org/lamsfoundation/lams/etherpad/service/EtherpadService.java
    • -0
    • +39
    /lams_common/src/java/org/lamsfoundation/lams/etherpad/service/IEtherpadService.java
    • -0
    • +10
    /lams_common/src/java/org/lamsfoundation/lams/etherpad/util/EtherpadUtil.java
    • -1
    • +5
    /lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java
    • -865
    • +0
    /lams_tool_doku/src/java/net/gjerull/etherpad/client/EPLiteClient.java
    • -301
    • +0
    /lams_tool_doku/src/java/net/gjerull/etherpad/client/EPLiteConnection.java
    • -11
    • +0
    /lams_tool_doku/src/java/net/gjerull/etherpad/client/EPLiteException.java
    • -44
    • +0
    /lams_tool_doku/src/java/net/gjerull/etherpad/client/GETRequest.java
  16. … 18 more files in changeset.
1:30 pm

Marcin Cieslak

LDEV-4997 Initial migration of Doku tool to Etherpad as central service

Conflicts:

lams_admin/conf/language/lams/ApplicationResources.properties

lams_build/build.xml

lams_common/src/java/org/lamsfoundation/lams/commonContext.xml

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

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dbupdates/patch20200329.sql

Options
    • -1
    • +3
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    /lams_build/3rdParty.userlibraries
    • -2
    • +2
    /lams_build/build.xml
    • -0
    • +1
    /lams_build/conf/j2ee/jboss-deployment-structure.xml
    • -0
    • +3
    /lams_build/lib/etherpad/etherpad.module.xml
    • -49
    • +69
    /lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
    • -0
    • +14
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20200326.sql
    • -0
    • +11
    /lams_common/src/java/org/lamsfoundation/lams/etherpad/EtherpadException.java
    • -0
    • +158
    /lams_common/src/java/org/lamsfoundation/lams/etherpad/service/EtherpadService.java
    • -0
    • +39
    /lams_common/src/java/org/lamsfoundation/lams/etherpad/service/IEtherpadService.java
    • -0
    • +10
    /lams_common/src/java/org/lamsfoundation/lams/etherpad/util/EtherpadUtil.java
    • -0
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java
    • -865
    • +0
    /lams_tool_doku/src/java/net/gjerull/etherpad/client/EPLiteClient.java
    • -301
    • +0
    /lams_tool_doku/src/java/net/gjerull/etherpad/client/EPLiteConnection.java
    • -11
    • +0
    /lams_tool_doku/src/java/net/gjerull/etherpad/client/EPLiteException.java
  16. … 17 more files in changeset.
12:36 pm

Ernie Ghiglione

LDEV-4995 Improvements course management

Options
    • -0
    • +1
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgManageController.java
    • -119
    • +139
    /lams_admin/web/organisation/createOrEdit.jsp
    • -52
    • +100
    /lams_admin/web/organisation/list.jsp
    • -3
    • +3
    /lams_admin/web/sessionmaintain.jsp
    • -3
    • +3
    /lams_admin/web/timezoneManagement.jsp
    • -9
    • +15
    /lams_admin/web/userlist.jsp
    • -6
    • +26
    /lams_admin/web/userrole.jsp
    • -4
    • +3
    /lams_admin/web/usersearchlist.jsp
Saturday 28 Mar 2020
5:15 am

Andrey Balan

LDEV-4995 Hide charts on a smaller devices in a list view mode

Options
    • -0
    • +4
    /lams_central/web/main.jsp
Friday 27 Mar 2020
11:37 pm

Andrey Balan

LDEV-4995 Keep datatable buttons on one line even for smaller devices

Options
    • -7
    • +2
    /lams_central/web/main.jsp
10:43 am

Andrey Balan

LDEV-4995 Further development of index page

Options
    • -1
    • +1
    /lams_central/conf/scss/_lams_variables.scss
    • -18
    • +10
    /lams_central/web/css/_main_base.scss
    • -1
    • +1
    /lams_central/web/css/defaultHTML_main.scss
    • binary
    /lams_central/web/css/images/trianglify_1.png
    • binary
    /lams_central/web/css/images/trianglify_10.png
    • binary
    /lams_central/web/css/images/trianglify_2.png
    • binary
    /lams_central/web/css/images/trianglify_3.png
    • binary
    /lams_central/web/css/images/trianglify_4.png
    • binary
    /lams_central/web/css/images/trianglify_5.png
    • binary
    /lams_central/web/css/images/trianglify_6.png
    • binary
    /lams_central/web/css/images/trianglify_7.png
    • binary
    /lams_central/web/css/images/trianglify_8.png
    • binary
    /lams_central/web/css/images/trianglify_9.png
    • -6
    • +4
    /lams_central/web/group.jsp
    • -51
    • +63
    /lams_central/web/groupContents.jsp
    • -4
    • +4
    /lams_central/web/groupHeader.jsp
    • -94
    • +161
    /lams_central/web/main.jsp
Thursday 26 Mar 2020
10:26 pm

Marcin Cieslak

LDEV-4997 Add Etherpad client source code

Options
    • -0
    • +915
    /3rdParty_sources/etherpad/net/gjerull/etherpad/client/EPLiteClient.java
    • -0
    • +317
    /3rdParty_sources/etherpad/net/gjerull/etherpad/client/EPLiteConnection.java
    • -0
    • +11
    /3rdParty_sources/etherpad/net/gjerull/etherpad/client/EPLiteException.java
    • -0
    • +44
    /3rdParty_sources/etherpad/net/gjerull/etherpad/client/GETRequest.java
    • -0
    • +56
    /3rdParty_sources/etherpad/net/gjerull/etherpad/client/POSTRequest.java
    • -0
    • +5
    /3rdParty_sources/etherpad/net/gjerull/etherpad/client/Request.java
    • -0
    • +2
    /3rdParty_sources/versions.txt
10:26 pm

Marcin Cieslak

LDEV-4997 Add Etherpad client source code

Options
    • -0
    • +915
    /3rdParty_sources/etherpad/net/gjerull/etherpad/client/EPLiteClient.java
    • -0
    • +317
    /3rdParty_sources/etherpad/net/gjerull/etherpad/client/EPLiteConnection.java
    • -0
    • +11
    /3rdParty_sources/etherpad/net/gjerull/etherpad/client/EPLiteException.java
    • -0
    • +44
    /3rdParty_sources/etherpad/net/gjerull/etherpad/client/GETRequest.java
    • -0
    • +56
    /3rdParty_sources/etherpad/net/gjerull/etherpad/client/POSTRequest.java
    • -0
    • +5
    /3rdParty_sources/etherpad/net/gjerull/etherpad/client/Request.java
    • -0
    • +2
    /3rdParty_sources/versions.txt
10:21 pm

Marcin Cieslak

LDEV-4997 Add Etherpad client as WildFly library module

Options
    • -3
    • +4
    /lams_build/3rdParty.userlibraries
    • -1
    • +11
    /lams_build/build.xml
    • -0
    • +29
    /lams_build/lib/etherpad/etherpad.module.xml
    • binary
    /lams_build/lib/etherpad/etherpad_lite_client-1.2.13.jar
    • -0
    • +2
    /lams_build/liblist.txt
10:21 pm

Marcin Cieslak

LDEV-4997 Add Etherpad client as WildFly library module

Conflicts:

lams_build/3rdParty.userlibraries

lams_build/build.xml

Options
    • -0
    • +1
    /lams_build/3rdParty.userlibraries
    • -1
    • +9
    /lams_build/build.xml
    • -0
    • +29
    /lams_build/lib/etherpad/etherpad.module.xml
    • binary
    /lams_build/lib/etherpad/etherpad_lite_client-1.2.13.jar
    • -0
    • +2
    /lams_build/liblist.txt
6:59 pm

Marcin Cieslak

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

Conflicts:

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

Options
    • -0
    • +11
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/UserForm.java
    • -2
    • +2
    /lams_admin/web/user.jsp
    • -0
    • +1
    /lams_tool_doku/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +10
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dto/GroupSummary.java
    • -4
    • +1
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -14
    • +25
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -1
    • +1
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java
    • -6
    • +19
    /lams_tool_scratchie/web/pages/monitoring/summary.jsp
Wednesday 25 Mar 2020
12:44 am

Marcin Cieslak

LDEV-4993 Convert double to percent correctly in Scratcie monitoring

Options
    • -1
    • +1
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
Tuesday 24 Mar 2020
4:12 pm

Ernie Ghiglione

LDEV-4995 Moving breadcrumb to Page tag

Options
    • -11
    • +5
    /lams_admin/web/cleanupPreviewLessons.jsp
    • -17
    • +8
    /lams_admin/web/user.jsp
2:23 pm

Ernie Ghiglione

LDEV-4995 Moving breadcrumb to Page tag

Options
    • -0
    • +53
    /lams_admin/web/WEB-INF/tags/Page.tag
    • -9
    • +7
    /lams_admin/web/config/editconfig.jsp
    • -1
    • +6
    /lams_admin/web/disabledusers.jsp
    • -10
    • +8
    /lams_admin/web/import/importGroups.jsp
    • -10
    • +7
    /lams_admin/web/import/importexcel.jsp
    • -13
    • +8
    /lams_admin/web/integration/ltiConsumer.jsp
    • -9
    • +6
    /lams_admin/web/integration/ltiConsumerList.jsp
    • -9
    • +5
    /lams_admin/web/integration/serverlist.jsp
    • -12
    • +8
    /lams_admin/web/integration/servermaintain.jsp
    • -10
    • +6
    /lams_admin/web/logevent.jsp
    • -9
    • +8
    /lams_admin/web/loginmaintain.jsp
    • -14
    • +7
    /lams_admin/web/policies/editPolicy.jsp
    • -20
    • +16
    /lams_admin/web/policies/policies.jsp
    • -10
    • +5
    /lams_admin/web/sessionmaintain.jsp
    • -12
    • +8
    /lams_admin/web/signupmanagement/add.jsp
  16. … 5 more files in changeset.
2:13 pm

Marcin Cieslak

Merge branch 'LDEV-4994'

Options