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
Wednesday 06 May 2020
1:21 pm

Marcin Cieslak

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

Conflicts:

lams_build/3rdParty.userlibraries

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190119.sql

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190723.sql

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190724.sql

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

lams_monitoring/web/tblmonitor/teams.jsp

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190517.sql

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190809.sql

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

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McUsrAttempt.java

lams_tool_lamc/web/WEB-INF/tags/ImgButtonWrapper.tag

lams_tool_lamc/web/WEB-INF/tlds/lams/lams.tld

lams_tool_lamc/web/authoring/BasicContent.jsp

lams_tool_lamc/web/learning/CombinedAnswersContent.jsp

lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp

lams_tool_lamc/web/learning/ViewAnswers.jsp

lams_tool_lamc/web/monitoring/SummaryContent.jsp

lams_tool_lamc/web/monitoring/parts/statsPart.jsp

lams_tool_lamc/web/tblmonitoring/mcqStudentChoices.jsp

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

Options
    • -0
    • +2
    ./conf/security/Owasp.CsrfGuard.properties
    • -3
    • +4
    ./src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
    • -3
    • +5
    ./src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java
  4. … 28 more files in changeset.
Monday 04 May 2020
11:35 am

Marcin Cieslak

LDEV-5015 Replace MCQ with Assessment as iRA in TBL template

Options
    • -3
    • +4
    ./src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
    • -6
    • +8
    ./src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java
  3. … 1 more file in changeset.
Saturday 02 May 2020
3:06 am

Andrey Balan

LDEV-4995 First draft of the monitor page

Options
    • -1
    • +1
    ./conf/scss/_lams_variables.scss
    • -2
    • +2
    ./web/css/_authoring_base.scss
    • -13
    • +26
    ./web/css/_main_base.scss
    • -0
    • +3
    ./web/includes/javascript/dialog.js
    • -11
    • +15
    ./web/includes/javascript/main.js
  6. … 12 more files in changeset.
2:59 am

Andrey Balan

LDEV-4995 update d3 library to 4.13.0 version

Options
    • -8
    • +2
    ./web/includes/javascript/d3.js
2:58 am

Andrey Balan

LDEV-4995 update tags

Options
    • -1
    • +1
    ./web/WEB-INF/tags/Alert.tag
    • -2
    • +2
    ./web/WEB-INF/tags/DefineLater.tag
    • -1
    • +1
    ./web/WEB-INF/tags/LeaderDisplay.tag
    • -11
    • +11
    ./web/WEB-INF/tags/Page.tag
    • -2
    • +2
    ./web/WEB-INF/tags/Rating.tag
    • -0
    • +105
    ./web/WEB-INF/tags/Widget.tag
    • -1
    • +5
    ./web/WEB-INF/tlds/lams/lams.tld
  8. … 10 more files in changeset.
Thursday 23 Apr 2020
12:13 pm

Marcin Cieslak

LDEV-5007 Add RATING_STEP option in rating.js

Options
    • -2
    • +10
    ./web/includes/javascript/rating.js
12:07 pm

Marcin Cieslak

LDEV-5007 Allow decimal step in jRating

If step=0.5 is set, user can set rating every half a star.

Options
    • -3
    • +11
    ./web/includes/javascript/jquery.jRating.js
Wednesday 22 Apr 2020
3:48 pm

Marcin Cieslak

LDEV-4997 Do not import jQuery in Etherpad tag

It overwrites other imports made by pages which use the tag.

Options
    • -1
    • +1
    ./web/WEB-INF/tags/Etherpad.tag
  2. … 32 more files in changeset.
3:48 pm

Marcin Cieslak

LDEV-4997 Do not import jQuery in Etherpad tag

It overwrites other imports made by pages which use the tag.

Options
    • -1
    • +1
    ./web/WEB-INF/tags/Etherpad.tag
  2. … 32 more files in changeset.
6:02 am

Marcin Cieslak

SP-4 Allow some roles to be missing from a merged enrolment file

Options
    • -2
    • +5
    ./src/java/org/lamsfoundation/lams/webservice/SPEnrolmentServlet.java
Tuesday 21 Apr 2020
4:34 pm

Marcin Cieslak

SP-4 Allow mixing different roles in a single file

Options
    • -156
    • +175
    ./src/java/org/lamsfoundation/lams/webservice/SPEnrolmentServlet.java
12:07 pm

Marcin Cieslak

LDEV-4999 Fix monitor role detection when updating learner mark

Options
    • -42
    • +42
    ./.classpath
    • -306
    • +306
    ./src/java/org/lamsfoundation/lams/web/IndexController.java
    • -623
    • +623
    ./src/java/org/lamsfoundation/lams/web/OrganisationGroupController.java
    • -283
    • +283
    ./src/java/org/lamsfoundation/lams/web/ProfileController.java
    • -37
    • +37
    ./web/WEB-INF/tags/ImgButtonWrapper.tag
    • -1483
    • +1483
    ./web/ckeditor/CHANGES.md
    • -1420
    • +1420
    ./web/ckeditor/LICENSE.md
    • -207
    • +207
    ./web/ckeditor/contents.css
    • -11
    • +11
    ./web/ckeditor/plugins/bootstrapTabs/README.md
    • -32
    • +32
    ./web/ckeditor/plugins/bootstrapTabs/sample/bootstrapTabs.html
    • -20
    • +20
    ./web/ckeditor/plugins/colordialog/dialogs/colordialog.css
    • -363
    • +363
    ./web/ckeditor/plugins/confighelper/LICENSE
    • -5
    • +5
    ./web/ckeditor/plugins/confighelper/README.md
    • -128
    • +128
    ./web/ckeditor/plugins/confighelper/docs/install.html
    • -58
    • +58
    ./web/ckeditor/plugins/confighelper/docs/styles.css
  16. … 449 more files in changeset.
Monday 20 Apr 2020
2:46 pm

Marcin Cieslak

LDEV-5002 Distribute Etherpad tag to all projects

Options
    • -0
    • +98
    ./web/WEB-INF/tags/Etherpad.tag
    • -0
    • +4
    ./web/WEB-INF/tlds/lams/lams.tld
  3. … 87 more files in changeset.
2:46 pm

Marcin Cieslak

LDEV-5002 Distribute Etherpad tag to all projects

Options
    • -0
    • +98
    ./web/WEB-INF/tags/Etherpad.tag
    • -0
    • +4
    ./web/WEB-INF/tlds/lams/lams.tld
  3. … 87 more files in changeset.
12:55 pm

Marcin Cieslak

LDEV-4999 Allow marks update in Dokuy monitoring summary page

Options
    • -0
    • +1
    ./conf/security/Owasp.CsrfGuard.properties
    • -0
    • +4
    ./web/includes/javascript/jquery.tablesorter-editable.js
  3. … 3 more files in changeset.
Sunday 19 Apr 2020
1:04 pm

Marcin Cieslak

SP-4 Fix an entity processing bug

Options
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/webservice/SPEnrolmentServlet.java
6:39 am

Marcin Cieslak

SP-4 In every mode inform that processing finished successfuly

Options
    • -0
    • +2
    ./src/java/org/lamsfoundation/lams/webservice/SPEnrolmentServlet.java
Friday 17 Apr 2020
4:10 pm

Marcin Cieslak

SP-4 Add group manager processing

Options
    • -34
    • +145
    ./src/java/org/lamsfoundation/lams/webservice/SPEnrolmentServlet.java
Tuesday 14 Apr 2020
6:03 pm

Andrey Balan

LDEV-4995 Increase lesson name font-size

Also move CSS rules to .css file.

Options
    • -0
    • +214
    ./web/css/_main_base.scss
    • -2
    • +1
    ./web/css/defaultHTML_main.scss
    • -216
    • +0
    ./web/main.jsp
Saturday 11 Apr 2020
8:27 pm

Ernie Ghiglione

LDEV-3995 a11y improvements

Options
    • -1
    • +1
    ./web/includes/javascript/readmore.min.js
  2. … 4 more files in changeset.
Thursday 09 Apr 2020
4: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
    • +1
    ./web/includes/javascript/readmore.min.js
  2. … 3 more files in changeset.
7:55 am

Marcin Cieslak

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

Options
    • -0
    • +3
    ./web/addLesson.jsp
    • -1
    • +25
    ./web/css/addLesson.scss
    • -1
    • +65
    ./web/includes/javascript/addLesson.js
Wednesday 08 Apr 2020
6:04 am

Marcin Cieslak

LDEV-5003 Change the way subcourses are grouped

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

Andrey Balan

LDEV-4995 Fix sticky footer

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

Andrey Balan

LDEV-4995 Improve index page

* Add paging

* Sticky footer

* Cosmetic CSS improvements

Options
    • -26
    • +12
    ./web/css/_main_base.scss
    • -1
    • +1
    ./web/css/defaultHTML_main.scss
    • -3
    • +174
    ./web/includes/javascript/main.js
    • -194
    • +29
    ./web/main.jsp
Saturday 04 Apr 2020
7:46 pm

Marcin Cieslak

LDEV-5003 Detect subcourses correctly

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

Marcin Cieslak

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

Options
    • -154
    • +121
    ./src/java/org/lamsfoundation/lams/webservice/SPEnrolmentServlet.java
  2. … 6 more files in changeset.
3:02 am

Andrey Balan

LDEV-4995 Introduce "fa-spin" icon back

Options
    • -6
    • +2
    ./web/includes/javascript/main.js
    • -5
    • +1
    ./web/main.jsp
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.