Activity lams/

12:39 pm

jliew

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.

- -0
- +1
/lams_build/3rdParty.userlibraries
- History
- Source
- Diff
/lams_build/3rdParty.userlibraries
- -0
- +1
/lams_build/build.xml
- History
- Source
- Diff
/lams_build/build.xml
- binary
/lams_build/lib/lams/lams-central.jar
- History
- Source
- Diff
/lams_build/lib/lams/lams-central.jar
- binary
/lams_build/lib/oauth/signpost-core-1.1-SNAPSHOT.jar
- History
- Source
- Diff
/lams_build/.../signpost-core-1.1-SNAPSHOT.jar
- -0
- +50
/lams_central/src/java/org/lamsfoundation/lams/oauth/FireEagleOAuthPOJO.java
- History
- Source
- Diff
/lams_central/src/.../FireEagleOAuthPOJO.java
- -0
- +79
/lams_central/src/java/org/lamsfoundation/lams/oauth/GoogleDoc.java
- History
- Source
- Diff
/lams_central/src/.../oauth/GoogleDoc.java
- -0
- +56
/lams_central/src/java/org/lamsfoundation/lams/oauth/GoogleOAuthPOJO.java
- History
- Source
- Diff
/lams_central/src/.../GoogleOAuthPOJO.java
- -0
- +37
/lams_central/src/java/org/lamsfoundation/lams/oauth/OAuthNoTokenException.java
- History
- Source
- Diff
/lams_central/.../OAuthNoTokenException.java
- -0
- +111
/lams_central/src/java/org/lamsfoundation/lams/oauth/OAuthPOJO.java
- History
- Source
- Diff
/lams_central/src/.../oauth/OAuthPOJO.java
- -0
- +293
/lams_central/src/java/org/lamsfoundation/lams/oauth/OAuthService.java
- History
- Source
- Diff
/lams_central/src/.../oauth/OAuthService.java
- -0
- +120
/lams_central/src/java/org/lamsfoundation/lams/util/XMLReaders.java
- History
- Source
- Diff
/lams_central/src/.../util/XMLReaders.java
- -0
- +3
/lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java
- History
- Source
- Diff
/lams_central/src/.../web/IndexAction.java
- -0
- +323
/lams_central/src/java/org/lamsfoundation/lams/web/OAuthAction.java
- History
- Source
- Diff
/lams_central/src/.../web/OAuthAction.java
- -0
- +67
/lams_central/web/applications.jsp
- History
- Source
- Diff
/lams_central/web/applications.jsp
- -0
- +4
/lams_central/web/profile.jsp
- History
- Source
- Diff
/lams_central/web/profile.jsp
… 10 more files in changeset.

10:38 am

jliew

LDEV-2417 merged from head

- -2
- +4
/lams_common/src/java/org/lamsfoundation/lams/util/Configuration.java
- History
- Source
- Diff
/lams_common/src/.../util/Configuration.java

10:35 am

jliew

More
MAIN:jliew:20090817023523
changed 1 file
MAIN

LDEV-2417 trim returned string config values

- -2
- +4
/lams_common/src/java/org/lamsfoundation/lams/util/Configuration.java
- History
- Source
- Diff
/lams_common/src/.../util/Configuration.java

9:36 am

lfoxton

More
MAIN:lfoxton:20090817013634
changed 2 files
MAIN

LDEV-2420 Merging the stylesheets so there is only one defaultHTML.css file, to make it easier to implement themes.

Applying the same changes to defaultHTML_rtl.css, as well as some further merging

- -3
- +0
/lams_central/web/css/defaultHTML.css
- History
- Source
- Diff
/lams_central/web/css/defaultHTML.css
- -58
- +490
/lams_central/web/css/defaultHTML_rtl.css
- History
- Source
- Diff
/lams_central/web/css/defaultHTML_rtl.css

8:41 am

lfoxton

More
MAIN:lfoxton:20090817004140
changed 1 file
MAIN

LDEV-2420 Merging the stylesheets so there is only one defaultHTML.css file, to make it easier to implement themes

- -2
- +2
/lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/ExportPortfolioService.java
- History
- Source
- Diff
/lams_learning/.../ExportPortfolioService.java

8:05 am

lfoxton

More
MAIN:lfoxton:20090817000507
changed 4 files
MAIN

LDEV-2420 Merging the stylesheets so there is only one defaultHTML.css file, to make it easier to implement themes

- -14
- +7
/lams_central/src/java/org/lamsfoundation/lams/web/tag/CssTag.java
- History
- Source
- Diff
/lams_central/src/java/.../tag/CssTag.java
- -1
- +1
/lams_central/web/main.jsp
- History
- Source
- Diff
/lams_central/web/main.jsp
- -79
- +293
/lams_central/web/css/defaultHTML.css
- History
- Source
- Diff
/lams_central/web/css/defaultHTML.css
- -5
- +3
/lams_common/src/java/org/lamsfoundation/lams/util/CSSThemeUtil.java
- History
- Source
- Diff
/lams_common/src/.../util/CSSThemeUtil.java

2:44 am

Andrey Balan

More
MAIN:andreyb:20090814184446
changed 4 files
MAIN

LDEV-2422 fixed "Exception when two separate users upload pictures"

* removed imageGalleryItems from session

- -20
- +0
/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallerySession.hbm.xml
- History
- Source
- Diff
/lams_tool_images/.../ImageGallerySession.hbm.xml
- -20
- +1
/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallerySession.java
- History
- Source
- Diff
/lams_tool_images/.../ImageGallerySession.java
- -2
- +3
/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryOutputFactory.java
- History
- Source
- Diff
/lams_tool_images/.../ImageGalleryOutputFactory.java
- -8
- +1
/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java
- History
- Source
- Diff
/lams_tool_images/src/.../LearningAction.java

7:26 pm

Marcin Cieslak

More
MAIN:marcin:20090814112624
changed 7 files
MAIN

LDEV-2374: Vote tool does not "freeze" nominations the moment the first Learner reaches the activity. Nomination list can be extended by further inputs from previous tools.

- -6
- +6
/lams_tool_vote/conf/hibernate/mappings/org/lamsfoundation/lams/tool/vote/VoteContent.hbm.xml
- History
- Source
- Diff
/lams_tool_vote/conf/.../VoteContent.hbm.xml
- -2
- +2
/lams_tool_vote/db/sql/create_lams_tool_vote.sql
- History
- Source
- Diff
/lams_tool_vote/.../create_lams_tool_vote.sql
- binary
/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dbupdates/patch20090726_updateFrom23.sql
- History
- Source
- Diff
/lams_tool_vote/.../patch20090726_updateFrom23.sql
- -14
- +17
/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteContent.java
- History
- Source
- Diff
/lams_tool_vote/src/.../VoteContent.java
- -2
- +2
/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/AuthoringUtil.java
- History
- Source
- Diff
/lams_tool_vote/src/.../AuthoringUtil.java
- -40
- +59
/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/LearningUtil.java
- History
- Source
- Diff
/lams_tool_vote/src/.../web/LearningUtil.java
- -1
- +1
/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteStarterAction.java
- History
- Source
- Diff
/lams_tool_vote/.../VoteStarterAction.java

5:47 pm

Marcin Cieslak

More
MAIN:marcin:20090813094716
changed 9 files
MAIN

LDEV-2374: Added a parameter to override repository security constraints. Now the Tool Content Handler name can be passed and a ticket will be taken from there, instead of the current tool.

Changed the way Pixlr Tool provides output for Data Flow.