lams-github

Clone Tools

Stats

Commits this week: 0
Total Committers: 50
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
Tuesday 17 Jul 2007
9:35 am

fmalikoff

LDEV-1134: Branching: View screen for the class export portfolio. Required refactoring of classes and moving the system tool link to move to an interface.

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -0
    • +8
    /lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
    • -0
    • +15
    /lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
    • -61
    • +66
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml
    • -12
    • +12
    /lams_common/db/sql/insert_types_data.sql
    • -19
    • +17
    /lams_common/db/sql/updatescripts/alter_21_branching.sql
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java
    • -4
    • +26
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/BranchingActivity.java
    • -3
    • +8
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/ChosenBranchingActivity.java
    • -3
    • +20
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/GateActivity.java
    • -3
    • +7
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/GroupBranchingActivity.java
    • -3
    • +21
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/GroupingActivity.java
    • -0
    • +45
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/ISystemToolActivity.java
    • -8
    • +20
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesignProcessor.java
    • -1
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java
  16. … 5 more files in changeset.
9:32 am

fmalikoff

LDEV-1134: Branching: View screen for the class export portfolio

Options
    • -1
    • +1
    /lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/ExportPortfolioService.java
    • -32
    • +50
    /lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/PortfolioBuilder.java
    • -1
    • +1
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/BranchingActivityAction.java
    • -18
    • +15
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMappingStrategy.java
    • -1
    • +1
    /lams_learning/web/WEB-INF/struts/struts-config.xml
    • -1
    • +1
    /lams_learning/web/branching/wait.jsp
    • -1
    • +1
    /lams_learning/web/layout/branchingWaitLayout.jsp
    • -0
    • +69
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/BranchingExportPortfolioServlet.java
    • -29
    • +61
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/ChosenBranchingAJAXAction.java
    • -0
    • +9
    /lams_monitoring/web/WEB-INF/web.xml
    • -2
    • +3
    /lams_monitoring/web/branching/viewBranches.jsp
    • -3
    • +5
    /lams_monitoring/web/template/template.jsp
9:28 am

fmalikoff

Typo fixed in a comment

Options
    • -1
    • +1
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GateAction.java
Monday 16 Jul 2007
4:35 pm

mseaton

custom Alert dialog

Options
    • binary
    /lams_central/web/lams_authoring.swf
    • binary
    /lams_central/web/lams_authoring_library.swf
    • binary
    /lams_flash/src/central/flash/lams_authoring.fla
    • -0
    • +307
    /lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/AlertDialog.as
    • -27
    • +45
    /lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/Dialog.as
    • -78
    • +58
    /lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/LFMessage.as
    • -14
    • +11
    /lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/LFWindow.as
    • -2
    • +9
    /lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/LFError.as
    • -0
    • +13
    /lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/StringUtils.as
    • -0
    • +2
    /lams_flash/src/common/flash/org/lamsfoundation/lams/common/ws/WorkspaceDialog.as
    • -11
    • +20
    /lams_flash/src/common/flash/org/lamsfoundation/lams/common/ws/WorkspaceView.as
4:35 pm

mseaton

bin modifications

Options
    • -13
    • +0
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as
    • -2
    • +4
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as
1:07 pm

dcarlier

Jira: LI-130. Fixed update-lams.sh such that JAVE_HOME is now taken from the JDK_DIR variable in lams.properties and does not need to be explicitly set prior to updating

Options
    • -69
    • +222
    /unix_installer/upgrader-package/update-lams.sh
12:46 pm

dcarlier

fixed install-lams.sh such that is now taken from the JDK_DIR variable in lams.properties and does not need to be explicitly set prior to installation

Options
    • -21
    • +40
    /unix_installer/installer-package/install-lams.sh
11:26 am

dcarlier

Removing installer generated files from the package

Options
    • -7
    • +0
    /unix_installer/installer-package/database/create-database.sql
    • -5
    • +6
    /unix_installer/installer-package/sql-scripts/create-database.sql
Friday 13 Jul 2007
1:37 pm

dcarlier

LI-131: update-lams.xml now compares the news.html with the 2.0.2 version of news.html and if they are the same, it replaces it with the 2.0.4 version, otherwise (if the user has modified it) it leaves the existing news.html intact

Options
    • -0
    • +7
    /unix_installer/upgrader-package/ant-scripts/update-lams.xml
    • -0
    • +13
    /unix_installer/upgrader-package/assembly/lams.ear/lams-www.war/news-2.0.2.html
Thursday 12 Jul 2007
8:59 am

fmalikoff

Refactoring code so that all screens can update the progress bar.

Options
    • -2
    • +13
    /lams_learning/conf/xdoclet/struts-forms.xml
    • -96
    • +0
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ActivityAction.java
    • -3
    • +5
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/BranchingActivityAction.java
    • -3
    • +2
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ChooseActivityAction.java
    • -6
    • +2
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivityAction.java
    • -2
    • +2
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayActivityAction.java
    • -1
    • +1
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java
    • -3
    • +5
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayParallelActivityAction.java
    • -2
    • +4
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayToolActivityAction.java
    • -10
    • +12
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GateAction.java
    • -4
    • +3
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java
    • -2
    • +3
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LessonCompleteActivityAction.java
    • -1
    • +1
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LoadToolActivityAction.java
    • -11
    • +1
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/SequenceActivityAction.java
    • -3
    • +8
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMappingStrategy.java
  16. … 4 more files in changeset.
Wednesday 11 Jul 2007
3:03 pm

dcarlier

jira L1-117: Added MYSQL_HOST field to windows updater.

Options
    • -0
    • +92
    /win_installer/src/checkmysql.java
    • -0
    • +50
    /win_installer/src/lams-update.ini
    • -10
    • +37
    /win_installer/src/updater.nsi
10:41 am

dcarlier

Some more 2.0.4 files for the unix installer and updater

Options
    • -0
    • +84
    /unix_installer/installer-package/bin/checkmysql.java
    • -1
    • +1
    /unix_installer/installer-package/bin/run-lams.sh
    • -0
    • +130
    /unix_installer/upgrader-package/bin/UpdateLAMS202Chat.java
    • -62
    • +57
    /unix_installer/upgrader-package/bin/checkmysql.java
    • -0
    • +152
    /unix_installer/upgrader-package/bin/copyllid.java
    • -1
    • +1
    /unix_installer/upgrader-package/bin/lamsdump.sql
10:04 am

dcarlier

L1-118: Changed build.xml in win_installer/build to include required jars in classpath

Options
    • -6
    • +10
    /win_installer/build.xml
9:46 am

dcarlier

For consistency, renaming build-package.xml in unix installer to build.xml

Options
    • -81
    • +0
    /unix_installer/installer-package/build-package.xml
    • -86
    • +66
    /unix_installer/installer-package/build.xml
9:37 am

dcarlier

Build script for the 2.0.2 -> 2.0.4 unix updater

Options
    • -74
    • +64
    /unix_installer/upgrader-package/build.xml
Monday 09 Jul 2007
3:08 pm

asukkar

LDEV-1256

Added 'Tool Management' link for tools that define an admin_url

Options
    • -1
    • +2
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -2
    • +2
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SysAdminStartAction.java
    • -17
    • +45
    /lams_admin/web/toolcontent/toolcontentlist.jsp
3:01 pm

mseaton

fixed positioning of bin

Options
    • binary
    /lams_central/web/lams_authoring.swf
    • binary
    /lams_central/web/lams_authoring_library.swf
    • -3
    • +3
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as
    • -2
    • +3
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as
1:41 pm

fmalikoff

View branch screen done for the group based branching and tool based branching activities.

Options
    • -2
    • +0
    /lams_monitoring/conf/language/lams/ApplicationResources.properties
    • -1
    • +0
    /lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +5
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/ChosenBranchingAJAXAction.java
    • -0
    • +18
    /lams_monitoring/web/WEB-INF/struts/struts-config.xml
    • -0
    • +4
    /lams_monitoring/web/WEB-INF/struts/tiles-defs.xml
    • -24
    • +22
    /lams_monitoring/web/branching/viewBranches.jsp
1:28 pm

dcarlier

Build script for the 2.0.4 unix installer. Updated to preserve file permissions when generating the build directory.

Options
    • -36
    • +36
    /unix_installer/installer-package/build-package.xml
11:39 am

mseaton

cleaned up lesson*.as code + fixed positioning of bin

Options
    • -4
    • +6
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as
    • -1
    • +1
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as
    • -4
    • +6
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as
    • -14
    • +4
    /lams_flash/src/central/flash/org/lamsfoundation/lams/learner/ls/Lesson.as
    • -8
    • +4
    /lams_flash/src/central/flash/org/lamsfoundation/lams/learner/ls/LessonController.as
    • -41
    • +10
    /lams_flash/src/central/flash/org/lamsfoundation/lams/learner/ls/LessonModel.as
Friday 06 Jul 2007
12:22 pm

fmalikoff

Make space for the loading message

Options
    • -1
    • +1
    /lams_monitoring/web/branching/chosenSelection.jsp
12:06 pm

fmalikoff

LDEV-1256: Added admin_url column to tool and system tool tables

Options
    • -0
    • +16
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/SystemTool.hbm.xml
    • -0
    • +15
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/Tool.hbm.xml
    • -4
    • +16
    /lams_common/db/model/lams_11.clay
    • -0
    • +2
    /lams_common/db/sql/create_lams_11_tables.sql
    • -2
    • +6
    /lams_common/db/sql/updatescripts/alter_21_branching.sql
    • -0
    • +12
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
    • -7
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
    • -0
    • +19
    /lams_common/src/java/org/lamsfoundation/lams/tool/SystemTool.java
    • -0
    • +20
    /lams_common/src/java/org/lamsfoundation/lams/tool/Tool.java
Thursday 05 Jul 2007
3:52 pm

fmalikoff

LDEV-1261: Fixing a lazy loading exception that started when we removed the hibernate session filter on the user role import. The organisation can't be passed in from the web layer as it isn't connected to the session, and so when it tries to get the user organisation from the organisation, it throws a lazy loading exception.

Branching: The start and end co-ordinates were missing during the import.

Options
    • binary
    /lams_build/lib/lams/lams.jar
3:51 pm

fmalikoff

Branching: The start and end co-ordinates were missing during the import.

Options
    • -0
    • +11
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
2:29 pm

fmalikoff

LDEV-1261: Fixing a lazy loading exception that started when we removed the hibernate session filter on the user role import. The organisation can't be passed in from the web layer as it isn't connected to the session, and so when it tries to get the user organisation from the organisation, it throws a lazy loading exception.

Options
    • -1
    • +1
    /lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java
    • -8
    • +8
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserOrgRoleSaveAction.java
    • -1
    • +1
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserRolesSaveAction.java
    • -3
    • +2
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ImportV1ContentsSaveAction.java
    • -2
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java
    • -2
    • +14
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
2:00 pm

mseaton

a few neat UI improvements for branching - utilise scroll pane in branching view + move the bin into the view with open + fixed up transition/system tool x/y positioning on-drop

Options
    • binary
    /lams_central/web/lams_authoring.swf
    • binary
    /lams_central/web/lams_authoring_library.swf
    • -6
    • +27
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as
    • -1
    • +1
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Bin.as
    • -4
    • +9
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as
    • -0
    • +14
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as
    • -8
    • +23
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as
    • -4
    • +5
    /lams_flash/src/common/flash/org/lamsfoundation/lams/common/CommonCanvasView.as
Wednesday 04 Jul 2007
4:18 pm

fmalikoff

Branching: Teacher chosen branch screen basically working. Still a bit of clean up on the messages to go.

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -1
    • +1
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml
    • -5
    • +30
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/Grouper.java
    • -2
    • +39
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java
    • -5
    • +6
    /lams_common/src/java/org/lamsfoundation/lams/lesson/service/ILessonService.java
    • -5
    • +7
    /lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java
    • -0
    • +8
    /lams_monitoring/conf/language/lams/ApplicationResources.properties
    • -1
    • +8
    /lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties
    • -13
    • +23
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -10
    • +88
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -69
    • +22
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/ChosenBranchingAJAXAction.java
    • -4
    • +4
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXAction.java
    • -173
    • +67
    /lams_monitoring/web/branching/chosenSelection.jsp
    • -0
    • +70
    /lams_monitoring/web/branching/viewBranches.jsp
4:16 pm

fmalikoff

Avoid copying class files to WEB-INF when doing synchronise deploy - don't want multiple versions of the classes floating around.

Options
    • -0
    • +1
    /lams_monitoring/build.xml
4:16 pm

fmalikoff

Should have been removed when we split LAMS and RAMS

Options
    • -62
    • +0
    /lams_monitoring/conf/language/ApplicationResources.properties
    • -62
    • +0
    /lams_monitoring/conf/language/ApplicationResources_da_DK.properties
    • -60
    • +0
    /lams_monitoring/conf/language/ApplicationResources_de_DE.properties
    • -62
    • +0
    /lams_monitoring/conf/language/ApplicationResources_el_GR.properties
    • -62
    • +0
    /lams_monitoring/conf/language/ApplicationResources_es_ES.properties
    • -62
    • +0
    /lams_monitoring/conf/language/ApplicationResources_fr_FR.properties
    • -62
    • +0
    /lams_monitoring/conf/language/ApplicationResources_ko_KR.properties
    • -62
    • +0
    /lams_monitoring/conf/language/ApplicationResources_mi_NZ.properties
    • -62
    • +0
    /lams_monitoring/conf/language/ApplicationResources_no_NO.properties
    • -62
    • +0
    /lams_monitoring/conf/language/ApplicationResources_pl_PL.properties
    • -62
    • +0
    /lams_monitoring/conf/language/ApplicationResources_sv_SE.properties
2:14 pm

mseaton

remove NONE type option for Gate Activity(s)

Options
    • binary
    /lams_central/web/lams_authoring.swf
    • binary
    /lams_central/web/lams_authoring_library.swf
    • -1
    • +0
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Activity.as