• last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
file OAuthAction.java was initially added on branch lams2_3_oauth.

    • -0
    • +0
    ./java/org/lamsfoundation/lams/web/OAuthAction.java
oauth support functional but not production ready (tokens currently stored in address columns of lams_user). added new share resource type for google docs which are retrieved via oauth and saved as html files in content repository.

  1. … 16 more files in changeset.
LDEV-2420 Merging the stylesheets so there is only one defaultHTML.css file, to make it easier to implement themes

    • -14
    • +7
    ./java/org/lamsfoundation/lams/web/tag/CssTag.java
  1. … 3 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. … 47 more files in changeset.
LDEV-2391 Fixing small bug causing incorrect names to be returned for the ntu gradebook service

- ooops forgot one little change

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