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 03 Jul 2007
10:03 am

fmalikoff

Branching: Adding x and y co-ordinates for the start and stop points. This is to support to UI - the details are not used by the progress engine.

Options
    • -0
    • +13
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml
    • -2
    • +54
    /lams_common/db/model/lams_11.clay
    • -0
    • +4
    /lams_common/db/sql/create_lams_11_tables.sql
    • -1
    • +6
    /lams_common/db/sql/updatescripts/alter_21_branching.sql
    • -3
    • +64
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/BranchingActivity.java
    • -3
    • +9
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/ChosenBranchingActivity.java
    • -0
    • +8
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/GroupBranchingActivity.java
    • -0
    • +8
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolBranchingActivity.java
    • -84
    • +128
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
    • -4
    • +6
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
    • -12
    • +12
    /lams_common/src/java/org/lamsfoundation/lams/lesson/service/ILessonService.java
    • -14
    • +12
    /lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java
Monday 02 Jul 2007
2:47 pm

mseaton

improved canvas branch view - adding canvas activities (group, branching, optional activities etc)

Options
    • binary
    /lams_central/web/lams_authoring.swf
    • binary
    /lams_central/web/lams_authoring_library.swf
    • -4
    • +4
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as
    • -18
    • +28
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as
    • -11
    • +39
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as
    • -1
    • +1
    /lams_flash/src/common/flash/org/lamsfoundation/lams/common/CommonCanvasView.as
12:09 pm

dcarlier

LI-120 creating the build ant scipt for the unix installer package.

Options
    • -0
    • +81
    /unix_installer/installer-package/build-package.xml
12:07 pm

dcarlier

Updating with changes that fiona made for 2.0.4 release. Some files replace with code downloaded from the installer package website

Options
    • binary
    /unix_installer/installer-package/ant-scripts/.createdabase.xml.swp
    • -7
    • +5
    /unix_installer/installer-package/sql-scripts/create-database.sql
9:38 am

dcarlier

File is generated by installer, so should not be in the build package

Options
    • -12
    • +0
    /unix_installer/installer-package/ant-scripts/update-configuration.xml
9:13 am

fmalikoff

Branching: Improved validation logic for adding branch connectors or transitions in Branching Activity view. Added firstActivityUIID field to SequenceActivity. Creating branches on fly (onload of sequence activities in branching activity).

Options
    • binary
    /lams_central/web/lams_authoring.swf
    • binary
    /lams_central/web/lams_authoring_library.swf
Friday 29 Jun 2007
4:37 pm

mseaton

added firstActivityUIID field to SequenceActivity + improve branching validation logic + creating branches on fly (onload of sequence activities in branching activity)

Options
    • -3
    • +3
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Branch.as
    • -2
    • +5
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as
    • -0
    • +27
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/SequenceActivity.as
    • -13
    • +30
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as
    • -2
    • +4
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as
    • -21
    • +34
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as
4:23 pm

fmalikoff

Rolling back previous update as the validation changes caused problems with drawing the "transitions" from the start hub.

Options
    • binary
    /lams_central/web/lams_authoring.swf
    • binary
    /lams_central/web/lams_authoring_library.swf
3:29 pm

fmalikoff

Branching: Added a new field firstActivity to the SequenceActivity, so Flash can easily indicate where to start in a sequence activity. That way, the logic works in the same way as it does in a learning design.

Options
    • -3
    • +31
    /lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
    • -23
    • +39
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/strategy/SequenceActivityStrategy.java
    • -1
    • +2
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/SequenceActivityAction.java
1:35 pm

fmalikoff

Branching: Added a new field firstActivity to the SequenceActivity, so Flash can easily indicate where to start in a sequence activity. That way, the logic works in the same way as it does in a learning design.

Options
    • -1
    • +1
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/SequenceActivityAction.java
1:19 pm

fmalikoff

Branching: Added a new field firstActivity to the SequenceActivity, so Flash can easily indicate where to start in a sequence activity. That way, the logic works in the same way as it does in a learning design.

Options
    • -2
    • +10
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml
    • -0
    • +13
    /lams_common/db/model/lams_11.clay
    • -0
    • +1
    /lams_common/db/sql/create_lams_11_tables.sql
    • -0
    • +3
    /lams_common/db/sql/updatescripts/alter_21_branching.sql
    • -9
    • +18
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java
    • -3
    • +13
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
    • -3
    • +31
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
9:40 am

mseaton

improved validation logic for adding branch connectors or transitions in Branching Activity view

Options
    • binary
    /lams_central/web/lams_authoring.swf
    • binary
    /lams_central/web/lams_authoring_library.swf
    • -2
    • +5
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as
    • -1
    • +10
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as
    • -16
    • +50
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as
    • binary
    /lams_flash/src/common/flash/LFWindow.fla
    • -3
    • +0
    /lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/LFMessage.as
    • -12
    • +7
    /lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/LFError.as
7:52 am

fmalikoff

Clarifying comparison for group - will now work even if the groups have the same order id. Removed unneeded saving logic from the import code now that the comparison is fixed.

Options
    • -4
    • +9
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/Group.java
    • -8
    • +6
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
7:14 am

fmalikoff

Branching: Wasn't updating the branch link when we copied the branch mappings (when copying a design).

Options
    • -0
    • +3
    /lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
7:13 am

fmalikoff

Update done the day after the initial release - the db was being created locally on a fresh machine as user grants were failing. Referred to a non-existent parameter SQL_GRANT, which has been replaced by SQL_HOST.

Options
    • -1
    • +1
    /unix_installer/installer-package/ant-scripts/configure-database.xml
    • -2
    • +4
    /unix_installer/installer-package/sql-scripts/create-database.sql
Thursday 28 Jun 2007
10:08 pm

fmalikoff

Branching: Getting the progress engine working so it will display the branch activities if the sequence/branch contains one or no activities

Options
    • -0
    • +2
    /lams_learning/build.xml
10:08 pm

fmalikoff

Branching: Getting the import working for grouped branching

Options
    • -0
    • +10
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/GroupBranchActivityEntryDTO.java
    • -12
    • +105
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
2:50 pm

fmalikoff

Stop it deploying the classes directory under WEB-INF - this can give us class conflicts as the code ends up in two places.

Options
    • -0
    • +2
    /lams_learning/build.xml
    • -2
    • +6
    /lams_learning/conf/language/lams/ApplicationResources.properties
    • -0
    • +5
    /lams_learning/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +9
    /lams_learning/conf/xdoclet/struts-forms.xml
    • -20
    • +18
    /lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml
    • -36
    • +23
    /lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java
    • -0
    • +17
    /lams_learning/src/java/org/lamsfoundation/lams/learning/service/ICoreLearnerService.java
    • -18
    • +121
    /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -8
    • +0
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ActivityAction.java
    • -50
    • +70
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/BranchingActivityAction.java
    • -1
    • +1
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ChooseActivityAction.java
    • -1
    • +1
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivityAction.java
    • -1
    • +1
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java
    • -1
    • +1
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayToolActivityAction.java
    • -9
    • +1
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GateAction.java
  16. … 11 more files in changeset.
2:49 pm

fmalikoff

Branching: Getting the progress engine working so it will display the branch activities if the sequence/branch contains one or no activities

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -14
    • +13
    /lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
    • -2
    • +9
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/GroupBranchActivityEntry.hbm.xml
    • -6
    • +26
    /lams_common/db/model/lams_11.clay
    • -4
    • +9
    /lams_common/db/sql/create_lams_11_tables.sql
    • -4
    • +8
    /lams_common/db/sql/updatescripts/alter_21_branching.sql
    • -2
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/Group.java
    • -3
    • +21
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/GroupBranchActivityEntry.java
    • -0
    • +10
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/GroupBranchActivityEntryDTO.java
    • -6
    • +15
    /lams_common/src/java/org/lamsfoundation/lams/lesson/service/ILessonService.java
    • -3
    • +16
    /lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java
    • -0
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/util/wddx/WDDXTAGS.java
    • -0
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java
11:22 am

fmalikoff

Updating version to 2.0.4 / 2.0.4 Dev

Options
    • -5
    • +5
    /lams_common/db/sql/insert_lams_unix_config_data.sql
10:17 am

dcarlier

Updates unix updater for the 2.0.4 release

Options
    • -4
    • +4
    /unix_installer/upgrader-package/ant-scripts/lang.properties
    • -2
    • +2
    /unix_installer/upgrader-package/ant-scripts/language-pack.xml
    • -0
    • +4
    /unix_installer/upgrader-package/ant-scripts/tomcat-204-files/context.xml
    • -0
    • +138
    /unix_installer/upgrader-package/ant-scripts/tomcat-204-files/jboss-service.xml
    • -0
    • +128
    /unix_installer/upgrader-package/ant-scripts/tomcat-204-files/server.xml
    • -0
    • +984
    /unix_installer/upgrader-package/ant-scripts/tomcat-204-files/web.xml
    • -0
    • +32
    /unix_installer/upgrader-package/ant-scripts/update-204_jbossweb-tomcat55.sar.xml
    • -6
    • +6
    /unix_installer/upgrader-package/ant-scripts/update-core-database.xml
    • -1
    • +1
    /unix_installer/upgrader-package/ant-scripts/update-deploy-tools.xml
    • -0
    • +334
    /unix_installer/upgrader-package/ant-scripts/update-lams.xml
    • -42
    • +1
    /unix_installer/upgrader-package/ant-scripts/updateLocales.sql
    • binary
    /unix_installer/upgrader-package/bin/UpdateLAMS202Chat.class
    • binary
    /unix_installer/upgrader-package/bin/checkmysql.class
    • binary
    /unix_installer/upgrader-package/bin/copyllid.class
    • binary
    /unix_installer/upgrader-package/bin/hibernate3.jar
  16. … 138 more files in changeset.
9:54 am

jliew

remove 'name' from struts actions that have no actionform - causes struts warnings like "WARN [org.apache.struts.util.RequestUtils] No FormBeanConfig found under 'AuthoringAction"

Options
    • -2
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java
    • -2
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/authoring/web/ExportToolContentAction.java
    • -2
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/authoring/web/ImportToolContentAction.java
    • -2
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/themes/web/ThemeAction.java
8:37 am

dcarlier

ant-scripts folder for unix installer 2.0.4

Options
    • binary
    /unix_installer/installer-package/ant-scripts/.createdabase.xml.swp
    • -0
    • +45
    /unix_installer/installer-package/ant-scripts/configure-database.xml
    • -3
    • +4
    /unix_installer/installer-package/ant-scripts/configure-deploy.xml
    • -0
    • +12
    /unix_installer/installer-package/ant-scripts/update-configuration.xml
    • -3
    • +3
    /unix_installer/installer-package/ant-scripts/version.properties
Wednesday 27 Jun 2007
4:59 pm

mseaton

updates for improved branch connectors

Options
    • -1
    • +6
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as
    • -15
    • +0
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasConnection.as
    • -2
    • +14
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as
    • -3
    • +9
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as
8:31 am

fmalikoff

Allow the master build to set the dbname, username and password in mysql-ds from the properties file.

Options
    • -0
    • +5
    /lams_build/build.xml
    • -9
    • +9
    /lams_build/conf/unix/jboss/service/mysql-ds.xml
    • -9
    • +10
    /lams_build/conf/windows/jboss/service/mysql-ds.xml
Tuesday 26 Jun 2007
4:08 pm

mseaton

connectors work to end point

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
    • binary
    /lams_flash/src/central/flash/lams_authoring_main.fla
    • -6
    • +8
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as
    • -4
    • +20
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as
2:57 pm

mseaton

further progress on branch connectors + create new Sequence Activity(s) when a branch is created + dropping activities in sequence activties on normal transition connection

Options
    • binary
    /lams_flash/src/central/flash/lams_authoring.fla
    • binary
    /lams_flash/src/central/flash/lams_authoring_main.fla
    • -3
    • +9
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Branch.as
    • -11
    • +11
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as
    • -1
    • +2
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/BranchConnector.as
    • -1
    • +6
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as
    • -3
    • +4
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as
    • -80
    • +137
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as
Monday 25 Jun 2007
6:36 pm

mseaton

fixed up canvas file problem (exceeding bytecode limited)

Options
    • binary
    /lams_flash/src/central/flash/lams_authoring.fla
    • -4
    • +4
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Application.as
    • -2
    • +19
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Branch.as
    • -0
    • +17
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as
    • -20
    • +8
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/BranchConnector.as
    • -6
    • +9
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as
    • -613
    • +56
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as
    • -9
    • +2
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as
    • -0
    • +597
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as
    • -2
    • +7
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as
    • -163
    • +489
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as
    • -1267
    • +0
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorNew.as
    • -1
    • +1
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/SaveConfirmDialog.as
    • -1
    • +1
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/layout/DefaultLayoutManager.as
    • -1
    • +1
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/layout/EditOnFlyLayoutManager.as
  16. … 3 more files in changeset.
1:30 pm

dcarlier

Updates unix installer for the 2.0.4 release

Options
    • binary
    /unix_installer/installer-package/assembly/lams-session.jar
    • binary
    /unix_installer/installer-package/assembly/lams-valve.jar
    • binary
    /unix_installer/installer-package/bin/checkmysql.class
    • -1
    • +1
    /unix_installer/installer-package/bin/run-lams.sh
    • -7
    • +15
    /unix_installer/installer-package/conf/unix/authentication/lamsauthentication.xml
    • -3
    • +3
    /unix_installer/installer-package/conf/unix/jboss/service/mysql-ds.xml
    • -0
    • +7
    /unix_installer/installer-package/database/create-database.sql
    • -36
    • +49
    /unix_installer/installer-package/database/lams.dump
    • -68
    • +56
    /unix_installer/installer-package/install-lams.sh
    • -5
    • +10
    /unix_installer/installer-package/lams.properties
    • -1
    • +1
    /unix_installer/installer-package/license
    • -43
    • +76
    /unix_installer/installer-package/readme
    • -0
    • +7
    /unix_installer/installer-package/sql-scripts/create-database.sql
Friday 22 Jun 2007
4:02 pm

mseaton

spawn branches off single (start) connector in branching view

Options
    • -1
    • +30
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as
    • -4
    • +73
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/BranchConnector.as
    • -4
    • +4
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as
    • -1
    • +1
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchingConnector.as
    • -1
    • +12
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as
    • -2
    • +2
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as
    • -0
    • +211
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasConnection.as
    • -3
    • +57
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as
    • -10
    • +13
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as
    • -184
    • +12
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasTransition.as