lams

lams_central

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 0
Total Committers: 21
Last Commit:
Commits this week: 0
Total Lines of Code (LoC): 130,561
Net change in LoC this week: 0

Commit Activity

Commits By Day In Week
52 week commits volume
Commits By Day In Week
Commits by day
Commits By Day In Week
Commits by hour
Commits By Hour In Day
Commit calendar
 

Most active committers (90 days)

loading
loading
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates

Changeset MAIN:jliew:20090817043917:2 does not match your current filter (clear filter).

Monday 17 Aug 2009
6:39 am

jliew

file FireEagleOAuthPOJO.java was initially added on branch lams2_3_oauth.

Options
    • -0
    • +0
    ./src/java/org/lamsfoundation/lams/oauth/FireEagleOAuthPOJO.java
6:39 am

jliew

file GoogleOAuthPOJO.java was initially added on branch lams2_3_oauth.

Options
    • -0
    • +0
    ./src/java/org/lamsfoundation/lams/oauth/GoogleOAuthPOJO.java
6:39 am

jliew

file GoogleDoc.java was initially added on branch lams2_3_oauth.

Options
    • -0
    • +0
    ./src/java/org/lamsfoundation/lams/oauth/GoogleDoc.java
6:39 am

jliew

file OAuthAction.java was initially added on branch lams2_3_oauth.

Options
    • -0
    • +0
    ./src/java/org/lamsfoundation/lams/web/OAuthAction.java
6:39 am

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.

Options
    • -0
    • +50
    ./src/java/org/lamsfoundation/lams/oauth/FireEagleOAuthPOJO.java
    • -0
    • +79
    ./src/java/org/lamsfoundation/lams/oauth/GoogleDoc.java
    • -0
    • +56
    ./src/java/org/lamsfoundation/lams/oauth/GoogleOAuthPOJO.java
    • -0
    • +37
    ./src/java/org/lamsfoundation/lams/oauth/OAuthNoTokenException.java
    • -0
    • +111
    ./src/java/org/lamsfoundation/lams/oauth/OAuthPOJO.java
    • -0
    • +293
    ./src/java/org/lamsfoundation/lams/oauth/OAuthService.java
    • -0
    • +120
    ./src/java/org/lamsfoundation/lams/util/XMLReaders.java
    • -0
    • +3
    ./src/java/org/lamsfoundation/lams/web/IndexAction.java
    • -0
    • +323
    ./src/java/org/lamsfoundation/lams/web/OAuthAction.java
    • -0
    • +67
    ./web/applications.jsp
    • -0
    • +4
    ./web/profile.jsp
  12. … 14 more files in changeset.
3:36 am

lfoxton

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

Options
    • -3
    • +0
    ./web/css/defaultHTML.css
    • -58
    • +490
    ./web/css/defaultHTML_rtl.css
2:05 am

lfoxton

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

Options
    • -14
    • +7
    ./src/java/org/lamsfoundation/lams/web/tag/CssTag.java
    • -1
    • +1
    ./web/main.jsp
    • -79
    • +293
    ./web/css/defaultHTML.css
  4. … 1 more file in changeset.
Wednesday 29 Jul 2009
8:01 am

Ernie Ghiglione

Updating Japanese

Options
    • -1
    • +1
    ./conf/flashxml/lams/authoring/ja_JP_dictionary.xml
    • -1
    • +1
    ./conf/flashxml/lams/learner/ja_JP_dictionary.xml
    • -1
    • +1
    ./conf/flashxml/lams/monitoring/ja_JP_dictionary.xml
    • -81
    • +81
    ./conf/language/lams/ApplicationResources_ja_JP.properties
  5. … 15 more files in changeset.
Tuesday 28 Jul 2009
4:19 pm

Andrey Balan

LDEV-2387 simplified rendering of FCKEditor

* removed commented JS part from FCKEditor jsp tag

* removed fckeditorheader.jsp

* got rid of any references to fckeditor.js, fckcontroller.js, fckeditor.css

Options
    • -23
    • +0
    ./web/WEB-INF/tags/FCKEditor.tag
    • -6
    • +1
    ./web/WEB-INF/tags/headItems.tag
  3. … 96 more files in changeset.
Monday 27 Jul 2009
12:17 am

Marcin Cieslak

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.

Options
    • -5
    • +7
    ./src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
    • -10
    • +30
    ./src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
    • -1
    • +11
    ./src/java/org/lamsfoundation/lams/authoring/service/IAuthoringService.java
  4. … 47 more files in changeset.
Thursday 23 Jul 2009
8:09 am

lfoxton

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

- ooops forgot one little change

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java
7:36 am

lfoxton

Merging changes to head from the branch

Options
    • -26
    • +31
    ./src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java
7:25 am

lfoxton

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

Options
    • -9
    • +7
    ./src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java
2:14 am

lfoxton

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

Options
    • -8
    • +10
    ./src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java
Tuesday 21 Jul 2009
11:13 pm

Marcin Cieslak

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

Options
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/util/CentralConstants.java
11:09 pm

Marcin Cieslak

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

Options
    • -4
    • +4
    ./src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java
Wednesday 15 Jul 2009
4:01 am

jliew

immediately return false if login blank

Options
    • -2
    • +4
    ./src/java/org/lamsfoundation/lams/security/LDAPAuthenticator.java
Tuesday 14 Jul 2009
2:09 pm

Ernie Ghiglione

Updating Japanese

Options
    • -22
    • +22
    ./conf/language/lams/ApplicationResources_ja_JP.properties
  2. … 12 more files in changeset.
1:52 pm

Ernie Ghiglione

Updating Japanese

Options
    • -1
    • +1
    ./conf/flashxml/lams/authoring/ja_JP_dictionary.xml
    • -1
    • +1
    ./conf/flashxml/lams/monitoring/ja_JP_dictionary.xml
Thursday 09 Jul 2009
10:47 am

jliew

merge fix for LDEV-2381 from lams2_3_release branch

Options
    • -0
    • +4
    ./web/includes/javascript/groupDisplay.js
9:27 am

jliew

LDEV-2381 'add lesson' link not initialised for thickbox when group contents had to be expanded

Options
    • -0
    • +4
    ./web/includes/javascript/groupDisplay.js
Wednesday 08 Jul 2009
8:55 am

Marcin Cieslak

LDEV-2380: Added some code comments.

Options
    • -2
    • +12
    ./src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java
  2. … 2 more files in changeset.
8:24 am

Marcin Cieslak

LDEV-2380: Added recently edited LDs list on the first Ped Planner page.

Options
    • -7
    • +7
    ./build.xml
    • -2
    • +13
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +3
    ./src/java/org/lamsfoundation/lams/util/CentralConstants.java
    • -4
    • +74
    ./src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java
  5. … 6 more files in changeset.
Monday 06 Jul 2009
4:19 pm

Marcin Cieslak

LDEV-2375: Added "Back" button in Planner Template editor.

Options
    • -1
    • +86
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +1
    ./conf/xdoclet/struts-forms.xml
    • -4
    • +6
    ./src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java
    • -1
    • +1
    ./web/includes/javascript/pedagogicalPlanner.js
  5. … 1 more file in changeset.
1:04 pm

Andrey Balan

file thickbox.patched.js was added on branch lams2_3_release on 2010-02-26 21:10:34 +0000

Options
    • -0
    • +0
    ./web/includes/javascript/thickbox.patched.js
1:04 pm

Marcin Cieslak

Recreated/updated several resources removed by previous merge.

Options
    • -7
    • +7
    ./build.xml
    • -0
    • +173
    ./src/java/org/lamsfoundation/lams/web/TutorialAction.java
    • -2
    • +1
    ./web/editprofile.jsp
    • -0
    • +102
    ./web/tutorialVideo.jsp
    • -28
    • +13
    ./web/includes/javascript/thickbox.patched.js
  6. … 1 more file in changeset.
9:25 am

jliew

merge lams2_3 to head

Options
    • -0
    • +9
    ./web/WEB-INF/web.xml
    • -1
    • +0
    ./web/WEB-INF/struts/struts-config.xml
    • -0
    • +43
    ./web/css/defaultMainHTML.css
    • -2
    • +2
    ./web/fckeditor/editor/plugins/paint/fckplugin.js
    • -3
    • +8
    ./web/fckeditor/editor/plugins/videorecorder/VideoRecorderFCKEditor.jsp
    • -1
    • +3
    ./web/fckeditor/editor/plugins/videorecorder/lang/en.js
  7. … 17 more files in changeset.
1:07 am

Marcin Cieslak

Fixed some merging bugs preventing preview to start correctly.

Options
    • -1
    • +1
    ./web/main.jsp
  2. … 1 more file in changeset.
Sunday 05 Jul 2009
3:18 pm

Ernie Ghiglione

Updating Greek, English, Spanish, Japanese, Norwegian

Options
    • -91
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -7
    • +44
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -119
    • +39
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -4
    • +41
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -38
    • +96
    ./conf/language/lams/ApplicationResources_ja_JP.properties
    • -2
    • +39
    ./conf/language/lams/ApplicationResources_no_NO.properties
  7. … 19 more files in changeset.
Friday 03 Jul 2009
9:51 pm

Ernie Ghiglione

Updating Greek, English, Spanish, Maori, Norwegian and Russian, Japanese

Options
    • -1
    • +1
    ./conf/flashxml/lams/learner/el_GR_dictionary.xml
    • -1
    • +1
    ./conf/flashxml/lams/learner/en_AU_dictionary.xml
    • -1
    • +1
    ./conf/flashxml/lams/learner/en_dictionary.xml
    • -1
    • +1
    ./conf/flashxml/lams/learner/es_ES_dictionary.xml
    • -1
    • +1
    ./conf/flashxml/lams/learner/ja_JP_dictionary.xml
    • -1
    • +1
    ./conf/flashxml/lams/learner/mi_NZ_dictionary.xml
    • -1
    • +1
    ./conf/flashxml/lams/learner/no_NO_dictionary.xml
    • -1
    • +1
    ./conf/flashxml/lams/learner/ru_RU_dictionary.xml