lams-github

lams_central

Clone Tools

Stats

Commits this week: 0
Total Committers: 31
Last Commit:
Commits this week: 0

Lines of code count not available

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
Monday 17 Aug 2009
1:46 pm

lfoxton

LDEV-2420 Some adjustments to make rtl appear better in ie

Options
    • -26
    • +14
    ./web/css/defaultHTML_rtl.css
9: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
    • -57
    • +489
    ./web/css/defaultHTML_rtl.css
8:05 am

lfoxton

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

Options
    • -13
    • +6
    ./src/java/org/lamsfoundation/lams/web/tag/CssTag.java
    • -79
    • +293
    ./web/css/defaultHTML.css
    • -1
    • +1
    ./web/main.jsp
  4. … 1 more file in changeset.
Wednesday 29 Jul 2009
2:13 pm

erniegx <ernieg@gmail.com>

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. … 19 more files in changeset.
Tuesday 28 Jul 2009
10:20 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
6:21 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
    • -4
    • +6
    ./src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
    • -9
    • +29
    ./src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
    • -0
    • +10
    ./src/java/org/lamsfoundation/lams/authoring/service/IAuthoringService.java
  4. … 47 more files in changeset.
Thursday 23 Jul 2009
1:36 pm

lfoxton

Merging changes to head from the branch

Options
    • -26
    • +31
    ./src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java
8: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
Wednesday 22 Jul 2009
5:13 am

Marcin Cieslak

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

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/util/CentralConstants.java
5:09 am

Marcin Cieslak

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

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

jliew

immediately return false if login blank

Options
    • -1
    • +3
    ./src/java/org/lamsfoundation/lams/security/LDAPAuthenticator.java
Tuesday 14 Jul 2009
8:23 pm

erniegx <ernieg@gmail.com>

Updating Japanese

Options
    • -22
    • +22
    ./conf/language/lams/ApplicationResources_ja_JP.properties
  2. … 14 more files in changeset.
7:53 pm

erniegx <ernieg@gmail.com>

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
4:47 pm

jliew

merge fix for LDEV-2381 from lams2_3_release branch

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

Marcin Cieslak

LDEV-2380: Added some code comments.

Options
    • -1
    • +11
    ./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
    • -1
    • +12
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +2
    ./src/java/org/lamsfoundation/lams/util/CentralConstants.java
    • -3
    • +73
    ./src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java
  5. … 6 more files in changeset.
Monday 06 Jul 2009
10:20 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
    • -3
    • +5
    ./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

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
    • -28
    • +13
    ./web/includes/javascript/thickbox.patched.js
    • -0
    • +102
    ./web/tutorialVideo.jsp
  6. … 1 more file in changeset.
3:25 pm

jliew

merge lams2_3 to head

Options
    • -1
    • +0
    ./web/WEB-INF/struts/struts-config.xml
    • -0
    • +9
    ./web/WEB-INF/web.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:21 pm

erniegx <ernieg@gmail.com>

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

erniegx <ernieg@gmail.com>

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

erniegx <ernieg@gmail.com>

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

erniegx <ernieg@gmail.com>

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

erniegx <ernieg@gmail.com>

Updating Japanese

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

jliew

Merge lams2_3 to head (continuing...)

Options
    • -1
    • +1
    ./conf/flashxml/lams/monitoring/ru_RU_dictionary.xml
    • -0
    • +1
    ./web/WEB-INF/struts/struts-config.xml
    • -18
    • +11
    ./web/WEB-INF/web.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
9:06 pm

Marcin Cieslak

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

Options
    • -30
    • +36
    ./src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
    • -87
    • +72
    ./src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/authoring/service/IAuthoringService.java
    • -29
    • +26
    ./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:59 pm

jliew

more merging lams2_3 into head

Options
    • -12
    • +21
    ./src/java/org/lamsfoundation/lams/web/lamscommunity/LamsCommunityLoginAction.java
    • -5
    • +5
    ./src/java/org/lamsfoundation/lams/web/lamscommunity/LamsCommunityLoginForm.java
    • -4
    • +9
    ./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
    • -22
    • +22
    ./web/fckeditor/editor/plugins/paint/lang/en.js
    • -4
    • +4
    ./web/fckeditor/editor/plugins/paint/swfobject.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. … 18 more files in changeset.
4:19 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
    • -13
    • +22
    ./src/java/org/lamsfoundation/lams/authoring/web/ImportToolContentAction.java
    • -9
    • +8
    ./src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java
    • -42
    • +118
    ./src/java/org/lamsfoundation/lams/web/LAMSConnectorServlet.java
    • -2
    • +13
    ./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
    • -9
    • +12
    ./src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java
    • -8
    • +1
    ./web/WEB-INF/tiles/tiles-defs.xml
    • -1
    • +10
    ./web/WEB-INF/web.xml
    • -27
    • +0
    ./web/community.jsp
  16. … 153 more files in changeset.
2:12 pm

jliew

remove merge conflict flags

Options
    • -7
    • +0
    ./web/login.jsp