lams-github

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'LDEV-5011'

LDEV-5011 Confirm before sending emails to students in Peer Review

LDEV-5009 column alignment

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

Conflicts:

lams_tool_assessment/web/pages/tblmonitoring/iraAssessmentStudentChoices.jsp

LDEV-4440 Fix form URL to start a Zoom meeting

Merge branch 'LDEV-5009'

LDEV-5009 Add student's choices table to Assessment regular monitor

Merge branch 'LDEV-5010'

LDEV-5010 Add SA and PA to Peer Review export

LDEV-4984 Prevent an exception if not everyone voted in self review

LDEV-4995 fix exception thrown on trying to get activity's Id

LDEV-4995 Cloning lessons UI changes

LDEV-4995 Cloning lessons UI changes

LDEV-4997 Use UUID_V4 function to create a unique identifier for LAMS server

LDEV-5008 better tool description

LDEV-5008 Renaming doKumaran to doKU

LDEV-4769 updating key features for 4.0

LDEV-5007 Add RATING_STEP option in rating.js

Merge branch 'LDEV-5007'

LDEV-5007 Allow decimal step in jRating

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

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

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

LDEV-4997 Do not import jQuery in Etherpad tag

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

    • -1
    • +1
    /lams_admin/web/WEB-INF/tags/Etherpad.tag
  1. … 18 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
    • +1
    /lams_admin/web/WEB-INF/tags/Etherpad.tag
  1. … 18 more files in changeset.
LDEV-5002 Move advanced Etherpad option in authoring

LDEV-5002 Move advanced Etherpad option in authoring

Merge branch 'LDEV-5002' into LDEV-4997

LDEV-5002 Show Etherpads in Assessment monitoring user summary page

Conflicts:

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

LDEV-5002 Show Etherpads in Assessment monitoring user summary page

LDEV-5002 Make "show Etherpads" option disabled, not hidden