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
Wednesday 13 Jun 2007
6:42 pm

fmalikoff

LDEV-1257: Added support for Groups to be created in authoring (so that the names can be entered) and the mapping table to map groups to a sequence activity (ala branch) for a Group based branching activity.

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -56
    • +143
    /lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
    • -11
    • +32
    /lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
    • -0
    • +10
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Group.hbm.xml
    • -0
    • +41
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/GroupBranchActivityEntry.hbm.xml
    • -97
    • +107
    /lams_common/db/model/lams_11.clay
    • -0
    • +16
    /lams_common/db/sql/create_lams_11_tables.sql
    • -0
    • +20
    /lams_common/db/sql/updatescripts/alter_21_branching.sql
    • -0
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
    • -2
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/ChosenGrouping.java
    • -5
    • +71
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/Group.java
    • -0
    • +160
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/GroupBranchActivityEntry.java
    • -1
    • +28
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/Grouping.java
    • -5
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/RandomGrouping.java
    • -0
    • +91
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/GroupBranchActivityEntryDTO.java
  16. … 4 more files in changeset.
4:11 pm

mseaton

improved transition opening branching view (adding modality) + transparent fade on unactive canvas views + minimize icon

Options
    • binary
    /lams_flash/src/central/flash/lams_authoring.fla
    • -11
    • +37
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as
    • -6
    • +8
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as
    • -0
    • +2
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as
    • -29
    • +17
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as
    • -10
    • +12
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as
    • -2
    • +11
    /lams_flash/src/common/flash/org/lamsfoundation/lams/common/CommonCanvasView.as
Tuesday 12 Jun 2007
3:51 pm

mseaton

first stage opening second-level (branching) canvas layer + featuring zoom transition

Options
    • -158
    • +76
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as
    • -36
    • +48
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as
    • -1
    • +1
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as
    • -3
    • +13
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as
    • -145
    • +48
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as
    • -1
    • +1
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tk/ToolkitController.as
    • -64
    • +54
    /lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as
    • -9
    • +148
    /lams_flash/src/common/flash/org/lamsfoundation/lams/common/CommonCanvasView.as
    • -6
    • +7
    /lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/InputDialog.as
7:43 am

fmalikoff

LDEV-1134: Dummying up a branching page for the progress engine.

Options
    • -0
    • +106
    /lams_learning/web/branchingActivity.jsp
7:43 am

fmalikoff

LDEV-1134: Dummying up a branching page for the progress engine. Had missed the entry for the abstract branching class in the Hibernate file when I switched from 1 branching class to 3.

Options
    • -8
    • +13
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/RandomGrouper.java
    • -15
    • +12
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/strategy/BranchingActivityStrategy.java
    • -2
    • +3
    /lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java
    • -0
    • +121
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/BranchingActivityAction.java
    • -0
    • +4
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMappingStrategy.java
Friday 08 Jun 2007
2:22 pm

fmalikoff

Split branching activity into 3 activities - one for each method of branching (teacher chosen, grouped and tool based)

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -1
    • +7
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml
    • -7
    • +26
    /lams_common/db/sql/insert_types_data.sql
    • -10
    • +31
    /lams_common/db/sql/updatescripts/alter_21_branching.sql
    • -6
    • +48
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java
    • -19
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/BranchingActivity.java
    • -0
    • +132
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/ChosenBranchingActivity.java
    • -0
    • +130
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/GroupBranchingActivity.java
    • -0
    • +131
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolBranchingActivity.java
    • -3
    • +9
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/ActivityDAO.java
    • -5
    • +22
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/strategy/BranchingActivityStrategy.java
9:44 am

fmalikoff

LDEV-1255: Moving the code for stopping jsps caching to a new custom tag, so that it can be applied consistently across all pages. Moved the utf-8 statements to the same tag so we don't have to remember to put them in all pages.

Options
    • -2
    • +0
    /lams_admin/web/WEB-INF/tags/headItems.tag
    • -2
    • +0
    /lams_central/web/WEB-INF/tags/headItems.tag
    • -2
    • +0
    /lams_learning/web/WEB-INF/tags/headItems.tag
    • -2
    • +0
    /lams_monitoring/web/WEB-INF/tags/headItems.tag
    • -0
    • +4
    /lams_tool_chat/web/WEB-INF/lams.tld
    • -0
    • +41
    /lams_tool_chat/web/WEB-INF/tags/Head.tag
    • -2
    • +0
    /lams_tool_chat/web/WEB-INF/tags/headItems.tag
    • -2
    • +2
    /lams_tool_chat/web/common/header.jsp
    • -3
    • +2
    /lams_tool_chat/web/common/learnerheader.jsp
    • -3
    • +2
    /lams_tool_chat/web/pages/export/exportPortfolio.jsp
    • -0
    • +4
    /lams_tool_forum/web/WEB-INF/lams.tld
    • -0
    • +41
    /lams_tool_forum/web/WEB-INF/tags/Head.tag
    • -2
    • +0
    /lams_tool_forum/web/WEB-INF/tags/headItems.tag
    • -10
    • +0
    /lams_tool_forum/web/common/header.jsp
    • -2
    • +2
    /lams_tool_forum/web/includes/layout.jsp
  16. … 170 more files in changeset.
Thursday 07 Jun 2007
11:48 am

fmalikoff

LDEV-1255: Moving the code for stopping jsps caching to a new custom tag, so that it can be applied consistently across all pages.

Options
    • -3
    • +2
    /lams_www/web/copyright.jsp
Wednesday 06 Jun 2007
8:35 am

lfoxton

Final changes for the 2.0.3 updater/installer

Options
    • -1
    • +1
    /win_installer/build.xml
    • -1
    • +1
    /win_installer/license.txt
    • -3
    • +4
    /win_installer/readme.txt
    • -0
    • +115
    /win_installer/src/Functions.nsh
    • -0
    • +110
    /win_installer/src/GetLlidFolderNames.java
    • -1
    • +1
    /win_installer/src/LanguagePack.xml
    • -0
    • +130
    /win_installer/src/UpdateLAMS202Chat.java
    • -1
    • +1
    /win_installer/src/backup-finish.ini
    • -1
    • +1
    /win_installer/src/backup.ini
    • -3
    • +5
    /win_installer/src/backup.nsi
    • -1
    • +17
    /win_installer/src/mysql.ini
    • -2
    • +2
    /win_installer/src/revert-dir.ini
    • -16
    • +22
    /win_installer/src/revert.nsi
    • -43
    • +1
    /win_installer/src/updateLocales.sql
    • -471
    • +354
    /win_installer/src/updater.nsi
  16. … 4 more files in changeset.
8:34 am

lfoxton

made changes so this java class xcan communicate with the installer/updater

Options
    • -8
    • +44
    /lams_tool_chat/db/sql/updatescripts/UpdateLAMS202Chat.java
Tuesday 05 Jun 2007
3:26 pm

fmalikoff

LDEV-1134: Changed strategy to suit how we now expect a sequence activity to look - a whole pile of subactivities joined with transitions rather than order ids.

Options
    • -13
    • +24
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/strategy/SequenceActivityStrategy.java
3:16 pm

fmalikoff

Adding database changes script for branching

Options
    • -0
    • +13
    /lams_common/db/sql/updatescripts/alter_21_branching.sql
2:27 pm

erniegx <ernieg@gmail.com>

Updating Polish

Options
    • -1
    • +1
    /lams_central/conf/flashxml/lams/authoring/pl_PL_dictionary.xml
1:59 pm

mseaton

branching changes

Options
    • binary
    /lams_central/web/lams_authoring.swf
    • binary
    /lams_central/web/lams_authoring_library.swf
    • -0
    • +4
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as
    • binary
    /lams_flash/src/common/flash/assets/tools/CreateDictionary.fla
1:54 pm

fmalikoff

LDEV-1255: Moving the code for stopping jsps caching to a new custom tag, so that it can be applied consistently across all pages.

Options
    • -0
    • +4
    /lams_admin/web/WEB-INF/lams.tld
    • -0
    • +41
    /lams_admin/web/WEB-INF/tags/Head.tag
    • -5
    • +2
    /lams_admin/web/template.jsp
    • -1
    • +6
    /lams_central/conf/xdoclet/taglib-tag.xml
    • -0
    • +4
    /lams_central/web/WEB-INF/lams.tld
    • -0
    • +41
    /lams_central/web/WEB-INF/tags/Head.tag
    • -3
    • +2
    /lams_central/web/addLesson.jsp
    • -3
    • +2
    /lams_central/web/admin.jsp
    • -45
    • +17
    /lams_central/web/author.jsp
    • -3
    • +2
    /lams_central/web/authoringConfirm.jsp
    • -4
    • +2
    /lams_central/web/development/wddxPost.jsp
    • -3
    • +2
    /lams_central/web/errorpages/403.jsp
    • -4
    • +2
    /lams_central/web/errorpages/404.jsp
    • -3
    • +2
    /lams_central/web/errorpages/error.jsp
    • binary
    /lams_central/web/favicon.ico
  16. … 31 more files in changeset.
1:09 pm

mseaton

adding branch activity to sequence - basic model/dto changes and packet handling

Options
    • -28
    • +7
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Activity.as
    • -0
    • +59
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/BranchActivity.as
    • -0
    • +65
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/BranchingActivity.as
    • -0
    • +4
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as
    • -0
    • +473
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as
    • -5
    • +4
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Bin.as
    • -115
    • +87
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as
    • -24
    • +18
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as
    • -0
    • +468
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasBranchingActivity.as
    • -5
    • +26
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as
    • -40
    • +51
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as
    • -11
    • +15
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as
    • -9
    • +7
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasParallelActivity.as
    • -99
    • +30
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as
    • -0
    • +2
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/ICanvasActivity.as
  16. … 5 more files in changeset.
12:39 pm

mseaton

remove unused about.as

Options
    • -123
    • +0
    /lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/About.as
12:33 pm

mseaton

adding branch activity to sequence - basic model/dto changes and packet handling

Options
    • -2
    • +18
    /lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
    • -0
    • +3
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml
    • -0
    • +11
    /lams_common/db/sql/insert_types_data.sql
    • -1
    • +21
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java
    • -0
    • +140
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/BranchingActivity.java
    • -0
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/ActivityDAO.java
    • -0
    • +5
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
    • -0
    • +7
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LibraryActivityDTO.java
    • -0
    • +79
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/strategy/BranchingActivityStrategy.java
    • -0
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/tool/SystemTool.java
12:19 pm

mseaton

updated src settings

Options
    • binary
    /lams_flash/src/central/flash/lam_addseq_wiz.fla
    • binary
    /lams_flash/src/central/flash/lams_authoring.fla
    • binary
    /lams_flash/src/central/flash/lams_authoring_main.fla
    • binary
    /lams_flash/src/central/flash/lams_learner.fla
    • binary
    /lams_flash/src/central/flash/lams_monitoring_v1.fla
    • binary
    /lams_flash/src/central/flash/lams_wizard_main.fla
11:51 am

mseaton

removing flash fla and as files

Options
    • binary
    /lams_central/src/flash/lams_monitoring_v1.fla
11:27 am

mseaton

removing flash fla and as files

Options
    • binary
    /lams_central/src/flash/lams_authoring.fla
11:22 am

mseaton

removing flash fla and as files

Options
    • -239
    • +0
    /lams_central/src/flash/LoadQue.as
    • binary
    /lams_central/src/flash/importUpdate_lc.fla
    • binary
    /lams_central/src/flash/lam_addseq_wiz.fla
    • binary
    /lams_central/src/flash/lams_authoring_main.fla
    • binary
    /lams_central/src/flash/lams_learner.fla
    • binary
    /lams_central/src/flash/lams_monitoring_main.fla
    • binary
    /lams_central/src/flash/lams_wizard_main.fla
    • binary
    /lams_central/src/flash/learnerProgress_lc.fla
    • -98
    • +0
    /lams_central/src/flash/main.as
    • -63
    • +0
    /lams_central/src/flash/main2.as
    • -57
    • +0
    /lams_central/src/flash/main_addseq.as
    • -65
    • +0
    /lams_central/src/flash/main_monitoring.as
    • -757
    • +0
    /lams_central/src/flash/org/lamsfoundation/lams/authoring/Activity.as
    • -850
    • +0
    /lams_central/src/flash/org/lamsfoundation/lams/authoring/Application.as
    • -158
    • +0
    /lams_central/src/flash/org/lamsfoundation/lams/authoring/ComplexActivity.as
  16. … 252 more files in changeset.
10:58 am

mseaton

adding new flash project - contains all flash fla and as files

Options
    • -0
    • +11
    /lams_flash/.project
    • -0
    • +239
    /lams_flash/src/central/flash/LoadQue.as
    • binary
    /lams_flash/src/central/flash/importUpdate_lc.fla
    • binary
    /lams_flash/src/central/flash/lam_addseq_wiz.fla
    • binary
    /lams_flash/src/central/flash/lams_authoring.fla
    • binary
    /lams_flash/src/central/flash/lams_authoring_main.fla
    • binary
    /lams_flash/src/central/flash/lams_learner.fla
    • binary
    /lams_flash/src/central/flash/lams_monitoring_main.fla
    • binary
    /lams_flash/src/central/flash/lams_monitoring_v1.fla
    • binary
    /lams_flash/src/central/flash/lams_wizard_main.fla
    • binary
    /lams_flash/src/central/flash/learnerProgress_lc.fla
    • -0
    • +98
    /lams_flash/src/central/flash/main.as
    • -0
    • +63
    /lams_flash/src/central/flash/main2.as
    • -0
    • +57
    /lams_flash/src/central/flash/main_addseq.as
    • -0
    • +65
    /lams_flash/src/central/flash/main_monitoring.as
  16. … 256 more files in changeset.
Friday 01 Jun 2007
4:26 pm

fmalikoff

Was caching in browser and causing problems in upgrades. Trying to stop it caching.

Options
    • -0
    • +4
    /lams_monitoring/web/monitorLesson.jsp
3:28 pm

mseaton

updated dictionary load url to include build no/version param

Options
    • binary
    /lams_central/web/lams_authoring.swf
    • binary
    /lams_central/web/lams_authoring_library.swf
    • binary
    /lams_learning/web/lams_learner.swf
    • binary
    /lams_monitoring/web/lams_monitoring.swf
    • binary
    /lams_monitoring/web/lams_monitoring_library.swf
    • binary
    /lams_monitoring/web/lams_wizard.swf
    • binary
    /lams_monitoring/web/lams_wizard_library.swf
11:54 am

erniegx <ernieg@gmail.com>

Updating Danish, Greek, English, Italian, Norwegian

Options
    • -1
    • +1
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -2
    • +17
    /lams_admin/conf/language/lams/ApplicationResources_da_DK.properties
    • -3
    • +3
    /lams_admin/conf/language/lams/ApplicationResources_el_GR.properties
    • -1
    • +1
    /lams_admin/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +9
    /lams_admin/conf/language/lams/ApplicationResources_it_IT.properties
    • -2
    • +3
    /lams_admin/conf/language/lams/ApplicationResources_no_NO.properties
11:52 am

erniegx <ernieg@gmail.com>

Updating greek

Options
    • -6
    • +6
    /lams_build/librarypackages/shareresourcesforum/language/lams/ApplicationResources_el_GR.properties
    • -1
    • +1
    /lams_central/conf/flashxml/lams/wizard/el_GR_dictionary.xml
    • -23
    • +23
    /lams_common/conf/language/lams/ApplicationResources_el_GR.properties
    • -4
    • +4
    /lams_tool_lamc/conf/language/lams/ApplicationResources_el_GR.properties
    • -17
    • +17
    /lams_tool_laqa/conf/language/lams/ApplicationResources_el_GR.properties
    • -11
    • +11
    /lams_tool_larsrc/conf/language/lams/ApplicationResources_el_GR.properties
    • -18
    • +18
    /lams_tool_nb/conf/language/lams/ApplicationResources_el_GR.properties
    • -16
    • +16
    /lams_tool_notebook/conf/language/lams/ApplicationResources_el_GR.properties
    • -41
    • +41
    /lams_tool_vote/conf/language/lams/ApplicationResources_el_GR.properties
11:48 am

erniegx <ernieg@gmail.com>

Updating Danish, Greek and Italian

Options
    • -2
    • +3
    /lams_central/conf/language/lams/ApplicationResources_da_DK.properties
    • -65
    • +65
    /lams_central/conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +3
    /lams_central/conf/language/lams/ApplicationResources_it_IT.properties
    • -17
    • +19
    /lams_learning/conf/language/lams/ApplicationResources_da_DK.properties
    • -8
    • +8
    /lams_learning/conf/language/lams/ApplicationResources_el_GR.properties
    • -31
    • +33
    /lams_learning/conf/language/lams/ApplicationResources_it_IT.properties
11:41 am

erniegx <ernieg@gmail.com>

Updating Italian

Options
    • -1
    • +1
    /lams_central/conf/flashxml/lams/learner/it_IT_dictionary.xml
11:39 am

erniegx <ernieg@gmail.com>

Updating Danish and Italian

Options
    • -1
    • +1
    /lams_central/conf/flashxml/lams/authoring/da_DK_dictionary.xml
    • -1
    • +1
    /lams_central/conf/flashxml/lams/authoring/it_IT_dictionary.xml