lams

lams_common

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 0
Total Committers: 27
Last Commit:
Commits this week: 0
Total Lines of Code (LoC): 98,785
Net change in LoC this week: 0

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
Friday 02 Nov 2007
9:22 am

jliew

merge latest changes from ldap2_0_4 branch (dated 26/10/07)

Options
    • -1
    • +8
    ./src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java
    • -27
    • +29
    ./src/java/org/lamsfoundation/lams/usermanagement/service/LdapService.java
    • -1
    • +14
    ./src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
  4. … 2 more files in changeset.
Thursday 01 Nov 2007
1:41 pm

Ernie Ghiglione

Updating Maori

Options
    • -7
    • +17
    ./conf/language/lams/ApplicationResources_mi_NZ.properties
Friday 26 Oct 2007
1:38 pm

jliew

fix for ConcurrentModificationException while Iterating over a Set; stop printing password in logs; make reading of roles mapping values more flexible

Options
    • -1
    • +8
    ./src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java
    • -27
    • +29
    ./src/java/org/lamsfoundation/lams/usermanagement/service/LdapService.java
    • -1
    • +14
    ./src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
  4. … 2 more files in changeset.
Thursday 25 Oct 2007
3:19 pm

jliew

LDEV-1251, LDEV-1064. Refactored the way lessons are retrieved for the index page (fixed LDEV-1064); added interface 1.2 (jquery extension), allowing sorting of lessons via drag and drop (LDEV-1251); added ordered_lesson_ids column to lams_organisation (LDEV-1251).

Options
    • -0
    • +9
    ./conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml
    • -648
    • +654
    ./db/model/lams_11.clay
    • -0
    • +6
    ./db/sql/create_lams_11_tables.sql
    • -0
    • +3
    ./db/sql/updatescripts/alter_21_branching.sql
    • -2
    • +18
    ./src/java/org/lamsfoundation/lams/usermanagement/Organisation.java
  6. … 9 more files in changeset.
Wednesday 24 Oct 2007
11:53 am

jliew

LDEV-1301 only called updateItem previously, now calls persist method as well in order to save to database

Options
    • -9
    • +6
    ./src/java/org/lamsfoundation/lams/util/Configuration.java
  2. … 1 more file in changeset.
Monday 22 Oct 2007
12:12 pm

jliew

remove LamsHome and FileManagerDir from lams_configuration (wasn't removed during previous updates)

Options
    • -0
    • +4
    ./db/sql/updatescripts/alter_21_branching.sql
Friday 19 Oct 2007
2:51 pm

fmalikoff

LDEV-1374: Moving the fix to encode filename (done for LDEV-1243) into FileUtil in lams.jar, so that it can be using to encode the filenames of files coming from the content repository.

Options
    • -0
    • +37
    ./src/java/org/lamsfoundation/lams/util/FileUtil.java
  2. … 1 more file in changeset.
10:32 am

jliew

LDEV-1250, LDEV-1252, LDEV-1253: adding jquery 1.2.1, refactor index action into new DisplayGroupAction which can be called to display a jsp containing only the group specified

Options
    • -0
    • +5
    ./src/java/org/lamsfoundation/lams/commonContext.xml
    • -0
    • +53
    ./src/java/org/lamsfoundation/lams/usermanagement/dao/IOrganisationDAO.java
    • -0
    • +119
    ./src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationDAO.java
    • -1
    • +5
    ./src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java
    • -2
    • +16
    ./src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
  6. … 10 more files in changeset.
Thursday 18 Oct 2007
3:26 pm

fmalikoff

LDEV-1375: Adding a page for sequence activities for class export portfolio. This requires setting it up as a system tool so that we have a url for the export portfolio.

Options
    • -0
    • +5
    ./conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml
    • -1
    • +10
    ./db/sql/insert_types_data.sql
    • -5
    • +21
    ./src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/tool/SystemTool.java
3:21 pm

fmalikoff

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

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

Ernie Ghiglione

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

Ernie Ghiglione

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
    • -2
    • +28
    ./src/java/org/lamsfoundation/lams/learningdesign/Activity.java
    • -20
    • +15
    ./src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
8:46 am

fmalikoff

LDEV-1347: Update the validation for branching

Options
    • -2
    • +2
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +2
    ./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:55 pm

fmalikoff

LDEV-1347: Update the validation for branching

Options
    • -1
    • +8
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +8
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +57
    ./src/java/org/lamsfoundation/lams/learningdesign/BranchCondition.java
    • -6
    • +6
    ./src/java/org/lamsfoundation/lams/learningdesign/BranchingActivity.java
    • -1
    • +36
    ./src/java/org/lamsfoundation/lams/learningdesign/GroupBranchingActivity.java
    • -9
    • +11
    ./src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java
    • -1
    • +46
    ./src/java/org/lamsfoundation/lams/learningdesign/ToolBranchingActivity.java
    • -3
    • +15
    ./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
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/config/ConfigurationItem.java
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/config/dao/hibernate/ConfigurationDAO.java
    • -1
    • +5
    ./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
    • -1
    • +18
    ./src/java/org/lamsfoundation/lams/learningdesign/BranchingActivity.java
    • -2
    • +18
    ./src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java
    • -345
    • +3
    ./src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java
    • -0
    • +398
    ./src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignValidator.java
9:57 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
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/learningdesign/BranchActivityEntry.java
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/learningdesign/BranchCondition.java
    • -9
    • +13
    ./src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
    • -2
    • +18
    ./src/java/org/lamsfoundation/lams/learningdesign/dto/BranchConditionDTO.java
9:55 am

fmalikoff

LDEV-1347: Update the validation for branching

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

Ernie Ghiglione

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
    • -7
    • +25
    ./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
    • -1
    • +22
    ./src/java/org/lamsfoundation/lams/learningdesign/Group.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java
    • -1
    • +24
    ./src/java/org/lamsfoundation/lams/lesson/dao/ILearnerProgressDAO.java
    • -2
    • +53
    ./src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LearnerProgressDAO.java
    • -1
    • +15
    ./src/java/org/lamsfoundation/lams/lesson/service/ILessonService.java
    • -1
    • +20
    ./src/java/org/lamsfoundation/lams/lesson/service/LessonService.java
    • -1
    • +19
    ./src/java/org/lamsfoundation/lams/web/action/LamsDispatchAction.java
  8. … 1 more file in changeset.
3:11 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
    • -7
    • +7
    ./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
    • -2
    • +6
    ./src/java/org/lamsfoundation/lams/learningdesign/strategy/BranchingActivityStrategy.java
10:03 am

jliew

handle exceptions at the end of the call stack so that errors can be shown to the user

Options
    • -69
    • +52
    ./src/java/org/lamsfoundation/lams/federation/service/FederationService.java
    • -3
    • +10
    ./src/java/org/lamsfoundation/lams/federation/service/IFederationService.java
  3. … 1 more file in changeset.
Thursday 04 Oct 2007
11:19 am

fmalikoff

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

Options
    • -13
    • +6
    ./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
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/usermanagement/ldapContext.xml
    • -0
    • +69
    ./src/java/org/lamsfoundation/lams/usermanagement/dto/BulkUpdateResultDTO.java
    • -4
    • +6
    ./src/java/org/lamsfoundation/lams/usermanagement/service/ILdapService.java
    • -1
    • +5
    ./src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java
    • -63
    • +210
    ./src/java/org/lamsfoundation/lams/usermanagement/service/LdapService.java
    • -2
    • +23
    ./src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
    • -1
    • +3
    ./src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java
  11. … 4 more files in changeset.