lams_tool_doku

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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

    • -11
    • +13
    ./web/pages/monitoring/summary.jsp
  1. … 1 more file in changeset.
LDEV-4996 Add Etherpad autogrow feature to Doku tool

    • -11
    • +13
    ./web/pages/monitoring/summary.jsp
LDEV-4996 Remove obsolete menu item

  1. … 1 more file in changeset.
LDEV-4996 Adjust Etherpad autogrow feature

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

Conflicts:

lams_admin/conf/language/lams/ApplicationResources.properties

lams_build/3rdParty.userlibraries

lams_build/build.xml

lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java

lams_central/web/includes/javascript/openUrls.js

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

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

lams_common/src/java/org/lamsfoundation/lams/outcome/Outcome.java

lams_common/src/java/org/lamsfoundation/lams/outcome/OutcomeMapping.java

lams_common/src/java/org/lamsfoundation/lams/outcome/OutcomeScale.java

lams_common/src/java/org/lamsfoundation/lams/outcome/service/IOutcomeService.java

lams_common/src/java/org/lamsfoundation/lams/outcome/service/OutcomeService.java

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

lams_tool_assessment/conf/language/lams/ApplicationResources.properties

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java

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_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java

lams_tool_assessment/web/pages/learning/learning.jsp

lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dao/hibernate/DokumaranUserDAOHibernate.java

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

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20170101_updateTo30.sql

lams_tool_lamc/web/tblmonitoring/mcq.jsp

lams_tool_lamc/web/tblmonitoring/mcqStudentChoices.jsp

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

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

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java

lams_tool_scratchie/web/pages/learning/scratchies.jsp

lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp

lams_www/web/news.html

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

  1. … 6 more files in changeset.
LDEV-5008 update label

LDEV-5008 updating label

LDEV-5008 backporting to master

    • -1
    • +1
    ./db/sql/create_lams_tool_dokumaran.sql
LDEV-5008 Forgot the S in instructions

LDEV-5008 Rename doKumaran tool

    • -1
    • +1
    ./db/sql/create_lams_tool_dokumaran.sql
Merge remote-tracking branch 'origin/master' into v4.0

LDEV-5012 Display description field in Dokumaran monitoring.

LDEV-5008 better tool description

LDEV-5008 Renaming doKumaran to doKU

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. … 2 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/WEB-INF/tags/ImgButtonWrapper.tag
  1. … 462 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

    • -13
    • +68
    ./web/pages/monitoring/summary.jsp
  1. … 2 more files in changeset.