• last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merging changes to head from the branch

LDEV-2391 Fixing small bug causing incorrect names to be returned for the ntu gradebook service

Committing changes for grades integration servlet somehow lost during 2.2-2.3

LDEV-2380: Changed number of displayed LDs to 10. Made the list show/hidden.

LDEV-2382: Fixing a bug causing only the first activity in branches in Planner to be displayed.

immediately return false if login blank

LDEV-2380: Added some code comments.

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

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

  1. … 4 more files in changeset.
Recreated/updated several resources removed by previous merge.

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

  1. … 81 more files in changeset.
more merging lams2_3 into head

  1. … 36 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)

    • -3
    • +14
    ./java/org/lamsfoundation/lams/web/tag/UserTag.java
  1. … 208 more files in changeset.
Merge lams2_3 into head

  1. … 159 more files in changeset.
Merge lams2_3_jboss5 changes into lams2_3

  1. … 98 more files in changeset.
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. … 17 more files in changeset.
Undoing some changes not meant for 2.3.1 particularly for LDEV-2389

  1. … 14 more files in changeset.
file TutorialAction.java 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. … 13 more files in changeset.
LDEV-2365 Fixing save as for tool adpaters

LDEV-2071: Fixed a minor bug. Reconfigured slim-jboss Ant task so it "slims" JBoss 5, removing unnecessary modules.

  1. … 3 more files in changeset.
LDEV-2071: Corrected several Application Context files. Did minor changes to prepare LAMS for JBoss 5.1.0.GA. Added retry mechanism in deadlock spot.

  1. … 9 more files in changeset.
Fixing a small bug in the ped planner, preview was opening as normal learner,adding &mode=preview to the end of the url fixes the problem

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.

    • -3
    • +14
    ./java/org/lamsfoundation/lams/web/tag/UserTag.java
  1. … 13 more files in changeset.
LDEV-2098 Adding information messages in lamscommunity parts

  1. … 5 more files in changeset.
LDEV-2018 Fixing a small bug, the import url did not have a "?"

Reverting this change, it was right before

LDEV-2018 Making sure the lamscommunity login appends the dest=import for the import request

  1. … 1 more file in changeset.
LDEV-2018 Adding the correct extension to the files for importing from lamscommunity