lams / lams_central

web

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): 85,745
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
Monday 17 Aug 2009
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
    • -1
    • +1
    ./main.jsp
    • -79
    • +293
    ./css/defaultHTML.css
  3. … 2 more files in changeset.
Tuesday 28 Jul 2009
10: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-INF/tags/FCKEditor.tag
    • -6
    • +1
    ./WEB-INF/tags/headItems.tag
  3. … 96 more files in changeset.
Thursday 09 Jul 2009
4:47 pm

jliew

merge fix for LDEV-2381 from lams2_3_release branch

Options
    • -0
    • +4
    ./includes/javascript/groupDisplay.js
3:27 pm

jliew

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

Options
    • -0
    • +4
    ./includes/javascript/groupDisplay.js
Monday 06 Jul 2009
10:19 pm

Marcin Cieslak

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

Options
    • -1
    • +1
    ./includes/javascript/pedagogicalPlanner.js
  2. … 4 more files 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
    ./includes/javascript/thickbox.patched.js
7:04 pm

Marcin Cieslak

Recreated/updated several resources removed by previous merge.

Options
    • -2
    • +1
    ./editprofile.jsp
    • -0
    • +102
    ./tutorialVideo.jsp
    • -28
    • +13
    ./includes/javascript/thickbox.patched.js
  4. … 3 more files in changeset.
3:25 pm

jliew

merge lams2_3 to head

Options
    • -0
    • +9
    ./WEB-INF/web.xml
    • -1
    • +0
    ./WEB-INF/struts/struts-config.xml
    • -0
    • +43
    ./css/defaultMainHTML.css
    • -2
    • +2
    ./fckeditor/editor/plugins/paint/fckplugin.js
    • -3
    • +8
    ./fckeditor/editor/plugins/videorecorder/VideoRecorderFCKEditor.jsp
    • -1
    • +3
    ./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
    ./main.jsp
  2. … 1 more file in changeset.
Friday 03 Jul 2009
12:57 pm

jliew

Merge lams2_3 to head (continuing...)

Options
    • -18
    • +11
    ./WEB-INF/web.xml
    • -0
    • +1
    ./WEB-INF/struts/struts-config.xml
    • -27
    • +0
    ./pedagogical_planner/defaultActivityForm.jsp
    • -437
    • +0
    ./pedagogical_planner/sequenceChooser.jsp
    • -267
    • +0
    ./pedagogical_planner/templateBase.jsp
  6. … 46 more files in changeset.
Thursday 02 Jul 2009
5:54 pm

jliew

more merging lams2_3 into head

Options
    • -0
    • +57
    ./fckeditor/editor/plugins/paint/content.jsp
    • -4
    • +4
    ./fckeditor/editor/plugins/paint/swfobject.js
    • -22
    • +22
    ./fckeditor/editor/plugins/paint/lang/en.js
    • binary
    ./fckeditor/editor/plugins/videorecorder/VideoRecorderFCKEditor.swf
    • -0
    • +6
    ./fckeditor/editor/plugins/videorecorder/history/history.css
    • -0
    • +662
    ./fckeditor/editor/plugins/videorecorder/history/history.js
    • -0
    • +29
    ./fckeditor/editor/plugins/videorecorder/history/historyFrame.html
    • binary
    ./images/css/course_gradebook.png
    • binary
    ./images/css/mark.png
    • binary
    ./images/css/my-grades.png
    • -0
    • +38
    ./lamscommunity/community.jsp
    • -17
    • +54
    ./lamscommunity/lamscommunityLogin.jsp
    • -14
    • +21
    ./toolcontent/importLC.jsp
  14. … 27 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
    • -27
    • +0
    ./community.jsp
    • -40
    • +42
    ./forgotPassword.jsp
    • -28
    • +29
    ./forgotPasswordChange.jsp
    • -16
    • +23
    ./forgotPasswordProc.jsp
    • -2
    • +2
    ./groupContents.jsp
    • -2
    • +2
    ./launchlearner.jsp
    • -1
    • +10
    ./WEB-INF/web.xml
    • -8
    • +1
    ./WEB-INF/tiles/tiles-defs.xml
    • -3
    • +328
    ./css/ramsthemeHTML.css
    • -1
    • +5
    ./includes/javascript/browser_detect.js
    • -1
    • +2
    ./includes/javascript/fckconfig_custom.js
    • -4
    • +6
    ./includes/javascript/groupDisplay.js
    • -3
    • +4
    ./includes/javascript/openUrls.js
    • -111
    • +0
    ./pedagogical_planner/grouping.jsp
  15. … 201 more files in changeset.
2:12 pm

jliew

remove merge conflict flags

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

jliew

Merge lams2_3 into head

Options
    • binary
    ./lams_authoring.swf
    • binary
    ./lams_authoring_library.swf
  3. … 161 more files in changeset.
Thursday 25 Jun 2009
11:12 am

lfoxton

Undo-ing some changes to return to 2.3 branch

Options
    • -102
    • +0
    ./tutorialVideo.jsp
    • -0
    • +9
    ./includes/javascript/thickbox-compressed.js
  3. … 7 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
    • +102
    ./tutorialVideo.jsp
    • -9
    • +0
    ./includes/javascript/thickbox-compressed.js
  3. … 7 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
    • -0
    • +26
    ./editprofile.jsp
    • -1
    • +10
    ./main.jsp
    • -0
    • +16
    ./css/pedagogicalPlanner.css
    • -0
    • +342
    ./includes/javascript/thickbox.patched.js
  5. … 15 more files in changeset.
12:32 pm

lfoxton

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

Options
    • -26
    • +0
    ./editprofile.jsp
    • -9
    • +0
    ./main.jsp
    • -102
    • +0
    ./tutorialVideo.jsp
    • -16
    • +0
    ./css/pedagogicalPlanner.css
  5. … 13 more files in changeset.
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
    • -0
    • +26
    ./editprofile.jsp
    • -0
    • +9
    ./main.jsp
    • -4
    • +73
    ./tutorialVideo.jsp
    • -0
    • +6
    ./css/pedagogicalPlanner.css
  5. … 12 more files in changeset.
Tuesday 16 Jun 2009
9:13 pm

Marcin Cieslak

LDEV-1998: Added initial version of tutorial video overlay.

Options
    • -0
    • +33
    ./tutorialVideo.jsp
    • -0
    • +10
    ./css/pedagogicalPlanner.css
  3. … 1 more file in changeset.
9:13 pm

Marcin Cieslak

file tutorialVideo.jsp was initially added on branch lams2_3.

Options
    • -0
    • +0
    ./tutorialVideo.jsp
Thursday 04 Jun 2009
9:59 am

paulg

LDEV-2365

Added customcsv to DesignDataModel

Options
    • binary
    ./lams_authoring.swf
    • binary
    ./lams_authoring_library.swf
  3. … 1 more file in changeset.
Wednesday 03 Jun 2009
2:20 pm

paulg

LDEV-2366

Changes for tool adaptors reflected in Flash

Options
    • binary
    ./lams_authoring.swf
    • binary
    ./lams_authoring_library.swf
  3. … 2 more files in changeset.
Monday 25 May 2009
11:03 am

dcarlier

Fixed display issue in launch learner window

Options
    • -2
    • +2
    ./launchlearner.jsp
Thursday 21 May 2009
10:40 am

mseaton

LDEV-2355 Fixed audio recording (no camera) and fixed tool bugs with copy content and isJustSound setting for VideoRecorderRecording.

Options
    • binary
    ./fckeditor/editor/plugins/videorecorder/VideoRecorderFCKEditor.swf
  2. … 8 more files in changeset.
Wednesday 20 May 2009
2:05 pm

lfoxton

LDEV-2353 - Fixing up the css in the forgot password pages

Options
    • -40
    • +42
    ./forgotPassword.jsp
    • -28
    • +29
    ./forgotPasswordChange.jsp
    • -16
    • +23
    ./forgotPasswordProc.jsp
1:51 pm

mseaton

LDEV-2354 Require FP version for IE 8 is FP 9 (rev 159).

Options
    • -1
    • +2
    ./fckeditor/editor/plugins/videorecorder/VideoRecorderFCKEditor.jsp
    • binary
    ./fckeditor/editor/plugins/videorecorder/VideoRecorderFCKEditor.swf
  3. … 4 more files in changeset.
10:28 am

mseaton

LDEV-2343 Fixed no preview image bug by moving missing code from head.

Options
    • binary
    ./fckeditor/editor/plugins/videorecorder/VideoRecorderFCKEditor.swf
  2. … 2 more files in changeset.
Tuesday 19 May 2009
1:28 pm

mseaton

LDEV-2343 added history folder for flex swf.

Options
    • -0
    • +6
    ./fckeditor/editor/plugins/videorecorder/history/history.css
    • -0
    • +662
    ./fckeditor/editor/plugins/videorecorder/history/history.js
    • -0
    • +29
    ./fckeditor/editor/plugins/videorecorder/history/historyFrame.html
1:24 pm

mseaton

LDEV-2343 Fixed issue with alerts and starting connection, problem now fixed by waiting till all alerts are closed (for no mic or camera) and then the connection is started. Commit for 2.3 (tool and fckeditor plugin)

Options
    • -1
    • +1
    ./fckeditor/editor/plugins/videorecorder/VideoRecorderFCKEditor.jsp
    • binary
    ./fckeditor/editor/plugins/videorecorder/VideoRecorderFCKEditor.swf
    • -1
    • +3
    ./fckeditor/editor/plugins/videorecorder/lang/en.js
  4. … 1 more file in changeset.