Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge remote-tracking branch 'origin/master' into v4.0

LDEV-5046 Make counter not overlap with its buttons in Doku monitoring

LDEV-5025 Allow leaving comments even after user rated

  1. … 31 more files in changeset.
LDEV-4925 Fix new lines on learner results page in Peer Review

  1. … 31 more files in changeset.
LDEV-5052 Add refresh button. Scroll to ratings table on refresh.

  1. … 34 more files in changeset.
LDEV-5052 Refresh page and scroll to comments on rating

  1. … 33 more files in changeset.
Merge remote-tracking branch 'origin/master' into v4.0

LDEV-5030 Sanitise user names for initial Etherpad content

  1. … 31 more files in changeset.
Merge remote-tracking branch 'origin/master' into v4.0

  1. … 2 more files in changeset.
LDEV-4996 Adjust doKu code to follow Etherpad resize update

LDEV-4996 Update Etherpad resize plugin customisation to 0.0.8

  1. … 32 more files in changeset.
Merge remote-tracking branch 'origin/master' into v4.0

Conflicts:

lams_tool_zoom/web/pages/learning/learning.jsp

  1. … 1 more file in changeset.
LDEV-4996 Add Etherpad autogrow feature to Doku tool

LDEV-4996 Adjust Etherpad autogrow feature

  1. … 31 more files in changeset.
LDEV-4997 Adjust Etherpad integration code for LAMS 3.1

  1. … 7 more files in changeset.
Merge remote-tracking branch 'origin/master' into v4.0

LDEV-5012 Display description field in Dokumaran monitoring.

Merge branch 'LDEV-4997' into v4.0

Conflicts:

lams_build/3rdParty.userlibraries

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/MonitoringController.java

  1. … 3 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.
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-4999 Fix monitor role detection when updating learner mark

    • -37
    • +37
    ./WEB-INF/tags/ImgButtonWrapper.tag
  1. … 463 more files in changeset.
LDEV-5002 Distribute Etherpad tag to all projects

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

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

  1. … 4 more files in changeset.
LDEV-4999 Display users in tablesorter in Doku monitoring summary

  1. … 2 more files in changeset.
LDEV-4997 Introduce Etherpad as a JSP tag

  1. … 9 more files in changeset.
LDEV-4994 Fix description field in authoring

LDEV-4997 Move Etherpad Javascript code

    • -113
    • +0
    ./includes/javascript/etherpad.js
  1. … 1 more file in changeset.
LDEV-4997 Move Etherpad Javascript code

    • -113
    • +0
    ./includes/javascript/etherpad.js
  1. … 1 more file in changeset.
LDEV-4997 Initial migration of Doku tool to Etherpad as central service

    • -37
    • +37
    ./WEB-INF/tags/ImgButtonWrapper.tag
  1. … 31 more files in changeset.