• last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-2611 updating tool's version in order to make work import filter

*merge from lams2_3_release

LDEV-2611 updating tool's version in order to make work import filter

LDEV-2611 Added import filter to remove the old isOptional field and correctly add the required field.

LDEV-2611 Added import filter to remove the old isOptional field and correctly add the required field.

LDEV-2524 adding autopatch script

*merge from lams2_3_release

LDEV-2524 adding autopatch script

file patch20101022_updateTo235.sql was initially added on branch lams2_3_release.

LDEV-2579 saving conditionList when editing activity in monitor

*merge from HEAD

LDEV-2579 saving conditionList when editing activity in monitor

Merging changes from 2.3 release branch for LDEV-2524.

    • -27
    • +23
    ./org/lamsfoundation/lams/tool/qa/QaQueContent.java
    • -12
    • +1
    ./org/lamsfoundation/lams/tool/qa/QaUtils.java
  1. … 15 more files in changeset.
Merging changes from 2.3 release branch. Working on bugs LDEV-2524, LDEV-2578, LDEV-2581

  1. … 1 more file in changeset.
LDEV-2524 Implementing the compulsory question option.

LDEV-2578 Make questions appear in their display order, not in the database order, in authoring and monitoring.

LDEV-2524 Implementing the compulsory question option. Make the question object more complex so we don't have a new map for every field added, and ensure all the necessary data is set up when we redisplay a screen with the error message.

LDEV-2578 Make questions appear in their display order, not in the database order, in authoring and monitoring.

LDEV-2581 Make sure the rich text field setting is honoured for more than just the first screen!

LDEV-2524 Implementing the compulsory question option. Made the question map contain a complex object rather than a single string so that we didn't have to keep adding maps every time we added more data for each question.

LDEV-2524 Implementing the compulsory question option.

LDEV-2578 Make questions appear in their display order, not in the database order, in authoring and monitoring.

LDEV-2524 Implementing the compulsory question option. Add a new required field, and removed the optional field that had never been implemented properly.

    • -41
    • +23
    ./org/lamsfoundation/lams/tool/qa/QaQueContent.java
LDEV-2524 Implementing the compulsory question option. Removed excess debugging to make debug level run faster.

    • -12
    • +1
    ./org/lamsfoundation/lams/tool/qa/QaUtils.java
LDEV-2524 Implementing the compulsory question option.

  1. … 3 more files in changeset.
LDEV-2524 Implementing the compulsory question option. Made the question map contain a complex object rather than a single string so that we didn't have to keep adding maps every time we added more data for each question.

  1. … 3 more files in changeset.
LDEV-2524 Implementing the compulsory question option.

LDEV-2568 Q&A export portfolio to include teacher's comments

*merge from lams2_3_release

  1. … 1 more file in changeset.
LDEV-2568 Q&A export portfolio to include teacher's comments

  1. … 1 more file in changeset.
LDEV-2526 merged from branch

LDEV-2526 sessionMap not properly updated

LDEV-2526 persisting to db based on displayOrder and question text isn't a good idea, hopefully this fix is robust enough

LDEV-2374: Added outputs for Data Flow for:

* Image gallery (URL to the images uploaded by the students),

* Forum (text for the postings for a student in the forum)

* Chat (all text postings for a student in the chat)

* Pixlr (URL to the image)

* Share resources (URL to file/urls uploaded)

* Notebook (Text entered by the student)

* Submit Files (URL to files uploaded)

  1. … 32 more files in changeset.
LDEV-2374:

- Vote now accepts nominations created by Teacher as well as ones derived from input.

- Teacher can now limit number of Learners contributing to Vote's nomination pool.

- Each tool now declares which DataOutputDefinitions it can accept for Data Flow.

  1. … 48 more files in changeset.
change to ascii

  1. … 25 more files in changeset.
LDEV-2374: Data flow between tools: framework and example for Q&A -> Vote.

  1. … 83 more files in changeset.
Merge lams2_3 to head (including things not merged last time due to eclipse's merge wizard not handling the lams2_3 start point as expected)

  1. … 205 more files in changeset.