lams-github / lams_central

web

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
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
Monday 06 Jul 2009
10:20 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

Marcin Cieslak

Recreated/updated several resources removed by previous merge.

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

jliew

merge lams2_3 to head

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

jliew

Merge lams2_3 to head (continuing...)

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

jliew

more merging lams2_3 into head

Options
    • -0
    • +57
    ./fckeditor/editor/plugins/paint/content.jsp
    • -22
    • +22
    ./fckeditor/editor/plugins/paint/lang/en.js
    • -4
    • +4
    ./fckeditor/editor/plugins/paint/swfobject.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. … 20 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
    • -8
    • +1
    ./WEB-INF/tiles/tiles-defs.xml
    • -1
    • +10
    ./WEB-INF/web.xml
    • -27
    • +0
    ./community.jsp
    • -3
    • +328
    ./css/ramsthemeHTML.css
    • -40
    • +42
    ./forgotPassword.jsp
    • -28
    • +29
    ./forgotPasswordChange.jsp
    • -16
    • +23
    ./forgotPasswordProc.jsp
    • -2
    • +2
    ./groupContents.jsp
    • -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
    • -2
    • +2
    ./launchlearner.jsp
    • -111
    • +0
    ./pedagogical_planner/grouping.jsp
  15. … 154 more files in changeset.
2:12 pm

jliew

remove merge conflict flags

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

jliew

Merge lams2_3 into head

Options
    • binary
    ./lams_authoring.swf
  2. … 125 more files in changeset.
10:39 am

jliew

Merge lams2_3 into head

Options
    • binary
    ./lams_authoring_library.swf
  2. … 36 more files in changeset.
Friday 19 Jun 2009
6:54 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
    • +16
    ./css/pedagogicalPlanner.css
    • -0
    • +26
    ./editprofile.jsp
    • -0
    • +342
    ./includes/javascript/thickbox.patched.js
    • -1
    • +10
    ./main.jsp
  5. … 15 more files in changeset.
Monday 18 May 2009
8:18 am

dcarlier

LDEV-2344 Fixed support act button disappearing after certain actions if optional menu visible

Options
    • binary
    ./lams_authoring.swf
  2. … 4 more files in changeset.
8:16 am

dcarlier

LDEV-2347 Fixed Support activity mistakedly thinks it's getting dropped on another activity outside of branching

Options
    • binary
    ./lams_authoring_library.swf
7:22 am

dcarlier

LDEV-2347 Fixed Support activity mistakedly thinks it's getting dropped on another activity outside of branching

Options
    • binary
    ./lams_authoring.swf
    • binary
    ./lams_authoring_library.swf
  3. … 1 more file in changeset.
Friday 15 May 2009
2:26 pm

dcarlier

LDEV-2344 Fixed support act btn being disabled when it shouldn't be

Options
    • binary
    ./lams_authoring.swf
    • binary
    ./lams_authoring_library.swf
  3. … 2 more files in changeset.
11:44 am

dcarlier

LDEV-2301 Fixed branch to end gate not redrawing properly after moving the activity in a certain way

Options
    • binary
    ./lams_authoring.swf
    • binary
    ./lams_authoring_library.swf
  3. … 1 more file in changeset.
Thursday 14 May 2009
12:03 pm

dcarlier

LDEV-2337 Fixed not being able to set min/max activity values for optionals back to 0 after the design had been saved

Options
    • binary
    ./lams_authoring.swf
    • binary
    ./lams_authoring_library.swf
  3. … 1 more file in changeset.
9:43 am

dcarlier

LDEV-2288 Transition snap back now checks against a change in the transitions y coordinate (as well as the x coordinate)

Options
    • binary
    ./lams_authoring.swf
    • binary
    ./lams_authoring_library.swf
  3. … 2 more files in changeset.
Wednesday 13 May 2009
3:35 pm

dcarlier

LDEV-2296 fixed min/max steppers showing values above the number of sequences(optional sequences)/activities(optional activities)

Options
    • binary
    ./lams_authoring.swf
    • binary
    ./lams_authoring_library.swf
  3. … 1 more file in changeset.
8:38 am

dcarlier

LDEV-2318 Increased amount of space provided to display validation issues so that messages are not truncated in systems that have wider font characters (eg in linux)

Options
    • binary
    ./lams_authoring.swf
    • binary
    ./lams_authoring_library.swf
  3. … 1 more file in changeset.
Tuesday 12 May 2009
12:33 pm

dcarlier

LDEV-2333 Fixed import from lamscommunity window size, identifier and minor bug where the normal import window would be launched mistakenly if the design was modified (unsaved)

Options
    • binary
    ./lams_authoring.swf
    • binary
    ./lams_authoring_library.swf
  3. … 1 more file in changeset.
11:41 am

dcarlier

LDEV-2162 Now when grouping selection method changed to "number of learners" a confirmation message is presented if group to branch mappings exist

Options
    • binary
    ./lams_authoring.swf
    • binary
    ./lams_authoring_library.swf
  3. … 1 more file in changeset.
Monday 11 May 2009
2:43 pm

dcarlier

LDEV-2298 Recovered designs no longer marked as read-only

Options
    • binary
    ./lams_authoring.swf
    • binary
    ./lams_authoring_library.swf
  3. … 1 more file in changeset.
Friday 08 May 2009
2:03 pm

dcarlier

LDEV-2295 Tool output conditions now updating properly

Options
    • binary
    ./lams_authoring.swf
    • binary
    ./lams_authoring_library.swf
  3. … 2 more files in changeset.
1:57 pm

paulg

VideoRecorder tool and FCKPlugin now use AjaxOverlay

Options
    • binary
    ./fckeditor/editor/plugins/videorecorder/VideoRecorderFCKEditor.swf
Thursday 07 May 2009
2:15 pm

paulg

LDEV-2254 Safari and VR Author fixed

LDEV-2286

VR tool now deployed as archived .war

LDEV-2281

Lessons with VR tool activities are now exported correctly

Author recordings are held locally on LAMS server

LDEV-2289

Popup now shown if EITHER media server settings are blank (both required for VR to work)

LDEV-2005

Export for learner/teacher working

Conditions tab removed

Author recordings added to FCK content folder

Preview images uploaded to own content folder for each VR session

Options
    • -45
    • +11
    ./WEB-INF/struts/struts-config.xml
    • -0
    • +21
    ./WEB-INF/web.xml
    • -12
    • +26
    ./fckeditor/editor/plugins/videorecorder/VideoRecorderFCKEditor.jsp
    • binary
    ./fckeditor/editor/plugins/videorecorder/VideoRecorderFCKEditor.swf
    • -1
    • +2
    ./fckeditor/editor/plugins/videorecorder/lang/en.js
    • -0
    • +1
    ./flashxml/authoring/ar_JO_dictionary.xml
    • -0
    • +1
    ./flashxml/authoring/bg_BG_dictionary.xml
    • -0
    • +1
    ./flashxml/authoring/cy_GB_dictionary.xml
    • -0
    • +1
    ./flashxml/authoring/da_DK_dictionary.xml
    • -0
    • +1
    ./flashxml/authoring/de_DE_dictionary.xml
    • -0
    • +1
    ./flashxml/authoring/el_GR_dictionary.xml
    • -0
    • +1
    ./flashxml/authoring/en_AU_dictionary.xml
    • -0
    • +1
    ./flashxml/authoring/en_dictionary.xml
    • -0
    • +1
    ./flashxml/authoring/es_ES_dictionary.xml
    • -0
    • +1
    ./flashxml/authoring/fr_FR_dictionary.xml
  16. … 148 more files in changeset.
Friday 01 May 2009
3:06 pm

dcarlier

LDEV-2271 Stopped author from trying to paste the selected activity when the workspace dialog is open resulting in an error dialog

Options
    • binary
    ./lams_authoring.swf
    • binary
    ./lams_authoring_library.swf
  3. … 1 more file in changeset.
1:24 pm

dcarlier

LDEV-2266 Fixed activities disappearing into support activity container from inside branching

Options
    • binary
    ./lams_authoring.swf
    • binary
    ./lams_authoring_library.swf
  3. … 1 more file in changeset.
12:40 pm

dcarlier

LDEV-2267 Fixed competence editor not updating description

Options
    • binary
    ./lams_authoring.swf
    • binary
    ./lams_authoring_library.swf
  3. … 1 more file in changeset.