lams-github

lams_common

Clone Tools

Stats

Commits this week: 1
Total Committers: 37
Last Commit:
Commits this week: 1

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 18 Oct 2007
3:24 pm

fmalikoff

LDEV-1135: Tweaking the output definition to suit the authoring client.

Options
    • -0
    • +11
    ./src/java/org/lamsfoundation/lams/learningdesign/dto/BranchConditionDTO.java
    • -0
    • +11
    ./src/java/org/lamsfoundation/lams/tool/dto/ToolOutputDefinitionDTO.java
  3. … 2 more files in changeset.
2:38 pm

erniegx <ernieg@gmail.com>

Moving msg.import.file.format label to lams-central. Updating English, Norwegian, Polish

Options
    • -9
    • +10
    ./conf/language/lams/ApplicationResources.properties
    • -9
    • +10
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +10
    ./conf/language/lams/ApplicationResources_no_NO.properties
    • -2
    • +10
    ./conf/language/lams/ApplicationResources_pl_PL.properties
2:22 pm

erniegx <ernieg@gmail.com>

LDEV-1371: Modify importLearningDesign method to:

* Import learning designs directly from the filesystem

* Detect whether the design is v1.0.2 or 2.x (moved now to the service instead of the action class)

* Modify the error reporting so now the service returns the errors in string lists

Options
    • -4
    • +92
    ./src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
    • -3
    • +21
    ./src/java/org/lamsfoundation/lams/learningdesign/service/IExportToolContentService.java
Tuesday 16 Oct 2007
2:11 pm

jliew

fix typo and add inserts for ldap configs. LDEV-1301, LDEV-1365

Options
    • -39
    • +38
    ./db/sql/updatescripts/alter_21_branching.sql
10:19 am

fmalikoff

LDEV-1348: Fixing the change to add the tool id to the condition - was only getting the id for branching and not for branches, and it was the branches that needed it!

Options
    • -1
    • +1
    ./conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml
    • -1
    • +27
    ./src/java/org/lamsfoundation/lams/learningdesign/Activity.java
    • -19
    • +14
    ./src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
8:46 am

fmalikoff

LDEV-1347: Update the validation for branching

Options
    • -1
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_en_AU.properties
Monday 15 Oct 2007
3:57 pm

fmalikoff

Should have been removed previously

Options
    • -41
    • +0
    ./conf/language/ApplicationResources_en_AU.properties
    • -41
    • +0
    ./conf/language/ApplicationResources_mi_NZ.properties
    • -41
    • +0
    ./conf/language/ApplicationResources_pt_BR.properties
3:57 pm

fmalikoff

LDEV-1347: Update the validation for branching

Options
    • -0
    • +7
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +7
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +56
    ./src/java/org/lamsfoundation/lams/learningdesign/BranchCondition.java
    • -5
    • +5
    ./src/java/org/lamsfoundation/lams/learningdesign/BranchingActivity.java
    • -0
    • +35
    ./src/java/org/lamsfoundation/lams/learningdesign/GroupBranchingActivity.java
    • -8
    • +10
    ./src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java
    • -0
    • +45
    ./src/java/org/lamsfoundation/lams/learningdesign/ToolBranchingActivity.java
    • -2
    • +14
    ./src/java/org/lamsfoundation/lams/learningdesign/dto/ValidationErrorDTO.java
3:08 pm

jliew

LDEV-1301 i18n configuration items, categorise items, add validation

Options
    • -71
    • +212
    ./db/sql/insert_lams_unix_config_data.sql
    • -71
    • +212
    ./db/sql/insert_lams_windows_config_data.sql
    • -34
    • +212
    ./db/sql/insert_rams_unix_config_data.sql
    • -34
    • +212
    ./db/sql/insert_rams_windows_config_data.sql
    • -46
    • +71
    ./db/sql/updatescripts/alter_21_branching.sql
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/config/ConfigurationItem.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/config/dao/hibernate/ConfigurationDAO.java
    • -0
    • +4
    ./src/java/org/lamsfoundation/lams/util/Configuration.java
  9. … 5 more files in changeset.
10:01 am

fmalikoff

LDEV-1348: Tweaking the db handling of branch activity mappings. If a user deletes and then readds an identical mapping for grouped based branching, we get a new entry created and the old entry deleted. Can't guarantee what order Hibernate will persist the changes to the db, so e can't have a unique key on group/sequence on the table.

Options
    • -7
    • +1
    ./db/model/lams_11.clay
    • -1
    • +0
    ./db/sql/create_lams_11_tables.sql
    • -1
    • +0
    ./db/sql/updatescripts/alter_21_branching.sql
9:59 am

fmalikoff

LDEV-1347: Update the validation for branching. Splitting the validation code off into a separate class, to make the LearningDesignService class easier to read.

Options
    • -0
    • +17
    ./src/java/org/lamsfoundation/lams/learningdesign/BranchingActivity.java
    • -1
    • +17
    ./src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java
    • -344
    • +2
    ./src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java
    • -0
    • +398
    ./src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignValidator.java
9:58 am

fmalikoff

LDEV-1348: Adding the tool id to the condition, so that conditions can be re-instated automatically in authoring if the user changes a branching activity from tool based to group/teacher chosen and back to tool based. On the server side, the data is redundant at present, so the id is added to the DTO only, and ignored in the extraction code.

Options
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/learningdesign/BranchActivityEntry.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/learningdesign/BranchCondition.java
    • -8
    • +12
    ./src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
    • -1
    • +17
    ./src/java/org/lamsfoundation/lams/learningdesign/dto/BranchConditionDTO.java
9:55 am

fmalikoff

LDEV-1347: Update the validation for branching

Options
    • -1
    • +3
    ./src/java/org/lamsfoundation/lams/learningdesign/dto/ValidationErrorDTO.java
Friday 12 Oct 2007
4:37 pm

erniegx <ernieg@gmail.com>

Updating German, Greek, Spanish, French

Options
    • -2
    • +4
    ./conf/language/lams/ApplicationResources_de_DE.properties
    • -28
    • +30
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -14
    • +16
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -6
    • +8
    ./conf/language/lams/ApplicationResources_fr_FR.properties
9:27 am

jliew

LDEV-1284: set run sequences folder's parent folder id, and append 'Run Sequences' to its name, clarified comments.

Options
    • -6
    • +24
    ./db/sql/updatescripts/Alter21Integration.java
Wednesday 10 Oct 2007
3:14 pm

fmalikoff

LDEV-1280: Implementing assign groups to branch in monitor screen (for define later). Required adding new functionality to branch related objects and a new call in lesson that allows monitoring to check if the branching activity has been attempted (we don't let the user remove groups or users from a branch once the branching activity has been commenced). Also moved the UTF-8 ajax fix to a common class in lams.jar so it can be used for all AJAX calls if desired.

Options
    • -0
    • +21
    ./src/java/org/lamsfoundation/lams/learningdesign/Group.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java
    • -0
    • +23
    ./src/java/org/lamsfoundation/lams/lesson/dao/ILearnerProgressDAO.java
    • -1
    • +52
    ./src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LearnerProgressDAO.java
    • -0
    • +14
    ./src/java/org/lamsfoundation/lams/lesson/service/ILessonService.java
    • -0
    • +19
    ./src/java/org/lamsfoundation/lams/lesson/service/LessonService.java
    • -0
    • +18
    ./src/java/org/lamsfoundation/lams/web/action/LamsDispatchAction.java
  8. … 1 more file in changeset.
3:12 pm

fmalikoff

LDEV-1280: Implementing assign groups to branch in monitor screen (for define later). Split the current branching activity into three - one for each type of branching. Also moved the UTF-8 ajax fix to a common class in lams.jar so it can be used for all AJAX calls if desired.

Options
    • -6
    • +6
    ./db/sql/insert_types_data.sql
  2. … 10 more files in changeset.
Tuesday 09 Oct 2007
1:27 pm

fmalikoff

LDEV-1280: Implementing define in monitor for group based branching. Adding define later to the possible contribution types for branching activities, so that it will appear in the list in monitor.

Options
    • -1
    • +5
    ./src/java/org/lamsfoundation/lams/learningdesign/strategy/BranchingActivityStrategy.java
Thursday 04 Oct 2007
11:19 am

fmalikoff

LDEV-26: Cleaned up some typos, removed old debugging.

Options
    • -11
    • +4
    ./src/java/org/lamsfoundation/lams/web/session/SessionManager.java
9:06 am

jliew

merging changes from ldap2_0_4 branch to HEAD

Options
    • -2
    • +3
    ./db/sql/insert_lams_unix_config_data.sql
    • -7
    • +8
    ./db/sql/insert_lams_windows_config_data.sql
    • -1
    • +2
    ./db/sql/updatescripts/alter_205_ldap.sql
    • -0
    • +69
    ./src/java/org/lamsfoundation/lams/usermanagement/dto/BulkUpdateResultDTO.java
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/usermanagement/ldapContext.xml
    • -3
    • +5
    ./src/java/org/lamsfoundation/lams/usermanagement/service/ILdapService.java
    • -0
    • +4
    ./src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java
    • -62
    • +209
    ./src/java/org/lamsfoundation/lams/usermanagement/service/LdapService.java
    • -1
    • +22
    ./src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
    • -0
    • +2
    ./src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java
  11. … 4 more files in changeset.
Monday 01 Oct 2007
9:16 am

fmalikoff

LDEV-1301: Added new fields to the configuration items, to support the I18N of descriptions and heading on the page, along with some basic validation.

Options
    • -7
    • +26
    ./conf/hibernate/mappings/org/lamsfoundation/lams/config/ConfigurationItem.hbm.xml
    • -2
    • +42
    ./db/model/lams_11.clay
    • -1
    • +7
    ./db/sql/create_lams_11_tables.sql
    • -1
    • +53
    ./db/sql/updatescripts/alter_21_branching.sql
    • -2
    • +65
    ./src/java/org/lamsfoundation/lams/config/ConfigurationItem.java
Friday 28 Sep 2007
3:18 pm

jliew

forgot to increment some ids

Options
    • -6
    • +6
    ./db/sql/shaun/all.sql
2:44 pm

jliew

adding ms_MY locale and malay/malay user

Options
    • -0
    • +2
    ./db/sql/insert_types_data.sql
    • -2
    • +26
    ./db/sql/shaun/all.sql
1:27 pm

erniegx <ernieg@gmail.com>

Updating Danish, English, Italian, Norwegian, Polish, Chinese(China)

Options
    • -11
    • +10
    ./conf/language/lams/ApplicationResources.properties
    • -13
    • +15
    ./conf/language/lams/ApplicationResources_da_DK.properties
    • -11
    • +9
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -7
    • +9
    ./conf/language/lams/ApplicationResources_it_IT.properties
    • -9
    • +11
    ./conf/language/lams/ApplicationResources_no_NO.properties
    • -7
    • +9
    ./conf/language/lams/ApplicationResources_pl_PL.properties
    • -2
    • +4
    ./conf/language/lams/ApplicationResources_zh_CN.properties
  8. … 7 more files in changeset.
Wednesday 26 Sep 2007
8:20 am

jliew

merge change from ldap2_0_4 branch back to HEAD

Options
    • -0
    • +6
    ./src/java/org/lamsfoundation/lams/usermanagement/service/LdapService.java
Tuesday 25 Sep 2007
3:26 pm

jliew

merge changes from ldap2_0_4 branch back to HEAD

Options
    • -7
    • +15
    ./src/java/org/lamsfoundation/lams/usermanagement/service/LdapService.java
  2. … 1 more file in changeset.
1:12 pm

jliew

LDEV-1284 change integration classes to courses (also creates workspace/folders)

Options
    • -0
    • +180
    ./db/sql/updatescripts/Alter21Integration.java
10:03 am

jliew

merge changes from ldap2_0_4 branch back to HEAD

Options
    • -0
    • +1
    ./db/sql/insert_lams_unix_config_data.sql
    • -0
    • +1
    ./db/sql/insert_lams_windows_config_data.sql
    • -0
    • +1
    ./db/sql/updatescripts/alter_205_ldap.sql
    • -0
    • +38
    ./src/java/org/lamsfoundation/lams/usermanagement/service/ILdapService.java
    • -11
    • +53
    ./src/java/org/lamsfoundation/lams/usermanagement/service/LdapService.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java
  7. … 1 more file in changeset.
Monday 24 Sep 2007
3:59 pm

fmalikoff

LDEV-1134: Fixed the View Branches screen for tool output based branching - I can't list the users based on groups as they aren't in groups (and I can't put them in groups as the groups have to be linked to the condition and if the user goes to the default branch there is no condition). So for tool output based branching I have to find the users via their progress records.

Options
    • -0
    • +43
    ./conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml
    • -0
    • +18
    ./src/java/org/lamsfoundation/lams/lesson/dao/ILearnerProgressDAO.java
    • -1
    • +52
    ./src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LearnerProgressDAO.java
    • -0
    • +16
    ./src/java/org/lamsfoundation/lams/lesson/service/ILessonService.java
    • -1
    • +21
    ./src/java/org/lamsfoundation/lams/lesson/service/LessonService.java
  6. … 4 more files in changeset.
Friday 21 Sep 2007
2:53 pm

fmalikoff

LDEV-1134: Complete implementation of conditions in MCQ and Forum.

Options
    • -223
    • +0
    ./src/java/org/lamsfoundation/lams/tool/OutputDefinitionFactory.java
    • -0
    • +234
    ./src/java/org/lamsfoundation/lams/tool/OutputFactory.java
  3. … 10 more files in changeset.