lams-github

lams_central

Clone Tools

Stats

Commits this week: 0
Total Committers: 31
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
Saturday 04 Apr 2020
2: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
    ./web/css/_main_base.scss
    • -1
    • +1
    ./web/css/defaultHTML_main.scss
    • -208
    • +865
    ./web/includes/javascript/jquery.slimscroll.js
    • -30
    • +29
    ./web/includes/javascript/main.js
    • -2
    • +5
    ./web/main.jsp
Friday 03 Apr 2020
3: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
    ./conf/scss/_lams_variables.scss
    • -1
    • +1
    ./conf/scss/_lams_variables_purple.scss
    • -43
    • +11
    ./src/java/org/lamsfoundation/lams/web/DisplayGroupController.java
    • -14
    • +15
    ./web/css/_main_base.scss
    • -1
    • +9
    ./web/includes/javascript/main.js
    • -3
    • +2
    ./web/main.jsp
  7. … 14 more files in changeset.
Thursday 02 Apr 2020
9:23 am

Marcin Cieslak

LDEV-4997 Introduce Etherpad as a JSP tag

Options
    • -0
    • +67
    ./src/java/org/lamsfoundation/lams/web/EtherpadController.java
  2. … 10 more files in changeset.
Tuesday 31 Mar 2020
2: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
    ./src/java/org/lamsfoundation/lams/web/DisplayGroupController.java
    • -6
    • +9
    ./web/css/_main_base.scss
    • -4
    • +4
    ./web/favoriteOrganisations.jsp
    • -1
    • +1
    ./web/groupContents.jsp
    • -3
    • +3
    ./web/includes/javascript/main.js
    • -39
    • +20
    ./web/main.jsp
12:00 am

Andrey Balan

LDEV-4949 import questions from Word files

Options
    • -0
    • +3
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -10
    • +22
    ./src/java/org/lamsfoundation/lams/web/QuestionsController.java
    • -0
    • +15
    ./web/qb/collection.jsp
    • -25
    • +31
    ./web/questions/questionFile.jsp
  5. … 12 more files in changeset.
12: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
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -8
    • +22
    ./src/java/org/lamsfoundation/lams/web/QuestionsController.java
    • -0
    • +15
    ./web/qb/collection.jsp
    • -5
    • +11
    ./web/questions/questionFile.jsp
  5. … 12 more files in changeset.
Monday 30 Mar 2020
3:58 pm

Marcin Cieslak

LDEV-4997 Move Etherpad Javascript code

Options
    • -0
    • +113
    ./web/includes/javascript/etherpad.js
  2. … 1 more file in changeset.
3:58 pm

Marcin Cieslak

LDEV-4997 Move Etherpad Javascript code

Options
    • -0
    • +113
    ./web/includes/javascript/etherpad.js
  2. … 1 more file in changeset.
Friday 27 Mar 2020
10:15 pm

Andrey Balan

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

Options
    • -0
    • +4
    ./web/main.jsp
4:37 pm

Andrey Balan

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

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

Andrey Balan

LDEV-4995 Further development of index page

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

Ernie Ghiglione

LDEV-4995 Upgrading admin to Bootstrap4 and accessibility improvements

Options
    • -0
    • +1
    ./web/css/jquery.tablesorter.theme.bootstrap4.css
  2. … 12 more files in changeset.
Saturday 21 Mar 2020
1:47 pm

Andrey Balan

LDEV-4995 Move reordering icons to the end of the line

Options
    • -5
    • +6
    ./web/groupContents.jsp
    • -6
    • +8
    ./web/main.jsp
3:22 am

Andrey Balan

LDEV-4995 Show exclamation sign button properly

Options
    • -1
    • +1
    ./web/groupContents.jsp
    • -1
    • +0
    ./web/main.jsp
2:47 am

Andrey Balan

LDEV-4995 Upgrade to bootstrap 4

* Update LAMS code to use bootstrap 4

* Update and redesign index page

Options
    • -2
    • +3
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -6
    • +3
    ./conf/scss/_lams_variables.scss
    • -6
    • +4
    ./conf/scss/_lams_variables_purple.scss
    • -18
    • +123
    ./src/java/org/lamsfoundation/lams/web/DisplayGroupController.java
    • -1
    • +21
    ./src/java/org/lamsfoundation/lams/web/IndexController.java
    • -2
    • +2
    ./web/addLesson.jsp
    • -75
    • +98
    ./web/authoring/authoring.jsp
    • -1
    • +1
    ./web/authoring/template/header.jsp
    • -1
    • +1
    ./web/authoring/template/list.jsp
    • -4
    • +4
    ./web/authoring/template/tbl/appex.jsp
    • -6
    • +6
    ./web/authoring/template/tbl/tbl.jsp
    • -1
    • +1
    ./web/authoring/template/tool/assessmcq.jsp
    • -2
    • +2
    ./web/authoring/template/tool/mcquestion.jsp
    • -1
    • +1
    ./web/ckeditor/ckeditor.js
    • -3
    • +3
    ./web/comments/edit.jsp
  16. … 184 more files in changeset.
Friday 20 Mar 2020
4:01 pm

Marcin Cieslak

LDEV-4023 Remove debug mode as it breaks validation

Options
    • -1
    • +0
    ./web/signup/singupTab.jsp
6:35 am

Marcin Cieslak

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

Conflicts:

lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GateController.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dto/GroupSummary.java

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

Options
    • -0
    • +2
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +1
    ./conf/security/Owasp.CsrfGuard.properties
    • -1664
    • +1673
    ./src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
    • -2
    • +11
    ./web/authoring/authoring.jsp
    • -1
    • +4
    ./web/includes/javascript/authoring/authoringActivity.js
    • -3
    • +7
    ./web/includes/javascript/authoring/authoringGeneral.js
    • -3
    • +14
    ./web/includes/javascript/authoring/authoringProperty.js
  8. … 15 more files in changeset.
Wednesday 18 Mar 2020
8:36 am

Marcin Cieslak

LDEV-4993 Remove unnecessary characters from TBL authoring page

Options
    • -1
    • +1
    ./web/authoring/template/tool/assessoption.jsp
Monday 16 Mar 2020
3:44 pm

Marcin Cieslak

LDEV-4989 Password Gate initial implementation

Options
    • -0
    • +2
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +1
    ./conf/security/Owasp.CsrfGuard.properties
    • -1661
    • +1670
    ./src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
    • -2
    • +11
    ./web/authoring/authoring.jsp
    • -1
    • +4
    ./web/includes/javascript/authoring/authoringActivity.js
    • -3
    • +7
    ./web/includes/javascript/authoring/authoringGeneral.js
    • -3
    • +14
    ./web/includes/javascript/authoring/authoringProperty.js
  8. … 30 more files in changeset.
Monday 09 Mar 2020
6:21 am

Marcin Cieslak

LDEV-4987 Fix file download notification

The bug was introduced in LDEV-4932

Options
    • -1
    • +1
    ./web/includes/javascript/download.js
Thursday 27 Feb 2020
5:41 pm

Marcin Cieslak

SP-4 Process different structure of staff enrolment file

Options
    • -163
    • +170
    ./src/java/org/lamsfoundation/lams/webservice/SPEnrolmentServlet.java
Friday 21 Feb 2020
5:41 pm

Andrey Balan

Merge branch 'LDEV-4979' into LDEV-4951

# Conflicts:

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java

# lams_tool_lamc/build.properties

# lams_tool_lamc/db/sql/create_lams_tool_mc.sql

# lams_tool_lamc/db/sql/tool_insert.sql

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/MonitoringController.java

# lams_tool_lamc/web/403.jsp

# lams_tool_lamc/web/404.jsp

# lams_tool_lamc/web/WEB-INF/web.xml

# lams_tool_lamc/web/common/taglibs.jsp

# lams_tool_lamc/web/error.jsp

# lams_tool_lamc/web/login.jsp

Options
    • -1
    • +6
    ./conf/security/Owasp.CsrfGuard.properties
  2. … 6 more files in changeset.
Thursday 20 Feb 2020
1:13 am

Andrey Balan

LDEV-4975 Remove now redundant jquery.sizzle.js

Options
    • -7
    • +0
    ./web/includes/javascript/jquery.sizzle.js
Wednesday 19 Feb 2020
7:15 pm

Andrey Balan

LDEV-4975 Remove now redundant jquery.mobile.js

Options
    • -2
    • +0
    ./web/includes/javascript/jquery.mobile.js
1:38 pm

Marcin Cieslak

LDEV-4978 Remove reference to an non-existing entity property

The reference was introduced by an incorrect recent merge with master,

regarding LDEV-4932.

Options
    • -3
    • +1
    ./web/outcome/outcomeManage.jsp
6:51 am

Ernie Ghiglione

LDEV-4975 Upgrade jquery to version 3.4.1

Options
    • -1
    • +0
    ./web/css/bootstrap.min.css
    • -5
    • +5
    ./web/includes/javascript/addLesson.js
    • -2
    • +2
    ./web/includes/javascript/authoring/authoringActivity.js
    • -1
    • +1
    ./web/includes/javascript/authoring/authoringGeneral.js
    • -3
    • +3
    ./web/includes/javascript/authoring/authoringMenu.js
    • -1
    • +1
    ./web/includes/javascript/dialog.js
    • -6
    • +2
    ./web/includes/javascript/jquery.js
    • -4
    • +4
    ./web/includes/javascript/main.js
    • -5
    • +5
    ./web/includes/javascript/orgGroup.js
    • -2
    • +2
    ./web/includes/javascript/progressBar.js
    • -1
    • +1
    ./web/includes/javascript/thickbox.js
  12. … 6 more files in changeset.
Tuesday 18 Feb 2020
3:21 pm

Andrey Balan

LDEV-4951 Remove traces of MCQ tool from other modules

Options
    • -6
    • +0
    ./conf/security/Owasp.CsrfGuard.properties
    • -32
    • +0
    ./src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
    • -6
    • +5
    ./src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java
    • -3
    • +1
    ./src/java/org/lamsfoundation/lams/web/qb/SearchQBController.java
    • -1
    • +0
    ./src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java
  6. … 188 more files in changeset.
Wednesday 12 Feb 2020
2:21 pm

Andrey Balan

LDEV-4932 Add CSRF to password change

Options
    • -0
    • +1
    ./conf/security/Owasp.CsrfGuard.properties
    • -39
    • +44
    ./web/passwordChangeContent.jsp
2:21 pm

Andrey Balan

LDEV-4932 Add CSRF to password change

(cherry picked from commit df52e287d4a5f815849470ffb1fd82a3867a6bdb)

Options
    • -0
    • +1
    ./conf/security/Owasp.CsrfGuard.properties
    • -39
    • +44
    ./web/passwordChangeContent.jsp
1:37 pm

Andrey Balan

LDEV-4969 Fix form validation

Options
    • -1
    • +0
    ./web/passwordChangeContent.jsp