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
Thursday 21 Jun 2007
4:47 pm

mseaton

added Branch to the model (+BranchConnectors for view)

Options
    • binary
    /lams_flash/src/central/flash/lams_authoring.fla
    • -7
    • +2
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Application.as
    • -0
    • +60
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Branch.as
    • -59
    • +0
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/BranchActivity.as
    • -10
    • +71
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as
    • -1
    • +1
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Transition.as
    • -3
    • +24
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/BranchConnector.as
    • -8
    • +62
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as
    • -17
    • +18
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as
    • -28
    • +76
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as
    • -2
    • +16
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasTransition.as
3:10 pm

jliew

don't fail when can't check spreadsheet type

Options
    • -2
    • +10
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ImportUserResultAction.java
3:09 pm

jliew

fix javascript to use onsubmit call

Options
    • -2
    • +2
    /lams_admin/web/import/importGroups.jsp
    • -2
    • +2
    /lams_admin/web/import/importexcel.jsp
12:44 pm

mseaton

setup sequence act on branch view open + activities added to view are added as child view of the default sequence act + improved clearCanvas

Options
    • binary
    /lams_flash/src/central/flash/lams_authoring.fla
    • -27
    • +20
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Activity.as
    • -2
    • +0
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/BranchingActivity.as
    • -7
    • +10
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as
    • -0
    • +78
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/SequenceActivity.as
    • -9
    • +6
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Transition.as
    • -0
    • +37
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/BranchConnector.as
    • -8
    • +75
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as
    • -0
    • +61
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchingConnector.as
    • -8
    • +17
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as
    • -32
    • +47
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as
    • -2
    • +7
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasBranchingActivity.as
    • -32
    • +21
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as
    • -101
    • +122
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as
    • -3
    • +0
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as
    • -62
    • +8
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasTransition.as
    • -3
    • +2
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as
8:20 am

fmalikoff

Fix to add the system tool entry has been moved to a separate script on the lams2_0_3_fixes tag.

Options
    • -0
    • +30
    /lams_common/db/sql/updatescripts/alter_204_editonfly.sql
7:42 am

fmalikoff

Fix to add the system tool entry has been moved to a separate script on the lams2_0_3_fixes tag.

Options
    • -8
    • +0
    /lams_common/db/sql/updatescripts/alter_203_editonfly.sql
Wednesday 20 Jun 2007
1:43 pm

jliew

fix roles import using getSession() to check whether user is sysadmin

Options
    • -3
    • +9
    /lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java
12:43 pm

fmalikoff

Methods in the UserManagementService were missing from the transaction definitions, and this was causing issues in the roles import.

Options
    • -0
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
12:16 pm

jliew

make roles import work with new thread; fix console log message when roles couldn't be assigned; fix wrong key used for jsp error message

Options
    • -3
    • +4
    /lams_admin/src/java/org/lamsfoundation/lams/admin/service/IImportService.java
    • -4
    • +8
    /lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java
Tuesday 19 Jun 2007
2:38 pm

jliew

changed to only fork a thread if number of rows in spreadsheet is > 500 (so small spreadsheets don't have to wait for status page's first update if<5 seconds)

Options
    • -0
    • +9
    /lams_admin/src/java/org/lamsfoundation/lams/admin/service/IImportService.java
    • -1
    • +9
    /lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java
    • -5
    • +13
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/ImportExcelSaveAction.java
1:28 pm

jliew

removing accidentally committed file

Options
    • -15
    • +0
    /lams_admin/web/import/importStatus.jsp
1:28 pm

jliew

LDEV-1261 improve import user speed by running in separate thread (bypass hibernate filter), and update browser with progress every 5 seconds so it doesn't timeout.

Options
    • -0
    • +1
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -0
    • +1
    /lams_admin/conf/language/lams/ApplicationResources_en_AU.properties
    • -105
    • +1
    /lams_admin/conf/xdoclet/filter-mappings.xml
    • -2
    • +6
    /lams_admin/src/java/org/lamsfoundation/lams/admin/service/IImportService.java
    • -23
    • +45
    /lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java
    • -16
    • +23
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/ImportExcelSaveAction.java
    • -0
    • +85
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ImportUserResultAction.java
    • -2
    • +19
    /lams_admin/web/import/importGroups.jsp
    • -0
    • +15
    /lams_admin/web/import/importStatus.jsp
    • -1
    • +7
    /lams_admin/web/import/importexcel.jsp
    • -0
    • +55
    /lams_admin/web/import/status.jsp
    • -1
    • +9
    /lams_common/src/java/org/lamsfoundation/lams/util/audit/AuditService.java
    • -0
    • +11
    /lams_common/src/java/org/lamsfoundation/lams/util/audit/IAuditService.java
12:47 pm

asukkar

Updated generic-dao from 0.8 to 0.9. New version no longer has init() method.

Options
    • -1
    • +0
    /sakai-lamstwo/impl/dao/src/java/org/lamsfoundation/lams/integrations/sakai/dao/impl/LamstwoDaoImpl.java
Monday 18 Jun 2007
3:30 pm

fmalikoff

Missed adding the system tool for the System Gate. As a result, if the user tries to go to the gate, they just get the index screen. The problem will have gone out in the Windows upgrader. Doing this fix now and will be okay in the Unix upgrader.

Options
    • -1
    • +9
    /lams_common/db/sql/updatescripts/alter_203_editonfly.sql
Friday 15 Jun 2007
1:44 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
    • -0
    • +6
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LearningDesignDTO.java
12:49 pm

erniegx <ernieg@gmail.com>

Updating Wizard files for RAMS

Options
    • -1
    • +1
    /lams_central/conf/flashxml/rams/wizard/en_AU_dictionary.xml
    • -1
    • +1
    /lams_central/conf/flashxml/rams/wizard/en_dictionary.xml
12:13 pm

fmalikoff

LDEV-881: Another attempt to get rid of the java.lang.ArrayIndexOutOfBoundsException: 1 warning. This change should avoid many warnings coming out of Tomcat - not what we really wanted but we need to get rid of the "java.lang.ArrayIndexOutOfBoundsException: 1" warning as it really clutters the logs.

Options
    • -1
    • +1
    /lams_build/conf/unix/jboss/log4j.xml
    • -1
    • +1
    /lams_build/conf/windows/jboss/log4j.xml
11:11 am

jliew

LDEV-1261 remove import spreadsheet actions from customised hibernate filter - need to enumerate each url in lams_admin that requires the filter from now on

Options
    • -2
    • +102
    /lams_admin/conf/xdoclet/filter-mappings.xml
9:18 am

asukkar

Updated generic-dao from 0.8 to 0.9

Options
    • -1
    • +1
    /sakai-lamstwo/api/logic/project.xml
    • -1
    • +1
    /sakai-lamstwo/impl/dao/project.xml
    • -1
    • +1
    /sakai-lamstwo/impl/logic/project.xml
    • -1
    • +1
    /sakai-lamstwo/impl/pack/project.xml
7:49 am

fmalikoff

No need to keep deleting the content repository now as it the repository will overwrite the files.

Options
    • -1
    • +3
    /lams_common/build.xml
7:32 am

erniegx <ernieg@gmail.com>

Updating RAMS Monitoring

Options
    • -1
    • +1
    /lams_central/conf/flashxml/rams/monitoring/en_AU_dictionary.xml
    • -1
    • +1
    /lams_central/conf/flashxml/rams/monitoring/en_dictionary.xml
Thursday 14 Jun 2007
3:27 pm

mseaton

improved branch view - can add activities/transitions to branch view

Options
    • -1
    • +21
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as
    • -16
    • +13
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as
    • -1
    • +12
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasBranchingActivity.as
    • -52
    • +29
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as
    • -8
    • +10
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as
    • -0
    • +11
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as
    • -7
    • +8
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tk/ToolkitController.as
    • -4
    • +11
    /lams_flash/src/common/flash/org/lamsfoundation/lams/common/CommonCanvasView.as
2:13 pm

jliew

add help-no-tags class for displaying help icon in pages other than authoring (namely, lams_admin)

Options
    • -0
    • +2
    /lams_central/web/css/defaultHTML.css
    • -0
    • +2
    /lams_central/web/css/defaultHTML_learner.css
    • -0
    • +2
    /lams_central/web/css/defaultHTML_rtl.css
    • -0
    • +2
    /lams_central/web/css/defaultHTML_rtl_learner.css
2:12 pm

jliew

update lams:help tags to display properly

Options
    • -1
    • +1
    /lams_admin/web/config/editconfig.jsp
    • -1
    • +1
    /lams_admin/web/import/importGroups.jsp
    • -1
    • +1
    /lams_admin/web/import/importexcel.jsp
    • -1
    • +1
    /lams_admin/web/import/importv1.jsp
    • -1
    • +1
    /lams_admin/web/import/importv1contents.jsp
    • -1
    • +1
    /lams_admin/web/servermaintain.jsp
2:12 pm

jliew

update lams:help tag with style attribute, mainly for lams_admin to display properly

Options
    • -0
    • +8
    /lams_admin/web/WEB-INF/lams.tld
    • -1
    • +25
    /lams_central/src/java/org/lamsfoundation/lams/web/tag/HelpTag.java
    • -0
    • +8
    /lams_central/web/WEB-INF/lams.tld
    • -0
    • +8
    /lams_learning/web/WEB-INF/lams.tld
    • -0
    • +8
    /lams_monitoring/web/WEB-INF/lams.tld
    • -0
    • +8
    /lams_tool_chat/web/WEB-INF/lams.tld
    • -0
    • +8
    /lams_tool_forum/web/WEB-INF/lams.tld
    • -0
    • +8
    /lams_tool_lamc/web/WEB-INF/lams.tld
    • -0
    • +8
    /lams_tool_laqa/web/WEB-INF/lams.tld
    • -0
    • +8
    /lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld
    • -0
    • +8
    /lams_tool_nb/web/WEB-INF/lams.tld
    • -0
    • +8
    /lams_tool_notebook/web/WEB-INF/lams.tld
    • -0
    • +8
    /lams_tool_sbmt/web/WEB-INF/lams.tld
    • -0
    • +8
    /lams_tool_scribe/web/WEB-INF/lams.tld
    • -0
    • +8
    /lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld
    • -0
    • +8
    /lams_tool_vote/web/WEB-INF/lams.tld
    • -0
    • +8
    /lams_www/web/WEB-INF/lams.tld
8:54 am

jliew

LDEV-1259 bulk import groups via spreadsheet

Options
    • -0
    • +6
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -1
    • +6
    /lams_admin/conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +6
    /lams_admin/conf/xdoclet/struts-forms.xml
    • -0
    • +9
    /lams_admin/src/java/org/lamsfoundation/lams/admin/service/IImportService.java
    • -2
    • +164
    /lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java
    • -0
    • +79
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ImportGroupsAction.java
    • -0
    • +2
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SysAdminStartAction.java
    • -0
    • +5
    /lams_admin/web/WEB-INF/tiles/tiles-defs.xml
    • binary
    /lams_admin/web/file/lams_groups_template.xls
    • -0
    • +78
    /lams_admin/web/import/importGroups.jsp
8:53 am

jliew

LDEV-1259 when saving organisations, check if child sets are null

Options
    • -11
    • +15
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
8:07 am

fmalikoff

LDEV-1257: Tweaking the collection tests when copying the groups - need to check that they aren't null as Hibernate may not have created empty groups yet.

Options
    • -2
    • +4
    /lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
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