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

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.
Undoing some changes not meant for 2.3.1 particularly for LDEV-2389

  1. … 12 more files in changeset.
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

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
LDEV-1998: Additional clean up.

LDEV-2074: Fixed a bug in Floating Activity validation preventing Learnind Designs to be imported correctly.

LDEV-2074 missing dbupdate insert

Disabled videorecorder.

LDEV-1998: Changed the way Subject field is processed in the Forum Tool.

    • -99
    • +104
    ./org/lamsfoundation/lams/util/WebUtil.java
  1. … 6 more files in changeset.
LDEV-2311

Added catch for all exceptions.

    • -0
    • +3
    ./org/lamsfoundation/lams/util/XMPPUtil.java
XMPPUtil now doesn't report an error when a room is trying to be recreated

    • -0
    • +5
    ./org/lamsfoundation/lams/util/XMPPUtil.java
AutoPatch for 2.2->2.3 updated with red5 config stuff and presenceChat table corrected

LDEV-2334: changing hardcoded labels to GMT timezones instead

LDEV-2310 New custom Time Zone settings in Advanced tab of Wizard for scheduling lessons to a particular timezone, pre-selected to user's timezone from profile settings. Added common methods for timezone conversion to DateUtil. Using these methods to alternate Date times between client and server, and formatting for how they're presented to users based on locale/timezone.

    • -1
    • +29
    ./org/lamsfoundation/lams/util/DateUtil.java
  1. … 14 more files in changeset.
XMPPUtil updated

Now only debug prints if a user is trying to create a room without having set XMPP configuration settings

    • -8
    • +21
    ./org/lamsfoundation/lams/util/XMPPUtil.java
LDEV-2310 Updated lastModifiedDateTime formatted string to be based off User's timezone value. Used in Author (Workspace dialog).

  1. … 1 more file in changeset.
Committed last changed from HEAD to 2.3 branch

  1. … 94 more files in changeset.
LDEV-2307 Fixed sql exception on attempted/completed count.

Updating update scripts to be up to date with all changes

Putting in new gradebook activity column into update scripts

LDEV-2054 Adding sql script to update scripts for grouping

LDEV-2125 Adding the timezone column to the lams_user table so its updates for 2.3 as required

LI-191 Moving changes in the lams_tool table to the updater as they will need to run before the tools are deployed by the updater

LDEV-2261 Setting a flag in gradebook activities so that they can be updated more than once if hte request comes from an external source like a tool. If it is set in gradebook, the flag is set so it cant be updated from an external source again

  1. … 10 more files in changeset.