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

Conflicts:

lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java

lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserDAO.java

lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java

  1. … 3 more files in changeset.
LDEV-4415 Gradebook calculations and UI support weighting

  1. … 15 more files in changeset.
LDEV-4415 Add a title to weights dialog

  1. … 3 more files in changeset.
Merge remote-tracking branch 'origin/master' into LDEV-4415

  1. … 1 more file in changeset.
LDEV-4417 branch rebased to master and merge conflict of lams.jar resolved.

LDEV-4417 Popover portraits in Monitoring

Implmented in GMap

  1. … 3 more files in changeset.
Merge LDEV-4408 into lams31

  1. … 1 more file in changeset.
LDEV-4408 Implement session list in sysadmin

  1. … 7 more files in changeset.
LDEV-4293, LDEV-4400 Update domain configuration for WF10

WildFly 10 configuration files are slightly changed compared to WildFly

8 and LAMS custom stuff had to be adjusted too.

  1. … 2 more files in changeset.
LDEV-4415 Add front end for weighted outputs

  1. … 14 more files in changeset.
LDEV-4417 Popover portraits in Monitoring

Implemented in Assessment, Chat, Daco, Forum and Submit.

  1. … 74 more files in changeset.
LDEV-4415 Add tool output weight. Rewrite activity evaluations.

Activity evaluations have been implemented as a list, even though always

only the first element is meaningful. They were rewritten as one-to-one

association with Activity. The primary key is activity ID now instead of

DB generated UID.

Weight column was added.

Server version was bumped so a filter can pick up activityEvaluations ->

evaluation field rename when importing older LDs.

A convention without date was used for server version as it seems good

enough.

Unnecessary versions of clients were removed from configuration table as

they server the abandoned Flash authoring.

  1. … 18 more files in changeset.
Merge remote-tracking branch 'origin/master' into lams31

Multiple conflicts resolved with JSON replace and class move to

packages.

  1. … 33 more files in changeset.
LDEV-4407 Move lams_contentrepository exceptions to the proper package

lams_contentrepository's exception classes were moved to

contentrepository.exception package.

(To access exceptions' earlier history use Eclipse's Show in History

feature or run 'git log --follow ./path/to/file')

  1. … 66 more files in changeset.
LDEV-4366 Use new portrait API

  1. … 2 more files in changeset.
LDEV-4401 Remove deprecated parameters for integrations

We no longer use External server URL and Timeout URL settings. So they

can be removed.

  1. … 7 more files in changeset.
LDEV-4402 Substitute Gson and Apache JSON with Jackson

Jackson is a top JSON library shipped with WF10.

Apache JSON resides in an ancient library which we do not need for

anything else.

We use GSon only for serializing Java objects to JSON, which Jackson can

do too.

  1. … 134 more files in changeset.
LDEV-4398 Introduce imgscalr library for image resizing

  1. … 3 more files in changeset.
LDEV-4380 expose updateFile() method from ToolContentHandler.java

It will be required for storing several versions of user's portrait

images.

  1. … 2 more files in changeset.
LDEV-4366 Introduce rubrics to Kumalive

  1. … 29 more files in changeset.
LDEV-4377 - Show timezones to select order alphabetically

LDEV-4366 Prototype Kumalive front and back ends

  1. … 18 more files in changeset.
LDEV-4274: Initial implementation of a Learner Progress Report email, to be sent to Monitors on a set of dates. Dates are entered via a new dialog box in monitoring. The code works as long as the mailserver is running when the reports are emailed but if it fails then the emails do not resend properly.

LDEV-4347:Improve date/time for spreadsheet exports

LDEV-4274: Adding support for a file attachment to the email sender.

  1. … 4 more files in changeset.
LDEV-2999 Include a rating option for reviewed resources (authored only). To make the grouped rating of authored resources work properly, session id was added to the rating and rating comments tables and all code using the shared jRating script and shared ratings updated to store the session code. DB script updates existing rating, rating comment records.

LDEV-4334: Moving Lesson Gradebook into Monitoring window so that it is always available. EnableGradebookForMonitors field / db column has been completely removed.

  1. … 1 more file in changeset.
LDEV-4334: Moving Lesson Gradebook into Monitoring window so that it is always available and adding a Marks chart.

  1. … 4 more files in changeset.
LDEV-4326 Matching pairs answer options should be sorted alphanumerically

  1. … 3 more files in changeset.
LDEV-4312 Handle unsuccessful mark submission to integrated servers

  1. … 6 more files in changeset.