Activity lams/lams

LDEV-1352: Adding branching to IMSLD export. The branch activities are now exported, along with the branch mappings, conditions and groupings in a structured format. Still problems with ordering of the activities within a branch, there aren't any conditions to control the branches and the groups don't line up with IMS LD groups.

- -14
- +10
./src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
- History
- Source
- Diff
./src/java/.../ExportToolContentService.java
… 1 more file in changeset.

5:39 am

lfoxton

More
MAIN:lfoxton:20080416033901
changed 5 files
MAIN

[LDEV-273] Forgot password cahnges to make password searchable on username or email

- -1
- +10
./src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java
- History
- Source
- Diff
./src/java/.../IUserManagementService.java
- -2
- +7
./src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
- History
- Source
- Diff
./src/java/.../UserManagementService.java
… 3 more files in changeset.

5:39 am

fmalikoff

More
MAIN:fmalikoff:20080415033950
changed 1 file
MAIN

LDEV-273: Forgot password logic to allow lookup on email address only, so adding a new index for that field.

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

1:33 am

fmalikoff

More
MAIN:fmalikoff:20080414233310
changed 2 files
MAIN

LDEV-273: Forgot password logic to allow lookup on email address only, so adding a new index for that field.

- -0
- +1
./db/sql/create_lams_11_tables.sql
- History
- Source
- Diff
./db/sql/create_lams_11_tables.sql
- -0
- +3
./db/sql/updatescripts/alter_21_groupings_fckeditor.sql
- History
- Source
- Diff
./db/sql/.../alter_21_groupings_fckeditor.sql

8:34 am

fmalikoff

More
MAIN:fmalikoff:20080414063436
changed 16 files
MAIN

LDEV-1571: Sync gates to open for group based and teacher chosen branching. The "potential list of learners" is restricted to the group of learners associated with the group assigned to the branch.

- -0
- +12
./conf/hibernate/mappings/org/lamsfoundation/lams/lesson/Lesson.hbm.xml
- History
- Source
- Diff
./conf/hibernate/.../lesson/Lesson.hbm.xml
- -1
- +34
./src/java/org/lamsfoundation/lams/learningdesign/Activity.java
- History
- Source
- Diff
./src/java/.../learningdesign/Activity.java
- -1
- +11
./src/java/org/lamsfoundation/lams/lesson/dao/ILessonDAO.java
- History
- Source
- Diff
./src/java/org/.../lesson/dao/ILessonDAO.java
- -1
- +23
./src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LessonDAO.java
- History
- Source
- Diff
./src/java/org/.../hibernate/LessonDAO.java
- -1
- +4
./src/java/org/lamsfoundation/lams/lesson/service/ILessonService.java
- History
- Source
- Diff
./src/java/org/.../service/ILessonService.java
- -1
- +9
./src/java/org/lamsfoundation/lams/lesson/service/LessonService.java
- History
- Source
- Diff
./src/java/org/.../service/LessonService.java
… 10 more files in changeset.

3:03 am

Ernie Ghiglione

More
MAIN:ernieg:20080411010345
changed 79 files
MAIN

LDEV-1565: Fixes problem with {0} and single quotes

- -1
- +1
./conf/language/lams/ApplicationResources.properties
- History
- Source
- Diff
./conf/.../ApplicationResources.properties
- -1
- +1
./conf/language/lams/ApplicationResources_en_AU.properties
- History
- Source
- Diff
./conf/.../ApplicationResources_en_AU.properties
… 77 more files in changeset.

2:46 am

Ernie Ghiglione

More
MAIN:ernieg:20080411004651
changed 28 files
MAIN

LDEV-1565: Fixes problem with {0} and single quotes

- -2
- +2
./conf/language/lams/ApplicationResources_el_GR.properties
- History
- Source
- Diff
./conf/.../ApplicationResources_el_GR.properties
- -1
- +1
./conf/language/lams/ApplicationResources_es_ES.properties
- History
- Source
- Diff
./conf/.../ApplicationResources_es_ES.properties
- -1
- +1
./conf/language/lams/ApplicationResources_ja_JP.properties
- History
- Source
- Diff
./conf/.../ApplicationResources_ja_JP.properties
- -1
- +1
./conf/language/lams/ApplicationResources_no_NO.properties
- History
- Source
- Diff
./conf/.../ApplicationResources_no_NO.properties
- -1
- +1
./conf/language/lams/ApplicationResources_pl_PL.properties
- History
- Source
- Diff
./conf/.../ApplicationResources_pl_PL.properties
… 23 more files in changeset.

2:25 am

lfoxton

More
MAIN:lfoxton:20080411002516
changed 12 files
MAIN

LDEV-273 Password Reset

All the code for the forgot your login stuff, still needs validation and some comsmetics to be finished

- -0
- +93
./conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/ForgotPasswordRequest.hbm.xml
- History
- Source
./conf/hibernate/.../ForgotPasswordRequest.hbm.xml
- -0
- +1
./src/java/org/lamsfoundation/lams/commonContext.xml
- History
- Source
- Diff
./src/java/org/.../lams/commonContext.xml
- -0
- +72
./src/java/org/lamsfoundation/lams/usermanagement/ForgotPasswordRequest.java
- History
- Source
./src/java/.../ForgotPasswordRequest.java
- -1
- +10
./src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java
- History
- Source
- Diff
./src/java/.../IUserManagementService.java
- -2
- +8
./src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
- History
- Source
- Diff
./src/java/.../UserManagementService.java
… 7 more files in changeset.

8:37 am

mseaton

More
MAIN:mseaton:20080410063722
changed 12 files
MAIN

LDEV-1598 Added four new configuration items for setting screen sizes of authoring, monitor, learner and system admin.

- -0
- +12
./db/sql/insert_lams_unix_config_data.sql
- History
- Source
- Diff
./db/sql/insert_lams_unix_config_data.sql
- -1
- +13
./db/sql/insert_lams_windows_config_data.sql
- History
- Source
- Diff
./db/.../insert_lams_windows_config_data.sql
- -1
- +13
./db/sql/insert_rams_unix_config_data.sql
- History
- Source
- Diff
./db/sql/insert_rams_unix_config_data.sql
- -1
- +13
./db/sql/insert_rams_windows_config_data.sql
- History
- Source
- Diff
./db/.../insert_rams_windows_config_data.sql
- -0
- +12
./db/sql/updatescripts/alter_21_branching.sql
- History
- Source
- Diff
./db/sql/.../alter_21_branching.sql
- -1
- +7
./src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java
- History
- Source
- Diff
./src/java/org/.../util/ConfigurationKeys.java
… 6 more files in changeset.

2:50 am

fmalikoff

More
MAIN:fmalikoff:20080410005003
changed 1 file
MAIN

LDEV-1622: Fixed the group creation so that if the existing group names do not start at 1 then the logic to create the groups will still cope - it was failing when it was trying to create a group with a name that already existed.

- -5
- +10
./src/java/org/lamsfoundation/lams/learningdesign/RandomGrouper.java
- History
- Source
- Diff
./src/java/.../RandomGrouper.java

5:14 am

fmalikoff

More
MAIN:fmalikoff:20080409031439
changed 1 file
MAIN

Fixing a Hibernate xdoclet statement to match to the hbm.xml file.

- -2
- +2
./src/java/org/lamsfoundation/lams/learningdesign/Group.java
- History
- Source
- Diff
./src/java/org/.../learningdesign/Group.java

6:44 am

fmalikoff

More
MAIN:fmalikoff:20080408044426
changed 2 files
MAIN

LDEV-1612: Final code tweaks to get the learner part working.

- -2
- +9
./src/java/org/lamsfoundation/lams/tool/OutputFactory.java
- History
- Source
- Diff
./src/java/org/.../tool/OutputFactory.java
… 1 more file in changeset.

5:21 am

fmalikoff

More
MAIN:fmalikoff:20080408032127
changed 2 files
MAIN

LDEV-1612: Tweaking the condition names for OUTPUT_SET_BOOLEAN type definitions, so that Flash can match existing conditions back to their definitions.

- -1
- +23
./src/java/org/lamsfoundation/lams/tool/OutputFactory.java
- History
- Source
- Diff
./src/java/org/.../tool/OutputFactory.java
… 1 more file in changeset.

3:02 am

fmalikoff

More
MAIN:fmalikoff:20080408010231
changed 2 files
MAIN

LDEV-1612: Added new output type for custom tool outputs ie tool outputs with a set of boolean conditions, normally constructed by the user in authoring page for the tool.

- -1
- +14
./src/java/org/lamsfoundation/lams/tool/OutputFactory.java
- History
- Source
- Diff
./src/java/org/.../tool/OutputFactory.java
- -3
- +5
./src/java/org/lamsfoundation/lams/tool/OutputType.java
- History
- Source
- Diff
./src/java/org/.../lams/tool/OutputType.java

2:59 am

fmalikoff

More
MAIN:fmalikoff:20080407005929
changed 3 files
MAIN

LDEV-1594: Made the I18N code more generic so that tool's could get any arbitrary value (rather than having to access their message source directly). This was useful for the open vote option in voting, and may also be useful for custom conditions.