Activity lams-github/

4:23 pm

fmalikoff

More
71afc64
changed 4 files
v4.7, v4.8

Fixing the date format used when scheduling a lesson. Previously it was interpreted based on the system locale and that may not match the format sent by Flash.

- binary
/lams_build/lib/lams/lams.jar
- History
- Source
- Diff
/lams_build/lib/lams/lams.jar
- -4
- +21
/lams_common/src/java/org/lamsfoundation/lams/util/DateUtil.java
- History
- Source
- Diff
/lams_common/src/java/.../util/DateUtil.java
- -4
- +26
/lams_common/test/java/org/lamsfoundation/lams/util/TestDateUtil.java
- History
- Source
- Diff
/lams_common/test/.../util/TestDateUtil.java
- -3
- +5
/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
- History
- Source
- Diff
/lams_monitoring/.../MonitoringAction.java

3:35 pm

asukkar

More
7f3d6ad
changed 18 files
v4.7, v4.8

Updated Authoring pages to new format. See LDEV-576 for details.

Shared fckeditor removed from all pages. Only a single fckeditor is used for tool instructions.

Tab tags and js code updated to remove obsolete comments and code.

- -0
- +1
/lams_tool_chat/web/WEB-INF/fckeditor/tlds/FCKeditor.tld
- History
- Source
- Diff
/lams_tool_chat/web/.../tlds/FCKeditor.tld
- -6
- +2
/lams_tool_chat/web/WEB-INF/lams.tld
- History
- Source
- Diff
/lams_tool_chat/web/WEB-INF/lams.tld
- -2
- +3
/lams_tool_chat/web/WEB-INF/tags/AuthoringButton.tag
- History
- Source
- Diff
/lams_tool_chat/web/.../AuthoringButton.tag
- -0
- +57
/lams_tool_chat/web/WEB-INF/tags/FCKEditor.tag
- History
- Source
/lams_tool_chat/web/WEB-INF/tags/FCKEditor.tag
- -72
- +0
/lams_tool_chat/web/WEB-INF/tags/HTMLEditor.tag
- History
- Source
- Diff
/lams_tool_chat/web/.../tags/HTMLEditor.tag
- -96
- +0
/lams_tool_chat/web/WEB-INF/tags/SetEditor.tag
- History
- Source
- Diff
/lams_tool_chat/web/.../tags/SetEditor.tag
- -58
- +39
/lams_tool_chat/web/WEB-INF/tags/Tab.tag
- History
- Source
- Diff
/lams_tool_chat/web/WEB-INF/tags/Tab.tag
- -30
- +30
/lams_tool_chat/web/WEB-INF/tags/TabBody.tag
- History
- Source
- Diff
/lams_tool_chat/web/.../tags/TabBody.tag
- -30
- +32
/lams_tool_chat/web/WEB-INF/tags/Tabs.tag
- History
- Source
- Diff
/lams_tool_chat/web/WEB-INF/tags/Tabs.tag
- -0
- +29
/lams_tool_chat/web/includes/javascript/authoring.js
- History
- Source
/lams_tool_chat/web/.../javascript/authoring.js
- -2
- +2
/lams_tool_chat/web/layouts/defaultLayout.jsp
- History
- Source
- Diff
/lams_tool_chat/web/.../defaultLayout.jsp
- -2
- +2
/lams_tool_chat/web/layouts/learningLayout.jsp
- History
- Source
- Diff
/lams_tool_chat/web/.../learningLayout.jsp
- -2
- +2
/lams_tool_chat/web/layouts/tabLayout.jsp
- History
- Source
- Diff
/lams_tool_chat/web/layouts/tabLayout.jsp
- -10
- +17
/lams_tool_chat/web/pages/authoring/advanced.jsp
- History
- Source
- Diff
/lams_tool_chat/web/.../advanced.jsp
- -6
- +4
/lams_tool_chat/web/pages/authoring/authoring.jsp
- History
- Source
- Diff
/lams_tool_chat/web/.../authoring.jsp
… 3 more files in changeset.

3:31 pm

jliew

More
8e72a9a
changed 4 files
v4.7, v4.8

when adding existing user to a subgroup, user is automatically added to group with same roles.

- -0
- +9
/lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserBean.java
- History
- Source
- Diff
/lams_admin/src/java/.../web/UserBean.java
- -2
- +17
/lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserOrgRoleAction.java
- History
- Source
- Diff
/lams_admin/src/.../UserOrgRoleAction.java
- -11
- +27
/lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserOrgRoleSaveAction.java
- History
- Source
- Diff
/lams_admin/.../UserOrgRoleSaveAction.java
- -5
- +7
/lams_admin/web/userorgrole.jsp
- History
- Source
- Diff
/lams_admin/web/userorgrole.jsp

3:30 pm

jliew

More
947304d
changed 1 file
v4.7, v4.8

assorted new messages/labels

- -1
- +6
/lams_admin/conf/language/ApplicationResources.properties
- History
- Source
- Diff
/lams_admin/.../ApplicationResources.properties

3:28 pm

jliew

More
a2ab3b8
updated 1 file
v4.7, v4.8

2 new UserManagementService methods

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

3:26 pm

jliew

More
f8455d4
changed 2 files
v4.7, v4.8

add new methods disableUser and userHasData; added check to removeUser

- -1
- +14
/lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java
- History
- Source
- Diff
/lams_common/.../IUserManagementService.java
- -3
- +54
/lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
- History
- Source
- Diff
/lams_common/.../UserManagementService.java

3:26 pm

asukkar

More
5d88857
changed 1 file
v4.7, v4.8

Added contentFolderID parameter.

- -0
- +10
/lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/forms/AuthoringForm.java
- History
- Source
- Diff
/lams_tool_chat/src/.../AuthoringForm.java

3:26 pm

asukkar

More
8d9e4c3
changed 1 file
v4.7, v4.8

Added contentFolderID parameter.

Simplified SessionMap code.

- -16
- +21
/lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/AuthoringAction.java
- History
- Source
- Diff
/lams_tool_chat/src/.../AuthoringAction.java

3:21 pm

asukkar

More
a9f1632
changed 1 file
v4.7, v4.8

Added constant PARAM_CONTENT_FOLDER_ID

- -0
- +1
/lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java
- History
- Source
- Diff
/lams_common/src/.../util/AttributeNames.java

3:16 pm

asukkar

More
d7f1b59
changed 1 file
v4.7, v4.8

Added 'contentFolderID' to the reedit url.

- -0
- +8
/lams_central/src/java/org/lamsfoundation/lams/authoring/web/LamsAuthoringFinishAction.java
- History
- Source
- Diff
/lams_central/.../LamsAuthoringFinishAction.java

3:14 pm

steven

More
640b7ef
changed 1 file
v4.7, v4.8

run offline for reflection.

- -1
- +1
/lams_tool_forum/conf/language/ApplicationResources.properties
- History
- Source
- Diff
/lams_tool_forum/.../ApplicationResources.properties

2:50 pm

steven

More
4177488
changed 2 files
v4.7, v4.8

run offline for reflection.

- -10
- +9
/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java
- History
- Source
- Diff
/lams_tool_forum/src/.../LearningAction.java
- -4
- +17
/lams_tool_forum/web/jsps/learning/runoffline.jsp
- History
- Source
- Diff
/lams_tool_forum/web/.../runoffline.jsp

2:37 pm

steven

More
77e263b
changed 25 files
v4.7, v4.8

Refection done.

- -0
- +16
/lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Forum.hbm.xml
- History
- Source
- Diff
/lams_tool_forum/conf/.../Forum.hbm.xml
- -1
- +9
/lams_tool_forum/conf/language/ApplicationResources.properties
- History
- Source
- Diff
/lams_tool_forum/.../ApplicationResources.properties
- -4
- +29
/lams_tool_forum/conf/xdoclet/struts-actions.xml
- History
- Source
- Diff
/lams_tool_forum/conf/.../struts-actions.xml
- -1
- +3
/lams_tool_forum/db/sql/create_lams_tool_forum.sql
- History
- Source
- Diff
/lams_tool_forum/.../create_lams_tool_forum.sql
- -1
- +1
/lams_tool_forum/db/sql/table-schema.sql
- History
- Source
- Diff
/lams_tool_forum/db/sql/table-schema.sql
- -0
- +77
/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dto/UserDTO.java
- History
- Source
/lams_tool_forum/src/java/.../dto/UserDTO.java
- -0
- +1
/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml
- History
- Source
- Diff
/lams_tool_forum/.../forumApplicationContext.xml
- -0
- +16
/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.hbm.xml
- History
- Source
- Diff
/lams_tool_forum/src/.../Forum.hbm.xml
- -0
- +23
/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.java
- History
- Source
- Diff
/lams_tool_forum/src/.../Forum.java
- -3
- +23
/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java
- History
- Source
- Diff
/lams_tool_forum/src/.../ForumService.java
- -1
- +13
/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java
- History
- Source
- Diff
/lams_tool_forum/src/.../IForumService.java
- -0
- +3
/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java
- History
- Source
- Diff
/lams_tool_forum/src/.../ForumConstants.java
- -1
- +2
/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java
- History
- Source
- Diff
/lams_tool_forum/src/.../AuthoringAction.java
- -25
- +113
/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java
- History
- Source
- Diff
/lams_tool_forum/src/.../LearningAction.java
- -37
- +83
/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java
- History
- Source
- Diff
/lams_tool_forum/.../MonitoringAction.java
… 10 more files in changeset.

1:25 pm

mseaton

More
4c885f9
changed 16 files
v4.7, v4.8

updated role type STAFF to MONITOR

- binary
/lams_build/lib/lams/lams.jar
- History
- Source
- Diff
/lams_build/lib/lams/lams.jar
- -3
- +3
/lams_central/src/flash/org/lamsfoundation/lams/monitoring/LessonManagerDialog.as
- History
- Source
- Diff
/lams_central/src/.../LessonManagerDialog.as
- -8
- +8
/lams_central/src/flash/org/lamsfoundation/lams/monitoring/Organisation.as
- History
- Source
- Diff
/lams_central/src/.../Organisation.as
- -5
- +5
/lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as
- History
- Source
- Diff
/lams_central/src/.../mv/MonitorModel.as
- -2
- +2
/lams_central/src/flash/org/lamsfoundation/lams/wizard/Wizard.as
- History
- Source
- Diff
/lams_central/src/flash/.../wizard/Wizard.as
- -6
- +6
/lams_central/src/flash/org/lamsfoundation/lams/wizard/WizardModel.as
- History
- Source
- Diff
/lams_central/src/.../wizard/WizardModel.as
- -1
- +1
/lams_central/src/flash/org/lamsfoundation/lams/wizard/WizardView.as
- History
- Source
- Diff
/lams_central/src/.../wizard/WizardView.as
- -1
- +1
/lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java
- History
- Source
- Diff
/lams_central/src/.../web/HomeAction.java
- -4
- +4
/lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java
- History
- Source
- Diff
/lams_central/src/.../web/IndexAction.java
- -1
- +1
/lams_common/db/sql/insert_types_data.sql
- History
- Source
- Diff
/lams_common/db/sql/insert_types_data.sql
- -4
- +4
/lams_common/src/java/org/lamsfoundation/lams/usermanagement/Role.java
- History
- Source
- Diff
/lams_common/src/.../usermanagement/Role.java
- -1
- +1
/lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
- History
- Source
- Diff
/lams_common/.../UserManagementService.java
- binary
/lams_monitoring/web/lams_monitoring.swf
- History
- Source
- Diff
/lams_monitoring/web/lams_monitoring.swf
- binary
/lams_monitoring/web/lams_monitoring_library.swf
- History
- Source
- Diff
/lams_monitoring/.../lams_monitoring_library.swf
- binary
/lams_monitoring/web/lams_wizard.swf
- History
- Source
- Diff
/lams_monitoring/web/lams_wizard.swf
- binary
/lams_monitoring/web/lams_wizard_library.swf
- History
- Source
- Diff
/lams_monitoring/.../lams_wizard_library.swf

12:50 pm

fmalikoff

More
368380f
changed 1 file
v4.7, v4.8

Changing the order id values for complex activities to start at 1, not 0

- -1
- +1
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LD102Importer.java
- History
- Source
- Diff
/lams_common/src/.../LD102Importer.java

10:46 am

mseaton

More
84bc267
changed 1 file
v4.7, v4.8

modified fckeditor toolbar (default)

- -10
- +2
/lams_central/web/includes/javascript/fckconfig_custom.js
- History
- Source
- Diff
/lams_central/web/.../fckconfig_custom.js

10:09 am

mseaton

More
bf4cc69
changed 2 files
v4.7, v4.8

fixed parallel activity inside optional activity issue (650)

- binary
/lams_build/lib/lams/lams.jar
- History
- Source
- Diff
/lams_build/lib/lams/lams.jar
- -1
- +2
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/ComplexActivity.java
- History
- Source
- Diff
/lams_common/src/.../ComplexActivity.java

12:41 am

ozgurd

More
16612ff
changed 1 file
v4.7, v4.8

Fix for LDEV-603 Add button in Authoring a bit too much to the right

- -51
- +58
/lams_tool_vote/web/authoring/BasicContent.jsp
- History
- Source
- Diff
/lams_tool_vote/web/.../BasicContent.jsp

9:34 pm

ozgurd

More
d2de78c
changed 1 file
v4.7, v4.8

updated properties.

- -2
- +4
/lams_tool_laqa/conf/language/ApplicationResources.properties
- History
- Source
- Diff
/lams_tool_laqa/.../ApplicationResources.properties

9:30 pm

ozgurd

More
1e2a836
changed 2 files
v4.7, v4.8

Fix for LDEV-566:Add "Re-do questions" button

- -4
- +4
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java
- History
- Source
- Diff
/lams_tool_laqa/src/.../QaServicePOJO.java
- -4
- +30
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java
- History
- Source
- Diff
/lams_tool_laqa/src/.../QaLearningAction.java

4:39 pm

fmalikoff

More
c5b735b
changed 1 file
v4.7, v4.8

Changed the columns in lams_wkspc_wkspc_folder to allow nulls. When hibernate is removing the related workspace objects, it seems determined to set these fields to null before deleting.

- -5
- +5
/lams_common/db/model/lams_11.clay
- History
- Source
- Diff
/lams_common/db/model/lams_11.clay

4:28 pm

fmalikoff

More
4982dee
changed 1 file
v4.7, v4.8

Moved remove user business logic to the service.

- -19
- +2
/lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java
- History
- Source
- Diff
/lams_admin/src/java/.../web/UserAction.java

4:27 pm

fmalikoff

More
556039a
changed 1 file
v4.7, v4.8

Changed the columns in lams_wkspc_wkspc_folder to allow nulls. When hibernate is removing the related workspace objects, it seems determined to set these fields to null before deleting.