• last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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. … 45 more files in changeset.
file shouldn't have been merged (was deleted on branch)

LDEV-2372 testing framework

*there is no more need in removing .hbm.xml files

LDEV-2380: Added some code comments.

  1. … 1 more file in changeset.
LDEV-2380: Added recently edited LDs list on the first Ped Planner page.

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

  1. … 22 more files in changeset.
LDEV-2375: Added "Back" button in Planner Template editor.

  1. … 4 more files in changeset.
LDEV-2202: Added a workaround for imported Hibernate collections. The way extra fields in XML document are located was altered - the class name does not have to be a tag name anymore, attribute "class" is also supported now.

LDEV-2374: Fixed a small bug occuring when importing LD.

Recreated/updated several resources removed by previous merge.

  1. … 5 more files in changeset.
LDEV-2372 Lams Testing framework works with JBoss 5 now

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

    • -1
    • +7
    ./org/lamsfoundation/lams/commonContext.xml
    • -0
    • +55
    ./org/lamsfoundation/lams/learningdesign/dao/IDataFlowDAO.java
    • -0
    • +101
    ./org/lamsfoundation/lams/learningdesign/dto/DataFlowObjectDTO.java
    • -126
    • +86
    ./org/lamsfoundation/lams/tool/OutputFactory.java
  1. … 71 more files in changeset.
more merging lams2_3 into head

    • -0
    • +1
    ./org/lamsfoundation/lams/beanRefContext.xml
  1. … 37 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
    • +1
    ./org/lamsfoundation/lams/commonContext.xml
    • -2
    • +2
    ./org/lamsfoundation/lams/events/Event.java
    • -1
    • +2
    ./org/lamsfoundation/lams/lesson/Lesson.java
    • -256
    • +355
    ./org/lamsfoundation/lams/tool/OutputFactory.java
    • -1
    • +29
    ./org/lamsfoundation/lams/util/DateUtil.java
    • -99
    • +104
    ./org/lamsfoundation/lams/util/WebUtil.java
  1. … 200 more files in changeset.
Merge lams2_3 into head

    • -2
    • +34
    ./org/lamsfoundation/lams/beanRefContext.xml
    • -7
    • +184
    ./org/lamsfoundation/lams/commonContext.xml
    • -197
    • +237
    ./org/lamsfoundation/lams/cache/CacheManager.java
  1. … 148 more files in changeset.
Resolve conflicts from previous merge

  1. … 1 more file in changeset.
Merge lams2_3_jboss5 changes into lams2_3

    • -2
    • +34
    ./org/lamsfoundation/lams/beanRefContext.xml
    • -37
    • +212
    ./org/lamsfoundation/lams/commonContext.xml
    • -197
    • +237
    ./org/lamsfoundation/lams/cache/CacheManager.java
  1. … 86 more files in changeset.
LDEV-2372 Testing framework for LAMS

First draft of testing framework.

includes testcases for all phases(authoring, learning, monitor)

except for the one that creates new lessons (cloudWizzard.swf)

file localCommonContext.xml was initially added on branch lams2_3.

    • -0
    • +0
    ./org/lamsfoundation/lams/localCommonContext.xml
Undo-ing some changes to return to 2.3 branch

  1. … 8 more files in changeset.
LDEV-2369: Added tutorial video functionality to HEAD (previously removed from 2.3 branch).

Fixed IE > 6 bug preventing Thickbox to be centered on the screen.

  1. … 8 more files in changeset.
LDEV-2369: Added tutorial video functionality to HEAD (previously removed from 2.3 branch).

Fixed IE > 6 bug preventing Thickbox to be centered on the screen.

  1. … 16 more files in changeset.
Undoing some changes not meant for 2.3.1 particularly for LDEV-2389

  1. … 12 more files in changeset.
file patch0017_updateFrom23-231.sql was initially added on branch lams2_3.

LDEV-2369: Added further tutorial video functionality: user can disable single video, or all of them in his profile. Also, a dialog after first login is displayed.

Additionally, a small bug preventing Ped Planner to be properly deployed during whole LAMS build was fixed.

  1. … 12 more files in changeset.
Removing unneccessary debug string

file ExtServerToolAdapterMap.java was initially added on branch lams2_3.

file Patch0017_updateFrom23-231.sql was initially added on branch lams2_3.

LDEV-2366 Tool adapters to allow multiple integrated servers to user them

Committing core changes for this JIRA

    • -0
    • +1
    ./org/lamsfoundation/lams/commonContext.xml
    • -1
    • +15
    ./org/lamsfoundation/lams/tool/Tool.java
  1. … 11 more files in changeset.
LDEV-2364

Modified the createId method to return the jabberID instead of null when a 409 error code is returned from the xmpp server. A 409 error code indicates that the user has already been created with this ID

    • -6
    • +7
    ./org/lamsfoundation/lams/util/XMPPUtil.java