lams

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 0
Total Committers: 33
Last Commit:
Commits this week: 0
Total Lines of Code (LoC): 4,779,243
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
Friday 22 Jan 2010
9:42 am

lfoxton

LDEV-2480 Author progress

- Improved the drag drop by adding a mouse offset based on where you click on the activity when you want to drag it.... still no 100% accurate.

Options
    • -3
    • +17
    /lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ActivityComponent.mxml
    • -3
    • +4
    /lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/controller/AuthorController.as
9:21 am

lfoxton

LDEV-2480 Author progress

- Splitting events and controller away from the model and view, ie:

- ActivityComponent no longer handles transition end

- CanvasBox no longer handles activity drop for drag and drop

This is handled by AuthorController so we can keep track of the current state of the learning design

Options
    • -19
    • +28
    /lams_flex/LamsAuthor/.actionScriptProperties
    • -2
    • +8
    /lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/CanvasBox.mxml
    • -25
    • +34
    /lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ActivityComponent.mxml
    • -2
    • +4
    /lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/CombinedActivityComponent.mxml
    • -1
    • +2
    /lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/OptionalActivityComponent.mxml
    • -3
    • +143
    /lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/controller/AuthorController.as
    • -0
    • +20
    /lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/events/DropActivityEvent.as
    • -1
    • +11
    /lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/events/DropEvent.as
    • -0
    • +2
    /lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/events/TransitionEvent.as
    • -2
    • +7
    /lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/maps/MainEventMap.mxml
Thursday 21 Jan 2010
4:18 pm

jliew

file breadcrumbs.jsp was added on branch lams2_3_release on 2010-04-12 03:02:34 +0000

Options
    • -0
    • +0
    /lams_admin/web/organisation/parts/breadcrumbs.jsp
4:18 pm

jliew

LDEV-2489 clone lessons progress

Options
    • -0
    • +1
    /lams_admin/.classpath
    • -1
    • +19
    /lams_admin/src/java/org/lamsfoundation/lams/admin/service/AdminServiceProxy.java
    • -0
    • +324
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/CloneGroupAction.java
    • -0
    • +18
    /lams_admin/web/WEB-INF/tiles/tiles-defs.xml
    • -0
    • +14
    /lams_admin/web/organisation/cloneResult.jsp
    • -0
    • +175
    /lams_admin/web/organisation/cloneStart.jsp
    • -0
    • +10
    /lams_admin/web/organisation/list.jsp
    • -0
    • +26
    /lams_admin/web/organisation/parts/availableLessons.jsp
    • -0
    • +15
    /lams_admin/web/organisation/parts/breadcrumbs.jsp
    • -0
    • +13
    /lams_admin/web/organisation/parts/cloneGroupAttributes.jsp
    • -0
    • +15
    /lams_admin/web/organisation/parts/cloneGroupMembers.jsp
    • -0
    • +34
    /lams_admin/web/organisation/parts/selectLearners.jsp
    • -0
    • +34
    /lams_admin/web/organisation/parts/selectStaff.jsp
    • -1
    • +9
    /lams_common/src/java/org/lamsfoundation/lams/lesson/dao/ILessonDAO.java
    • -1
    • +7
    /lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LessonDAO.java
    • -3
    • +11
    /lams_common/src/java/org/lamsfoundation/lams/lesson/service/ILessonService.java
    • -2
    • +6
    /lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java
Wednesday 20 Jan 2010
11:47 pm

Andrey Balan

LDEV-2494 merge from HEAD to lams2_3_release branch

Options
    • -13
    • +6
    /lams_tool_larsrc/web/includes/javascript/rsrcresourceitem.js
11:44 pm

Andrey Balan

LDEV-2494 fixed Delete file action

Options
    • -13
    • +6
    /lams_tool_larsrc/web/includes/javascript/rsrcresourceitem.js
10:15 pm

Andrey Balan

LDEV-2498 merge from HEAD to lams2_3_release branch

Options
    • -1
    • +1
    /lams_tool_laqa/web/authoring/BasicContent.jsp
10:00 pm

Andrey Balan

LDEV-2498 Increased the width for Q&A iframe

Options
    • -1
    • +1
    /lams_tool_laqa/web/authoring/BasicContent.jsp
2:31 pm

lfoxton

LDEV-2480 Author progress

- Optional activities added

Options
    • -13
    • +3
    /lams_flex/LamsAuthor/src/LamsAuthor.mxml
    • -5
    • +16
    /lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/CanvasBox.mxml
    • -2
    • +1
    /lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/LearningLibraryEntryComponent.mxml
    • -129
    • +0
    /lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/ToolBar.mxml
    • -30
    • +0
    /lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/ToolBarDropDown.mxml
    • -15
    • +30
    /lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ActivityComponent.mxml
    • -6
    • +6
    /lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/CombinedActivityComponent.mxml
    • -0
    • +77
    /lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/OptionalActivityComponent.mxml
    • -2
    • +1
    /lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ToolActivityComponent.mxml
    • -0
    • +11
    /lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/toolbar/SystemActivityComponent.mxml
    • -0
    • +150
    /lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/toolbar/ToolBar.mxml
    • -0
    • +30
    /lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/toolbar/ToolBarDropDown.mxml
    • -2
    • +2
    /lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/transition/TransitionComponent.as
    • -0
    • +13
    /lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/util/Constants.as
10:35 am

lfoxton

LDEV-2480 Author progress

- Zooming done fore now, zoom happens with button rather than cursor

Options
    • -12
    • +0
    /lams_flex/LamsAuthor/src/LamsAuthor.mxml
    • -24
    • +3
    /lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/CanvasBox.mxml
    • -2
    • +10
    /lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/ToolBar.mxml
    • -2
    • +0
    /lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/util/Constants.as
8:16 am

lfoxton

LDEV-2480 Author progress

- Added rudimentary zooming capabilities

Options
    • -3
    • +18
    /lams_flex/LamsAuthor/src/LamsAuthor.mxml
    • binary
    /lams_flex/LamsAuthor/src/assets/icons/cursor.png
    • -50
    • +23
    /lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/CanvasArea.mxml
    • -0
    • +59
    /lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/CanvasBox.mxml
    • -4
    • +7
    /lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/ToolBar.mxml
    • -1
    • +2
    /lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/util/Constants.as
Tuesday 19 Jan 2010
1:29 pm

lfoxton

LDEV 2480

Flex author progress

- Added tool bar drop downs for grouping/optional etc

- Tool bar general layout completed

Options
    • -1
    • +3
    /lams_flex/LamsAuthor/src/LamsAuthor.mxml
    • binary
    /lams_flex/LamsAuthor/src/assets/icons/branch.png
    • binary
    /lams_flex/LamsAuthor/src/assets/icons/converge.png
    • binary
    /lams_flex/LamsAuthor/src/assets/icons/gate.png
    • -17
    • +76
    /lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/ToolBar.mxml
    • -0
    • +30
    /lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/ToolBarDropDown.mxml
11:15 am

lfoxton

LDEV 2480

Flex author progress

- Removed "Dock" bottom menu

- Added file menu + button bar on top

Options
    • -116
    • +0
    /lams_flex/LamsAuthor/LearningLibrary2.mxml
    • -61
    • +0
    /lams_flex/LamsAuthor/LearningLibraryEntryComponent.as
    • -28
    • +0
    /lams_flex/LamsAuthor/ToolActivityComponent.as
    • -1
    • +5
    /lams_flex/LamsAuthor/bin-debug/assets/css/learningLibrary.css
    • -21
    • +29
    /lams_flex/LamsAuthor/src/LamsAuthor.mxml
    • -7
    • +0
    /lams_flex/LamsAuthor/src/assets/css/activities.css
    • -1
    • +5
    /lams_flex/LamsAuthor/src/assets/css/learningLibrary.css
    • -0
    • +6
    /lams_flex/LamsAuthor/src/assets/css/toolBar.css
    • binary
    /lams_flex/LamsAuthor/src/assets/icons/copy.png
    • binary
    /lams_flex/LamsAuthor/src/assets/icons/flow.png
    • binary
    /lams_flex/LamsAuthor/src/assets/icons/group.png
    • binary
    /lams_flex/LamsAuthor/src/assets/icons/new.png
    • binary
    /lams_flex/LamsAuthor/src/assets/icons/open.png
    • binary
    /lams_flex/LamsAuthor/src/assets/icons/optional.png
    • binary
    /lams_flex/LamsAuthor/src/assets/icons/paste.png
  16. … 12 more files in changeset.
Friday 15 Jan 2010
12:11 pm

lfoxton

LDEV-2480 Author progress

- Fixing issue with transitions when moving activities

Options
    • -65
    • +74
    /lams_flex/LamsAuthor/bin-debug/assets/css/learningLibrary.css
    • -0
    • +1
    /lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/CanvasBox.mxml
    • -16
    • +19
    /lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ActivityComponent.mxml
    • -4
    • +9
    /lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/transition/TransitionComponent.as
11:41 am

lfoxton

LDEV-2480 Author progress

- Transitions added with arrows

- Rudimentry minimise for bottom menu

- Combined activities made smaller

Options
    • -0
    • +188
    /lams_flex/LamsAuthor/ActivityComponent.as
    • -0
    • +4
    /lams_flex/LamsAuthor/src/LamsAuthor.mxml
    • -65
    • +74
    /lams_flex/LamsAuthor/src/assets/css/learningLibrary.css
    • binary
    /lams_flex/LamsAuthor/src/assets/images/icon_minimize.gif
    • binary
    /lams_flex/LamsAuthor/src/assets/images/portlet_minimize_icon_off.gif
    • -7
    • +15
    /lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/CanvasArea.mxml
    • -1
    • +0
    /lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/CanvasBox.mxml
    • -72
    • +80
    /lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/LearningLibrary.mxml
    • -3
    • +18
    /lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/LearningLibrary2.mxml
    • -0
    • +62
    /lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/LearningLibraryEntryComponent.mxml
    • -0
    • +108
    /lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/LearningLibraryEntryComponent2.mxml
    • -187
    • +0
    /lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ActivityComponent.as
    • -0
    • +186
    /lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ActivityComponent.mxml
    • -4
    • +12
    /lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/CombinedActivityComponent.mxml
    • -61
    • +0
    /lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/LearningLibraryEntryComponent.mxml
  16. … 5 more files in changeset.
11:39 am

lfoxton

Adding arrow library to common - to be used for flex author

Options
    • -144
    • +147
    /lams_flex/LamsFlexCommon/.flexLibProperties
    • -0
    • +133
    /lams_flex/LamsFlexCommon/src/com/dncompute/geom/GeomUtil.as
    • -0
    • +81
    /lams_flex/LamsFlexCommon/src/com/dncompute/graphics/ArrowStyle.as
    • -0
    • +158
    /lams_flex/LamsFlexCommon/src/com/dncompute/graphics/GraphicsUtil.as
8:22 am

jliew

LDEV-2481 merged from branch

Options
    • -3
    • +3
    /lams_learning/src/java/org/lamsfoundation/lams/learning/export/web/action/MainExportServlet.java
8:20 am

jliew

LDEV-2481 export portfolio files were being written by image link replacer which didn't read or encode the new files in utf8

Options
    • -3
    • +3
    /lams_learning/src/java/org/lamsfoundation/lams/learning/export/web/action/MainExportServlet.java
5:16 am

Ernie Ghiglione

LDEV-2492: Display plural nominations if there's more than one answer

Options
    • -9
    • +4
    /lams_tool_vote/conf/language/lams/ApplicationResources.properties
    • -3
    • +4
    /lams_tool_vote/conf/language/lams/ApplicationResources_en_AU.properties
    • -3
    • +4
    /lams_tool_vote/conf/language/lams/ApplicationResources_es_ES.properties
    • -2
    • +12
    /lams_tool_vote/web/learning/AllNominations.jsp
    • -2
    • +10
    /lams_tool_vote/web/learning/RevisitedDisplay.jsp
    • -2
    • +13
    /lams_tool_vote/web/learning/RevisitedNoDisplay.jsp
5:13 am

Ernie Ghiglione

LDEV-2492: Display plural nominations if there's more than one answer

Options
    • -4
    • +5
    /lams_tool_vote/conf/language/lams/ApplicationResources.properties
    • -4
    • +5
    /lams_tool_vote/conf/language/lams/ApplicationResources_en_AU.properties
    • -3
    • +4
    /lams_tool_vote/conf/language/lams/ApplicationResources_es_ES.properties
    • -2
    • +12
    /lams_tool_vote/web/learning/AllNominations.jsp
    • -2
    • +10
    /lams_tool_vote/web/learning/RevisitedDisplay.jsp
    • -2
    • +13
    /lams_tool_vote/web/learning/RevisitedNoDisplay.jsp
Thursday 14 Jan 2010
12:38 pm

lfoxton

Progres for new author

Options
    • -112
    • +116
    /lams_flex/LamsAuthor/LearningLibrary2.mxml
    • -76
    • +80
    /lams_flex/LamsAuthor/src/LamsAuthor.mxml
    • -137
    • +134
    /lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/CanvasArea.mxml
    • -0
    • +74
    /lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/CanvasBox.mxml
    • -123
    • +129
    /lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/LearningLibrary2.mxml
    • -38
    • +186
    /lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ActivityComponent.as
    • -69
    • +69
    /lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/CombinedActivityComponent.mxml
    • -66
    • +67
    /lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ToolActivityComponent.mxml
    • -0
    • +13
    /lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/transition/DrawingTool.as
    • -0
    • +33
    /lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/transition/DrawingToolManager.as
    • -0
    • +25
    /lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/transition/Transition.as
    • -36
    • +43
    /lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/controller/AuthorController.as
    • -14
    • +12
    /lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/events/AuthorEvent.as
    • -0
    • +12
    /lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/events/DropEvent.as
    • -0
    • +19
    /lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/events/TransitionEvent.as
    • -6
    • +8
    /lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/maps/MainEventMap.mxml
    • -16
    • +20
    /lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/util/Constants.as
6:16 am

Ernie Ghiglione

LDEV-2491: change color for individual color feedback

Options
    • -1
    • +11
    /lams_tool_assessment/web/pages/learning/parts/multiplechoice.jsp
6:05 am

Ernie Ghiglione

LDEV-2491: change color for individual color feedback

Options
    • -1
    • +11
    /lams_tool_assessment/web/pages/learning/parts/multiplechoice.jsp
Wednesday 13 Jan 2010
11:07 am

lfoxton

LDEV-2486 Mergin with head

Options
    • -2
    • +7
    /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
11:05 am

lfoxton

LDEV-2486 Fixing a null pointer

Options
    • -3
    • +8
    /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
Tuesday 12 Jan 2010
3:10 pm

jliew

LDEV-2490 merged from head

Options
    • -1
    • +2
    /lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java
3:08 pm

jliew

LDEV-2490 fix IE occassionally caching response to getToolContentID

Options
    • -1
    • +2
    /lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java
9:19 am

lfoxton

Adding LamsAuthor flex project to the lams_flex project

Options
    • -0
    • +19
    /lams_flex/LamsAuthor/.actionScriptProperties
    • -0
    • +2
    /lams_flex/LamsAuthor/.flexProperties
    • -0
    • +19
    /lams_flex/LamsAuthor/.project
    • -0
    • +112
    /lams_flex/LamsAuthor/LearningLibrary2.mxml
    • -0
    • +61
    /lams_flex/LamsAuthor/LearningLibraryEntryComponent.as
    • -0
    • +28
    /lams_flex/LamsAuthor/ToolActivityComponent.as
    • -0
    • +3
    /lams_flex/LamsAuthor/.settings/org.eclipse.core.resources.prefs
    • -0
    • +278
    /lams_flex/LamsAuthor/bin-debug/AC_OETags.js
    • -0
    • +121
    /lams_flex/LamsAuthor/bin-debug/FlexGmap.html
    • binary
    /lams_flex/LamsAuthor/bin-debug/FlexGmap.swf
    • -0
    • +121
    /lams_flex/LamsAuthor/bin-debug/LamsFlexAuthor.html
    • binary
    /lams_flex/LamsAuthor/bin-debug/LamsFlexAuthor.swf
    • binary
    /lams_flex/LamsAuthor/bin-debug/playerProductInstall.swf
    • -0
    • +7
    /lams_flex/LamsAuthor/bin-debug/assets/css/activities.css
    • -0
    • +66
    /lams_flex/LamsAuthor/bin-debug/assets/css/learningLibrary.css
  16. … 423 more files in changeset.
9:11 am

lfoxton

Moving flex projects under a lams_flex project instead of lams_flash

Options
    • -0
    • +11
    /lams_flex/.project
    • -0
    • +16
    /lams_flex/BranchManager/.actionScriptProperties
    • -0
    • +2
    /lams_flex/BranchManager/.flexProperties
    • -0
    • +30
    /lams_flex/BranchManager/.project
    • -0
    • +3
    /lams_flex/BranchManager/.settings/org.eclipse.core.resources.prefs
    • -0
    • +278
    /lams_flex/BranchManager/html-template/AC_OETags.js
    • -0
    • +121
    /lams_flex/BranchManager/html-template/index.template.html
    • binary
    /lams_flex/BranchManager/html-template/playerProductInstall.swf
    • -0
    • +423
    /lams_flex/BranchManager/src/BranchManager.mxml
    • -0
    • +18
    /lams_flex/CloudWizard/.actionScriptProperties
    • -0
    • +2
    /lams_flex/CloudWizard/.flexProperties
    • -0
    • +25
    /lams_flex/CloudWizard/.project
    • -0
    • +3
    /lams_flex/CloudWizard/.settings/org.eclipse.core.resources.prefs
    • -0
    • +292
    /lams_flex/CloudWizard/html-template/AC_OETags.js
    • -0
    • +121
    /lams_flex/CloudWizard/html-template/index.template.html
  16. … 1266 more files in changeset.
Friday 08 Jan 2010
11:26 am

jliew

LDEV-2476 add inherited roles (read only)

Options
    • -4
    • +16
    /lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java
    • -1
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/planner/dao/PedagogicalPlannerDAO.java
    • -2
    • +17
    /lams_common/src/java/org/lamsfoundation/lams/planner/dao/hibernate/PedagogicalPlannerDAOHibernate.java