lams / lams_common

src

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 0
Total Committers: 25
Last Commit:
Commits this week: 0
Total Lines of Code (LoC): 81,741
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 19 Oct 2007
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
    ./java/org/lamsfoundation/lams/commonContext.xml
    • -0
    • +53
    ./java/org/lamsfoundation/lams/usermanagement/dao/IOrganisationDAO.java
    • -0
    • +119
    ./java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationDAO.java
    • -1
    • +5
    ./java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java
    • -2
    • +16
    ./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
    • -5
    • +21
    ./java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java
    • -1
    • +2
    ./java/org/lamsfoundation/lams/tool/SystemTool.java
  3. … 2 more files in changeset.
3:21 pm

fmalikoff

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

Options
    • -1
    • +12
    ./java/org/lamsfoundation/lams/learningdesign/dto/BranchConditionDTO.java
    • -1
    • +12
    ./java/org/lamsfoundation/lams/tool/dto/ToolOutputDefinitionDTO.java
  3. … 2 more files in changeset.
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
    ./java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
    • -3
    • +21
    ./java/org/lamsfoundation/lams/learningdesign/service/IExportToolContentService.java
Tuesday 16 Oct 2007
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
    • -2
    • +28
    ./java/org/lamsfoundation/lams/learningdesign/Activity.java
    • -20
    • +15
    ./java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
  3. … 1 more file in changeset.
Monday 15 Oct 2007
3:55 pm

fmalikoff

LDEV-1347: Update the validation for branching

Options
    • -1
    • +57
    ./java/org/lamsfoundation/lams/learningdesign/BranchCondition.java
    • -6
    • +6
    ./java/org/lamsfoundation/lams/learningdesign/BranchingActivity.java
    • -1
    • +36
    ./java/org/lamsfoundation/lams/learningdesign/GroupBranchingActivity.java
    • -9
    • +11
    ./java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java
    • -1
    • +46
    ./java/org/lamsfoundation/lams/learningdesign/ToolBranchingActivity.java
    • -3
    • +15
    ./java/org/lamsfoundation/lams/learningdesign/dto/ValidationErrorDTO.java
  7. … 2 more files in changeset.
3:08 pm

jliew

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

Options
    • -2
    • +2
    ./java/org/lamsfoundation/lams/config/ConfigurationItem.java
    • -3
    • +3
    ./java/org/lamsfoundation/lams/config/dao/hibernate/ConfigurationDAO.java
    • -1
    • +5
    ./java/org/lamsfoundation/lams/util/Configuration.java
  4. … 10 more files in changeset.
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
    ./java/org/lamsfoundation/lams/learningdesign/BranchingActivity.java
    • -2
    • +18
    ./java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java
    • -345
    • +3
    ./java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java
    • -0
    • +398
    ./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
    ./java/org/lamsfoundation/lams/learningdesign/BranchActivityEntry.java
    • -3
    • +3
    ./java/org/lamsfoundation/lams/learningdesign/BranchCondition.java
    • -9
    • +13
    ./java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
    • -2
    • +18
    ./java/org/lamsfoundation/lams/learningdesign/dto/BranchConditionDTO.java
9:55 am

fmalikoff

LDEV-1347: Update the validation for branching

Options
    • -2
    • +4
    ./java/org/lamsfoundation/lams/learningdesign/dto/ValidationErrorDTO.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
    ./java/org/lamsfoundation/lams/learningdesign/Group.java
    • -2
    • +2
    ./java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java
    • -1
    • +24
    ./java/org/lamsfoundation/lams/lesson/dao/ILearnerProgressDAO.java
    • -2
    • +53
    ./java/org/lamsfoundation/lams/lesson/dao/hibernate/LearnerProgressDAO.java
    • -1
    • +15
    ./java/org/lamsfoundation/lams/lesson/service/ILessonService.java
    • -1
    • +20
    ./java/org/lamsfoundation/lams/lesson/service/LessonService.java
    • -1
    • +19
    ./java/org/lamsfoundation/lams/web/action/LamsDispatchAction.java
  8. … 1 more file 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
    ./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
    ./java/org/lamsfoundation/lams/federation/service/FederationService.java
    • -3
    • +10
    ./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
    ./java/org/lamsfoundation/lams/web/session/SessionManager.java
9:06 am

jliew

merging changes from ldap2_0_4 branch to HEAD

Options
    • -3
    • +3
    ./java/org/lamsfoundation/lams/usermanagement/ldapContext.xml
    • -0
    • +69
    ./java/org/lamsfoundation/lams/usermanagement/dto/BulkUpdateResultDTO.java
    • -4
    • +6
    ./java/org/lamsfoundation/lams/usermanagement/service/ILdapService.java
    • -1
    • +5
    ./java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java
    • -63
    • +210
    ./java/org/lamsfoundation/lams/usermanagement/service/LdapService.java
    • -2
    • +23
    ./java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
    • -1
    • +3
    ./java/org/lamsfoundation/lams/util/ConfigurationKeys.java
  8. … 7 more files in changeset.
8:17 am

jliew

fix problem with integration users getting rejected when LDAPEncryptPasswordFromBrowser is false; generate random password for ldap users instead of hard coded text

Options
    • -2
    • +4
    ./java/org/lamsfoundation/lams/usermanagement/service/LdapService.java
  2. … 1 more file in changeset.
Wednesday 03 Oct 2007
9:08 am

jliew

count users by using aggregate function count instead of getting all rows and counting the rows

Options
    • -2
    • +5
    ./java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java
    • -1
    • +22
    ./java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
  3. … 1 more file in changeset.
Monday 01 Oct 2007
9:13 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
    • -3
    • +66
    ./java/org/lamsfoundation/lams/config/ConfigurationItem.java
  2. … 4 more files in changeset.
Friday 28 Sep 2007
4:01 pm

jliew

improve speed of bulk update by running in separate thread (bypass hibernate filter); make sync page refresh every 5 seconds to prevent timeout (and also to detect when bulk update is finished)

Options
    • -1
    • +3
    ./java/org/lamsfoundation/lams/usermanagement/service/ILdapService.java
  2. … 2 more files in changeset.
9:35 am

jliew

file BulkUpdateResultDTO.java was initially added on branch ldap2_0_4.

Options
    • -0
    • +0
    ./java/org/lamsfoundation/lams/usermanagement/dto/BulkUpdateResultDTO.java
9:35 am

jliew

support multiple base DNs; support paged search results from ldap; remove bulk update method from spring's transactions; improve bulk update results report

Options
    • -3
    • +3
    ./java/org/lamsfoundation/lams/usermanagement/ldapContext.xml
    • -0
    • +69
    ./java/org/lamsfoundation/lams/usermanagement/dto/BulkUpdateResultDTO.java
    • -4
    • +4
    ./java/org/lamsfoundation/lams/usermanagement/service/ILdapService.java
    • -62
    • +207
    ./java/org/lamsfoundation/lams/usermanagement/service/LdapService.java
    • -1
    • +3
    ./java/org/lamsfoundation/lams/util/ConfigurationKeys.java
  6. … 8 more files in changeset.
Wednesday 26 Sep 2007
8:20 am

jliew

merge change from ldap2_0_4 branch back to HEAD

Options
    • -1
    • +7
    ./java/org/lamsfoundation/lams/usermanagement/service/LdapService.java
8:16 am

jliew

fix error when hibernate didn't initialise user.userOrgs for newly created user during bulk update

Options
    • -1
    • +7
    ./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
    • -8
    • +16
    ./java/org/lamsfoundation/lams/usermanagement/service/LdapService.java
  2. … 1 more file in changeset.
3:20 pm

jliew

fix bug when ldap user has no disabled attribute and LDAPDisabledAttr is prefixed with '!'.

Options
    • -8
    • +16
    ./java/org/lamsfoundation/lams/usermanagement/service/LdapService.java
10:03 am

jliew

merge changes from ldap2_0_4 branch back to HEAD

Options
    • -1
    • +39
    ./java/org/lamsfoundation/lams/usermanagement/service/ILdapService.java
    • -12
    • +54
    ./java/org/lamsfoundation/lams/usermanagement/service/LdapService.java
    • -3
    • +3
    ./java/org/lamsfoundation/lams/util/ConfigurationKeys.java
  4. … 4 more files in changeset.
9:38 am

jliew

add support for user enabled/disabled flag in ldap

Options
    • -1
    • +39
    ./java/org/lamsfoundation/lams/usermanagement/service/ILdapService.java
    • -12
    • +54
    ./java/org/lamsfoundation/lams/usermanagement/service/LdapService.java
    • -3
    • +3
    ./java/org/lamsfoundation/lams/util/ConfigurationKeys.java
  4. … 4 more files in changeset.
Monday 24 Sep 2007
3:58 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
    • -1
    • +19
    ./java/org/lamsfoundation/lams/lesson/dao/ILearnerProgressDAO.java
    • -2
    • +53
    ./java/org/lamsfoundation/lams/lesson/dao/hibernate/LearnerProgressDAO.java
    • -1
    • +17
    ./java/org/lamsfoundation/lams/lesson/service/ILessonService.java
    • -2
    • +22
    ./java/org/lamsfoundation/lams/lesson/service/LessonService.java
  5. … 5 more files in changeset.
Friday 21 Sep 2007
2:52 pm

fmalikoff

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

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

jliew

merge LangUtil into LanguageUtil

Options
    • -3
    • +3
    ./java/org/lamsfoundation/lams/integration/service/IntegrationService.java
    • -5
    • +5
    ./java/org/lamsfoundation/lams/usermanagement/service/LdapService.java
    • -103
    • +0
    ./java/org/lamsfoundation/lams/util/LangUtil.java
    • -2
    • +71
    ./java/org/lamsfoundation/lams/util/LanguageUtil.java
  5. … 5 more files in changeset.