Activity lams/

8:02 pm

fmalikoff

More
MAIN:fmalikoff:20060621120240
changed 43 files
MAIN

Implementing gate and grouping screens for export portfolio.

- -5
- +28
/lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
- History
- Source
- Diff
/lams_central/src/.../ObjectExtractor.java
- -0
- +1
/lams_central/src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml
- History
- Source
- Diff
/lams_central/.../authoringApplicationContext.xml
- -2
- +8
/lams_central/web/WEB-INF/lams.tld
- History
- Source
- Diff
/lams_central/web/WEB-INF/lams.tld
- -4
- +7
/lams_central/web/WEB-INF/struts/struts-config.xml
- History
- Source
- Diff
/lams_central/web/.../struts-config.xml
- -0
- +59
/lams_central/web/WEB-INF/tags/ExportPortOutput.tag
- History
- Source
/lams_central/web/.../tags/ExportPortOutput.tag
- -49
- +60
/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml
- History
- Source
- Diff
/lams_common/conf/.../Activity.hbm.xml
- -2441
- +2468
/lams_common/db/model/lams_11.clay
- History
- Source
- Diff
/lams_common/db/model/lams_11.clay
- -1
- +5
/lams_common/db/sql/create_lams_11_tables.sql
- History
- Source
- Diff
/lams_common/db/.../create_lams_11_tables.sql
- -6
- +9
/lams_common/db/sql/insert_types_data.sql
- History
- Source
- Diff
/lams_common/db/sql/insert_types_data.sql
- -3
- +32
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java
- History
- Source
- Diff
/lams_common/src/.../Activity.java
- -3
- +6
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/GateActivity.java
- History
- Source
- Diff
/lams_common/src/.../GateActivity.java
- -23
- +8
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/GroupingActivity.java
- History
- Source
- Diff
/lams_common/src/.../GroupingActivity.java
- -25
- +3
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/OptionsActivity.java
- History
- Source
- Diff
/lams_common/src/.../OptionsActivity.java
- -26
- +2
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/ParallelActivity.java
- History
- Source
- Diff
/lams_common/src/.../ParallelActivity.java
- -26
- +7
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/PermissionGateActivity.java
- History
- Source
- Diff
/lams_common/.../PermissionGateActivity.java
… 28 more files in changeset.

2:56 pm

steven

More
MAIN:steven:20060621065628
changed 3 files
MAIN

Add flash interface for import/export.

- -1
- +0
/lams_central/conf/language/ApplicationResources.properties
- History
- Source
- Diff
/lams_central/.../ApplicationResources.properties
- -0
- +18
/lams_central/web/toolcontent/import_passon.jsp
- History
- Source
/lams_central/web/.../import_passon.jsp
- -6
- +5
/lams_central/web/toolcontent/importresult.jsp
- History
- Source
- Diff
/lams_central/web/.../importresult.jsp

2:04 pm

mseaton

More
MAIN:mseaton:20060621060442
updated 1 file
MAIN

added import/export items to file menu for authoring (no actions tied up yet)

- binary
/lams_common/src/flash/org/lamsfoundation/lams/common/ui/LFMenuBar.as
- History
- Source
- Diff
/lams_common/src/flash/.../ui/LFMenuBar.as

2:03 pm

mseaton

More
MAIN:mseaton:20060621060322
updated 1 file
MAIN

added method to open design from import after callback by passon

- binary
/lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as
- History
- Source
- Diff
/lams_central/src/flash/.../cv/Canvas.as

2:02 pm

mseaton

More
MAIN:mseaton:20060621060241
updated 1 file
MAIN

updated authoring main AS to receive connection from import passon

- binary
/lams_central/src/flash/main.as
- History
- Source
- Diff
/lams_central/src/flash/main.as

2:01 pm

mseaton

More
MAIN:mseaton:20060621060150
added 2 files
MAIN

passes learning design id back to flash authoring after import (authoring not currently ready)

- binary
/lams_central/src/flash/importUpdate_lc.fla
- History
- Source
/lams_central/src/flash/importUpdate_lc.fla
- binary
/lams_central/web/import_passon.swf
- History
- Source
/lams_central/web/import_passon.swf

1:40 pm

asukkar

More
MAIN:asukkar:20060621054008
changed 1 file
MAIN

Replaced basic color palette with 32 colors.

- -31
- +24
/lams_tool_chat/web/chat_client/chat_app.js
- History
- Source
- Diff
/lams_tool_chat/web/.../chat_app.js

1:21 pm

steven

More
MAIN:steven:20060621052109
changed 7 files
MAIN

Interface of import/export function.

- -0
- +5
/lams_central/conf/language/ApplicationResources.properties
- History
- Source
- Diff
/lams_central/.../ApplicationResources.properties
- -5
- +5
/lams_central/src/java/org/lamsfoundation/lams/authoring/web/ExportToolContentAction.java
- History
- Source
- Diff
/lams_central/.../ExportToolContentAction.java
- -6
- +7
/lams_central/src/java/org/lamsfoundation/lams/authoring/web/ImportToolContentAction.java
- History
- Source
- Diff
/lams_central/.../ImportToolContentAction.java
- -2
- +7
/lams_central/web/toolcontent/exportloading.jsp
- History
- Source
- Diff
/lams_central/web/.../exportloading.jsp
- -0
- +2
/lams_central/web/toolcontent/exportresult.jsp
- History
- Source
- Diff
/lams_central/web/.../exportresult.jsp
- -2
- +4
/lams_central/web/toolcontent/import.jsp
- History
- Source
- Diff
/lams_central/web/toolcontent/import.jsp
- -4
- +10
/lams_central/web/toolcontent/importresult.jsp
- History
- Source
- Diff
/lams_central/web/.../importresult.jsp

12:35 pm

asukkar

More
MAIN:asukkar:20060621043517
changed 1 file
MAIN

Changed the rtexprvalue to true for the defineLater attribute.

- -1
- +1
/lams_central/web/WEB-INF/tags/AuthoringButton.tag
- History
- Source
- Diff
/lams_central/web/.../AuthoringButton.tag

12:33 pm

asukkar

More
MAIN:asukkar:20060621043341
changed 13 files
MAIN

Implemented correct behviour for defineLater, runOffline and contentInUse flags.

- -2
- +13
/lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/beans/AuthoringSessionBean.java
- History
- Source
- Diff
/lams_tool_chat/.../AuthoringSessionBean.java
- -7
- +10
/lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dto/ChatDTO.java
- History
- Source
- Diff
/lams_tool_chat/src/java/.../dto/ChatDTO.java
- -6
- +13
/lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java
- History
- Source
- Diff
/lams_tool_chat/src/.../ChatService.java
- -1
- +8
/lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/util/ChatConstants.java
- History
- Source
- Diff
/lams_tool_chat/src/.../ChatConstants.java
- -63
- +143
/lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/AuthoringAction.java
- History
- Source
- Diff
/lams_tool_chat/src/.../AuthoringAction.java
- -32
- +63
/lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/LearningAction.java
- History
- Source
- Diff
/lams_tool_chat/src/.../LearningAction.java
- -23
- +2
/lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/MonitoringAction.java
- History
- Source
- Diff
/lams_tool_chat/src/.../MonitoringAction.java
- -56
- +45
/lams_tool_chat/web/WEB-INF/struts/tiles-defs.xml
- History
- Source
- Diff
/lams_tool_chat/web/.../struts/tiles-defs.xml
- -15
- +16
/lams_tool_chat/web/WEB-INF/tags/AuthoringButton.tag
- History
- Source
- Diff
/lams_tool_chat/web/.../AuthoringButton.tag
- -0
- +0
/lams_tool_chat/web/common/empty.jsp
- History
- Source
/lams_tool_chat/web/common/empty.jsp
- -0
- +5
/lams_tool_chat/web/common/message.jsp
- History
- Source
/lams_tool_chat/web/common/message.jsp
- -8
- +6
/lams_tool_chat/web/pages/authoring/authoring.jsp
- History
- Source
- Diff
/lams_tool_chat/web/.../authoring.jsp
- -2
- +5
/lams_tool_chat/web/pages/monitoring/editActivity.jsp
- History
- Source
- Diff
/lams_tool_chat/web/.../editActivity.jsp

12:31 pm

asukkar

More
MAIN:asukkar:20060621043102
changed 1 file
MAIN

Updated define_later_url to point to correct location.

- -2
- +2
/lams_tool_chat/db/sql/tool_insert.sql
- History
- Source
- Diff
/lams_tool_chat/db/sql/tool_insert.sql

11:09 am

ozgurd

More
MAIN:ozgurd:20060621030911
changed 1 file
MAIN

Export portfolio learner and teacher

- -17
- +46
/lams_tool_lamc/web/export/ExportContent.jsp
- History
- Source
- Diff
/lams_tool_lamc/web/.../ExportContent.jsp

11:08 am

ozgurd

More
MAIN:ozgurd:20060621030850
changed 4 files
MAIN

export portfolio changes

- -0
- +2
/lams_tool_lamc/conf/language/ApplicationResources.properties
- History
- Source
- Diff
/lams_tool_lamc/.../ApplicationResources.properties
- -1
- +2
/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java
- History
- Source
- Diff
/lams_tool_lamc/src/.../McAppConstants.java
- -1
- +4
/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/ExportServlet.java
- History
- Source
- Diff
/lams_tool_lamc/src/.../ExportServlet.java
- -1
- +61
/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/MonitoringUtil.java
- History
- Source
- Diff
/lams_tool_lamc/src/.../MonitoringUtil.java

10:41 am

fyang

More
MAIN:fyang:20060621024100
changed 1 file
MAIN

hide lesson if no links available

- -2
- +4
/lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java
- History
- Source
- Diff
/lams_central/src/.../web/IndexAction.java

9:44 am

ozgurd

More
MAIN:ozgurd:20060621014454
changed 2 files
MAIN

LDEV 260 FIX, Export Portfolio teacher mode

- -0
- +11
/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/ExportServlet.java
- History
- Source
- Diff
/lams_tool_lamc/src/.../ExportServlet.java
- -28
- +144
/lams_tool_lamc/web/export/ExportContent.jsp
- History
- Source
- Diff
/lams_tool_lamc/web/.../ExportContent.jsp

9:44 am

fyang

More
MAIN:fyang:20060621014420
added 1 file
MAIN

sha1 passwords for shaun users

- binary
/lams_common/db/sql/shaun/sha1_shaun_user_password.sql
- History
- Source
/lams_common/db/.../sha1_shaun_user_password.sql

9:38 am

fyang

More
MAIN:fyang:20060621013846
changed 1 file
MAIN

switch autocomplete to off for password inputbox

- -1
- +1
/lams_central/web/loginContent.jsp
- History
- Source
- Diff
/lams_central/web/loginContent.jsp

8:55 am

ozgurd

More
MAIN:ozgurd:20060621005509
changed 5 files
MAIN

Fix for LDEV266, Summary page

- -2
- +2
/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java
- History
- Source
- Diff
/lams_tool_lamc/src/.../McUsrAttemptDAO.java
- -14
- +15
/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java
- History
- Source
- Diff
/lams_tool_lamc/src/.../McLearningAction.java
- -1
- +4
/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringStarterAction.java
- History
- Source
- Diff
/lams_tool_lamc/.../McMonitoringStarterAction.java
- -81
- +303
/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/MonitoringUtil.java
- History
- Source
- Diff
/lams_tool_lamc/src/.../MonitoringUtil.java
- -81
- +81
/lams_tool_lamc/web/monitoring/Summary.jsp
- History
- Source
- Diff
/lams_tool_lamc/web/.../Summary.jsp

8:54 am

ozgurd

More
MAIN:ozgurd:20060621005436
added 2 files
MAIN

Fix for LDEV266. Summary page

- -0
- +100
/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McSessionMarkDTO.java
- History
- Source
/lams_tool_lamc/src/.../mc/McSessionMarkDTO.java
- -0
- +128
/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUserMarkDTO.java
- History
- Source
/lams_tool_lamc/src/java/.../mc/McUserMarkDTO.java

7:19 am

mseaton

More
MAIN:mseaton:20060620231903
updated 1 file
MAIN

workspace fixes - saving in correct folders

- binary
/lams_central/web/lams_authoring.swf
- History
- Source
- Diff
/lams_central/web/lams_authoring.swf

7:16 am

psharma

More
MAIN:psharma:20060620231615
updated 2 files
MAIN

work in progress

- binary
/lams_central/src/flash/org/lamsfoundation/lams/authoring/tk/ToolkitController.as
- History
- Source
- Diff
/lams_central/src/.../tk/ToolkitController.as
- binary
/lams_central/src/flash/org/lamsfoundation/lams/authoring/tk/ToolkitView.as
- History
- Source
- Diff
/lams_central/src/flash/.../tk/ToolkitView.as

7:11 am

psharma

More
MAIN:psharma:20060620231153
updated 1 file
MAIN

code for template activity to show ... if tool bame is not fiting in properly

- binary
/lams_central/src/flash/org/lamsfoundation/lams/authoring/tk/TemplateActivity.as
- History
- Source
- Diff
/lams_central/src/.../tk/TemplateActivity.as

7:09 am

mseaton

More
MAIN:mseaton:20060620230901
changed 2 files
MAIN

added item for alert used in workspace (folder eval)

- -1
- +1
/lams_central/web/flashxml/authoring/en_AU_dictionary.xml
- History
- Source
- Diff
/lams_central/web/.../en_AU_dictionary.xml
- -1
- +1
/lams_central/web/flashxml/authoring/en_dictionary.xml
- History
- Source
- Diff
/lams_central/web/.../en_dictionary.xml

7:02 am

mseaton

More
MAIN:mseaton:20060620230233
updated 1 file
MAIN

can only save designs in valid content folders (not virtual folders)

- binary
/lams_common/src/flash/org/lamsfoundation/lams/common/ws/WorkspaceDialog.as
- History
- Source
- Diff
/lams_common/src/.../ws/WorkspaceDialog.as

4:01 pm

fmalikoff

More
MAIN:fmalikoff:20060620080107
updated 1 file
MAIN

Attempting to do a build with everyone's checked in code, so that Shaun will build okay.

- binary
/lams_build/lib/lams/lams.jar
- History
- Source
- Diff
/lams_build/lib/lams/lams.jar

3:23 pm

steven

More
MAIN:steven:20060620072348
changed 14 files
MAIN

Interface for import/export tool content web app.

- -1
- +21
/lams_central/conf/language/ApplicationResources.properties
- History
- Source
- Diff
/lams_central/.../ApplicationResources.properties
- -10
- +0
/lams_central/conf/xdoclet/servlet-mappings.xml
- History
- Source
- Diff
/lams_central/conf/.../servlet-mappings.xml
- -9
- +0
/lams_central/conf/xdoclet/servlets.xml
- History
- Source
- Diff
/lams_central/conf/xdoclet/servlets.xml
- -0
- +138
/lams_central/src/java/org/lamsfoundation/lams/authoring/web/ExportToolContentAction.java
- History
- Source
/lams_central/src/.../ExportToolContentAction.java
- -110
- +0
/lams_central/src/java/org/lamsfoundation/lams/authoring/web/ExportToolContentServlet.java
- History
- Source
- Diff
/lams_central/.../ExportToolContentServlet.java
- -0
- +172
/lams_central/src/java/org/lamsfoundation/lams/authoring/web/ImportToolContentAction.java
- History
- Source
/lams_central/src/.../ImportToolContentAction.java
- -147
- +0
/lams_central/src/java/org/lamsfoundation/lams/authoring/web/ImportToolContentServlet.java
- History
- Source
- Diff
/lams_central/.../ImportToolContentServlet.java
- -19
- +0
/lams_central/web/WEB-INF/web.xml
- History
- Source
- Diff
/lams_central/web/WEB-INF/web.xml
- -0
- +40
/lams_central/web/WEB-INF/struts/struts-config.xml
- History
- Source
- Diff
/lams_central/web/.../struts-config.xml
- -23
- +0
/lams_central/web/importToolContent/import.jsp
- History
- Source
- Diff
/lams_central/web/.../import.jsp
- -0
- +22
/lams_central/web/toolcontent/exportloading.jsp
- History
- Source
/lams_central/web/.../exportloading.jsp
- -0
- +46
/lams_central/web/toolcontent/exportresult.jsp
- History
- Source
/lams_central/web/toolcontent/exportresult.jsp
- -0
- +28
/lams_central/web/toolcontent/import.jsp
- History
- Source
/lams_central/web/toolcontent/import.jsp
- -0
- +54
/lams_central/web/toolcontent/importresult.jsp
- History
- Source
/lams_central/web/toolcontent/importresult.jsp

2:50 pm

mseaton

More
MAIN:mseaton:20060620065049
updated 1 file
MAIN

removed tools from monitor menu bar

- binary
/lams_common/src/flash/org/lamsfoundation/lams/common/ui/LFMenuBar.as
- History
- Source
- Diff
/lams_common/src/flash/.../ui/LFMenuBar.as

2:50 pm

mseaton

More
MAIN:mseaton:20060620065030
updated 3 files
MAIN

forced root folder open + alphabetical order of folder contents

- binary
/lams_common/src/flash/org/lamsfoundation/lams/common/ws/WorkspaceController.as
- History
- Source
- Diff
/lams_common/src/.../WorkspaceController.as
- binary
/lams_common/src/flash/org/lamsfoundation/lams/common/ws/WorkspaceDialog.as
- History
- Source
- Diff
/lams_common/src/.../ws/WorkspaceDialog.as
- binary
/lams_common/src/flash/org/lamsfoundation/lams/common/ws/WorkspaceModel.as
- History
- Source
- Diff
/lams_common/src/.../ws/WorkspaceModel.as

2:49 pm

mseaton

More
MAIN:mseaton:20060620064929
updated 1 file
MAIN

alphabetical order on folder contents of workspace

- binary
/lams_central/web/lams_authoring.swf
- History
- Source
- Diff
/lams_central/web/lams_authoring.swf

2:28 pm

steven

More
MAIN:steven:20060620062816
changed 1 file
MAIN

Add interface parameters for export/import tool content.

- -2
- +0
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
- History
- Source
- Diff
/lams_common/.../ExportToolContentService.java

lams

Line History

Stats

Commits this week: 0

Commit Activity

52 week commits volume

Commits by day

Commits by hour

Commit calendar

Most active committers (90 days)

fmalikoff

steven

mseaton

mseaton

mseaton

mseaton

asukkar

steven

asukkar

asukkar

asukkar

ozgurd

ozgurd

fyang

ozgurd

fyang

fyang

ozgurd

ozgurd

mseaton

psharma

psharma

mseaton

mseaton

fmalikoff

steven

mseaton

mseaton

mseaton

steven