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
Thursday 09 Jul 2009
3:27 pm

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
2:55 pm

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.
2:24 pm

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
10: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.
7: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
7: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.
3:25 pm

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.
7: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
9: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.
Saturday 04 Jul 2009
3:51 am

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
3:48 am

Ernie Ghiglione

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

Options
    • -1
    • +1
    ./conf/flashxml/lams/monitoring/el_GR_dictionary.xml
    • -1
    • +1
    ./conf/flashxml/lams/monitoring/en_AU_dictionary.xml
    • -1
    • +1
    ./conf/flashxml/lams/monitoring/en_dictionary.xml
    • -1
    • +1
    ./conf/flashxml/lams/monitoring/es_ES_dictionary.xml
    • -1
    • +1
    ./conf/flashxml/lams/monitoring/ja_JP_dictionary.xml
    • -1
    • +1
    ./conf/flashxml/lams/monitoring/no_NO_dictionary.xml
    • -1
    • +1
    ./conf/flashxml/lams/monitoring/ru_RU_dictionary.xml
3:46 am

Ernie Ghiglione

Updating Greek, English, Spanish, Norwegian and Russian

Options
    • -1
    • +1
    ./conf/flashxml/lams/authoring/el_GR_dictionary.xml
    • -1
    • +1
    ./conf/flashxml/lams/authoring/en_AU_dictionary.xml
    • -1
    • +1
    ./conf/flashxml/lams/authoring/en_dictionary.xml
    • -1
    • +1
    ./conf/flashxml/lams/authoring/es_ES_dictionary.xml
    • -1
    • +1
    ./conf/flashxml/lams/authoring/no_NO_dictionary.xml
    • -1
    • +1
    ./conf/flashxml/lams/authoring/ru_RU_dictionary.xml
3:43 am

Ernie Ghiglione

Updating Japanese

Options
    • -1
    • +1
    ./conf/flashxml/lams/authoring/ja_JP_dictionary.xml
Friday 03 Jul 2009
12:57 pm

jliew

Merge lams2_3 to head (continuing...)

Options
    • -1
    • +1
    ./conf/flashxml/lams/monitoring/ru_RU_dictionary.xml
    • -18
    • +11
    ./web/WEB-INF/web.xml
    • -0
    • +1
    ./web/WEB-INF/struts/struts-config.xml
    • -27
    • +0
    ./web/pedagogical_planner/defaultActivityForm.jsp
    • -437
    • +0
    ./web/pedagogical_planner/sequenceChooser.jsp
    • -267
    • +0
    ./web/pedagogical_planner/templateBase.jsp
  7. … 45 more files in changeset.
Thursday 02 Jul 2009
8:59 pm

Marcin Cieslak

LDEV-2374: Data flow between tools: framework and example for Q&A -> Vote.

Options
    • -31
    • +37
    ./src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
    • -89
    • +74
    ./src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/authoring/service/IAuthoringService.java
    • -30
    • +27
    ./src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java
    • -139
    • +144
    ./src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java
  6. … 81 more files in changeset.
5:54 pm

jliew

more merging lams2_3 into head

Options
    • -13
    • +22
    ./src/java/org/lamsfoundation/lams/web/lamscommunity/LamsCommunityLoginAction.java
    • -6
    • +6
    ./src/java/org/lamsfoundation/lams/web/lamscommunity/LamsCommunityLoginForm.java
    • -5
    • +10
    ./src/java/org/lamsfoundation/lams/web/lamscommunity/LamsCommunityUtil.java
    • -0
    • +7
    ./src/java/org/lamsfoundation/lams/webservice/PaintAction.java
    • -0
    • +57
    ./web/fckeditor/editor/plugins/paint/content.jsp
    • -4
    • +4
    ./web/fckeditor/editor/plugins/paint/swfobject.js
    • -22
    • +22
    ./web/fckeditor/editor/plugins/paint/lang/en.js
    • binary
    ./web/fckeditor/editor/plugins/videorecorder/VideoRecorderFCKEditor.swf
    • -0
    • +6
    ./web/fckeditor/editor/plugins/videorecorder/history/history.css
    • -0
    • +662
    ./web/fckeditor/editor/plugins/videorecorder/history/history.js
    • -0
    • +29
    ./web/fckeditor/editor/plugins/videorecorder/history/historyFrame.html
    • binary
    ./web/images/css/course_gradebook.png
    • binary
    ./web/images/css/mark.png
    • binary
    ./web/images/css/my-grades.png
    • -0
    • +38
    ./web/lamscommunity/community.jsp
  16. … 25 more files in changeset.
4:18 pm

jliew

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)

Options
    • -1
    • +0
    ./build.xml
    • -1
    • +1
    ./conf/flashxml/lams/authoring/ru_RU_dictionary.xml
    • -1
    • +1
    ./conf/flashxml/lams/learner/ru_RU_dictionary.xml
    • -1
    • +0
    ./conf/xdoclet/struts-forms.xml
    • -0
    • +1
    ./conf/xdoclet/web-security.xml
    • -14
    • +23
    ./src/java/org/lamsfoundation/lams/authoring/web/ImportToolContentAction.java
    • -10
    • +9
    ./src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java
    • -42
    • +118
    ./src/java/org/lamsfoundation/lams/web/LAMSConnectorServlet.java
    • -3
    • +14
    ./src/java/org/lamsfoundation/lams/web/tag/UserTag.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/webservice/LessonManagerSoapBindingImpl.java
    • -24
    • +48
    ./src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java
    • -10
    • +13
    ./src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java
    • -27
    • +0
    ./web/community.jsp
    • -40
    • +42
    ./web/forgotPassword.jsp
    • -28
    • +29
    ./web/forgotPasswordChange.jsp
  16. … 200 more files in changeset.
2:12 pm

jliew

remove merge conflict flags

Options
    • -7
    • +0
    ./web/login.jsp
Wednesday 01 Jul 2009
10:39 am

jliew

Merge lams2_3 into head

Options
    • -4
    • +10
    ./.classpath
    • -0
    • +9
    ./build.xml
    • -1
    • +1
    ./conf/flashxml/lams/learner/ja_JP_dictionary.xml
    • -6
    • +6
    ./conf/xdoclet/servlets.xml
    • -3
    • +10
    ./conf/xdoclet/web-settings.xml
    • -0
    • +6
    ./src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml
    • -4
    • +14
    ./src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
    • -3
    • +4
    ./src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java
    • -1
    • +3
    ./src/java/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml
    • binary
    ./web/lams_authoring.swf
    • binary
    ./web/lams_authoring_library.swf
  12. … 152 more files in changeset.
Tuesday 30 Jun 2009
10:30 am

jliew

Merge lams2_3_jboss5 changes into lams2_3

Options
    • -4
    • +10
    ./.classpath
    • -6
    • +6
    ./conf/xdoclet/servlets.xml
    • -3
    • +10
    ./conf/xdoclet/web-settings.xml
    • -0
    • +6
    ./src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml
    • -1
    • +3
    ./src/java/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml
  6. … 95 more files in changeset.
Thursday 25 Jun 2009
11:12 am

lfoxton

Undo-ing some changes to return to 2.3 branch

Options
    • -173
    • +0
    ./src/java/org/lamsfoundation/lams/web/TutorialAction.java
    • -102
    • +0
    ./web/tutorialVideo.jsp
    • -0
    • +9
    ./web/includes/javascript/thickbox-compressed.js
  4. … 6 more files in changeset.
Friday 19 Jun 2009
6:50 pm

Marcin Cieslak

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.

Options
    • -0
    • +173
    ./src/java/org/lamsfoundation/lams/web/TutorialAction.java
    • -0
    • +102
    ./web/tutorialVideo.jsp
    • -9
    • +0
    ./web/includes/javascript/thickbox-compressed.js
  4. … 6 more files in changeset.
6:50 pm

Marcin Cieslak

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.

Options
    • -36
    • +47
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +1
    ./conf/xdoclet/struts-forms.xml
    • -1
    • +22
    ./src/java/org/lamsfoundation/lams/web/IndexAction.java
    • -2
    • +19
    ./src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java
    • -0
    • +26
    ./web/editprofile.jsp
    • -1
    • +10
    ./web/main.jsp
    • -0
    • +16
    ./web/css/pedagogicalPlanner.css
    • -0
    • +342
    ./web/includes/javascript/thickbox.patched.js
  9. … 11 more files in changeset.
1:49 pm

Marcin Cieslak

Undoing some changes not meant for 2.3.1 particularly for LDEV-2389.

Putting back build.xml changes in lams_central as it does not affect undesired functionality.

Options
    • -6
    • +6
    ./build.xml
12:32 pm

lfoxton

Undoing some changes not meant for 2.3.1 particularly for LDEV-2389

Options
    • -6
    • +6
    ./build.xml
    • -7
    • +2
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +0
    ./conf/xdoclet/struts-forms.xml
    • -20
    • +4
    ./src/java/org/lamsfoundation/lams/web/IndexAction.java
    • -173
    • +0
    ./src/java/org/lamsfoundation/lams/web/TutorialAction.java
    • -18
    • +3
    ./src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java
    • -26
    • +0
    ./web/editprofile.jsp
    • -9
    • +0
    ./web/main.jsp
    • -102
    • +0
    ./web/tutorialVideo.jsp
    • -16
    • +0
    ./web/css/pedagogicalPlanner.css
  11. … 7 more files in changeset.
3:43 am

Marcin Cieslak

file TutorialAction.java was initially added on branch lams2_3.

Options
    • -0
    • +0
    ./src/java/org/lamsfoundation/lams/web/TutorialAction.java
3:43 am

Marcin Cieslak

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.

Options
    • -6
    • +6
    ./build.xml
    • -1
    • +5
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +1
    ./conf/xdoclet/struts-forms.xml
    • -4
    • +20
    ./src/java/org/lamsfoundation/lams/web/IndexAction.java
    • -0
    • +173
    ./src/java/org/lamsfoundation/lams/web/TutorialAction.java
    • -4
    • +19
    ./src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java
    • -0
    • +26
    ./web/editprofile.jsp
    • -0
    • +9
    ./web/main.jsp
    • -4
    • +73
    ./web/tutorialVideo.jsp
    • -0
    • +6
    ./web/css/pedagogicalPlanner.css
  11. … 6 more files in changeset.
Thursday 18 Jun 2009
3:45 pm

Ernie Ghiglione

Updating Japanese

Options
    • -1
    • +1
    ./conf/flashxml/lams/learner/ja_JP_dictionary.xml
  2. … 1 more file in changeset.
3:44 pm

Ernie Ghiglione

Updating Greek and Spanish

Options
    • -1
    • +1
    ./conf/flashxml/lams/monitoring/el_GR_dictionary.xml
    • -1
    • +1
    ./conf/flashxml/lams/monitoring/es_ES_dictionary.xml
3:43 pm

Ernie Ghiglione

Updating Spanish

Options
    • -1
    • +1
    ./conf/flashxml/lams/authoring/es_ES_dictionary.xml