lams_central

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4967 include appropriate contentType

LDEV-4996 Adjust Etherpad autogrow feature

  1. … 31 more files in changeset.
LDEV-5024 Import question from QB to TBL template wizard

    • -3
    • +58
    ./web/authoring/template/tbl/tbl.jsp
LDEV-5024 Add "question from bank" button to TBL template wizard

    • -2
    • +18
    ./web/authoring/template/tbl/tbl.jsp
LDEV-4997 Renormalize line endings with git

    • -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
    • -43
    • +43
    ./web/ckeditor/plugins/emojione/README.md
    • -5500
    • +5500
    ./web/ckeditor/plugins/emojione/styles/emojione-awesome.css
    • -17
    • +17
    ./web/ckeditor/plugins/emojione/styles/emojione.css
  1. … 406 more files in changeset.
LDEV-4997 Adjust Etherpad integration code for LAMS 3.1

    • -0
    • +67
    ./src/java/org/lamsfoundation/lams/web/EtherpadController.java
  1. … 8 more files in changeset.
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

    • -0
    • +2
    ./conf/security/Owasp.CsrfGuard.properties
  1. … 28 more files in changeset.
LDEV-5015 Replace MCQ with Assessment as iRA in TBL template

  1. … 1 more file in changeset.
LDEV-4995 First draft of the monitor page

    • -11
    • +15
    ./web/includes/javascript/main.js
  1. … 12 more files in changeset.
LDEV-4995 update d3 library to 4.13.0 version

LDEV-4995 update tags

    • -0
    • +105
    ./web/WEB-INF/tags/Widget.tag
  1. … 10 more files in changeset.
LDEV-5007 Add RATING_STEP option in rating.js

    • -2
    • +10
    ./web/includes/javascript/rating.js
LDEV-5007 Allow decimal step in jRating

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

LDEV-4997 Do not import jQuery in Etherpad tag

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

  1. … 32 more files in changeset.
LDEV-4997 Do not import jQuery in Etherpad tag

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

  1. … 32 more files in changeset.
SP-4 Allow some roles to be missing from a merged enrolment file

SP-4 Allow mixing different roles in a single file

LDEV-4999 Fix monitor role detection when updating learner mark

    • -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
    • -363
    • +363
    ./web/ckeditor/plugins/confighelper/LICENSE
    • -128
    • +128
    ./web/ckeditor/plugins/confighelper/docs/install.html
  1. … 449 more files in changeset.
LDEV-5002 Distribute Etherpad tag to all projects

    • -0
    • +98
    ./web/WEB-INF/tags/Etherpad.tag
  1. … 87 more files in changeset.
LDEV-5002 Distribute Etherpad tag to all projects

    • -0
    • +98
    ./web/WEB-INF/tags/Etherpad.tag
  1. … 87 more files in changeset.
LDEV-4999 Allow marks update in Dokuy monitoring summary page

    • -0
    • +1
    ./conf/security/Owasp.CsrfGuard.properties
    • -0
    • +4
    ./web/includes/javascript/jquery.tablesorter-editable.js
  1. … 3 more files in changeset.
SP-4 Fix an entity processing bug

SP-4 In every mode inform that processing finished successfuly

SP-4 Add group manager processing

LDEV-4995 Increase lesson name font-size

Also move CSS rules to .css file.

LDEV-3995 a11y improvements

    • -1
    • +1
    ./web/includes/javascript/readmore.min.js
  1. … 4 more files in changeset.
LDEV-4995 redesign course management page

Simplify course management page

Fixed issues with readmore-js and jquery3+

Add textarea to edit/create course

    • -1
    • +1
    ./web/includes/javascript/readmore.min.js
  1. … 3 more files in changeset.
LDEV-5005 Add "recent learning designs" section to Add Lesson dialog

    • -1
    • +65
    ./web/includes/javascript/addLesson.js
LDEV-5003 Change the way subcourses are grouped

LDEV-4995 Fix sticky footer