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
Tuesday 17 Jul 2007
9:33 am

fmalikoff

LDEV-1134: Branching: View screen for the class export portfolio. Required refactoring of classes and moving the system tool link to move to an interface.

Options
    • -2
    • +2
    ./java/org/lamsfoundation/lams/learningdesign/Activity.java
    • -5
    • +27
    ./java/org/lamsfoundation/lams/learningdesign/BranchingActivity.java
    • -4
    • +9
    ./java/org/lamsfoundation/lams/learningdesign/ChosenBranchingActivity.java
    • -4
    • +21
    ./java/org/lamsfoundation/lams/learningdesign/GateActivity.java
    • -4
    • +8
    ./java/org/lamsfoundation/lams/learningdesign/GroupBranchingActivity.java
    • -4
    • +22
    ./java/org/lamsfoundation/lams/learningdesign/GroupingActivity.java
    • -0
    • +45
    ./java/org/lamsfoundation/lams/learningdesign/ISystemToolActivity.java
    • -8
    • +20
    ./java/org/lamsfoundation/lams/learningdesign/LearningDesignProcessor.java
    • -2
    • +3
    ./java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java
    • -128
    • +0
    ./java/org/lamsfoundation/lams/learningdesign/SystemToolActivity.java
    • -3
    • +7
    ./java/org/lamsfoundation/lams/learningdesign/ToolBranchingActivity.java
    • -17
    • +8
    ./java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
    • -16
    • +14
    ./java/org/lamsfoundation/lams/learningdesign/strategy/SequenceActivityStrategy.java
    • -2
    • +4
    ./java/org/lamsfoundation/lams/tool/SystemTool.java
  15. … 6 more files in changeset.
Thursday 12 Jul 2007
2:24 pm

jliew

fix getFedServerByURLHost to enclose search parameter with '%'

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/federation/service/FederationService.java
10:53 am

jliew

changing shib authentication to 'on/off' rather than try to have db/shib authentication happening at the same time

Options
    • -0
    • +13
    ./java/org/lamsfoundation/lams/federation/service/FederationService.java
    • -0
    • +8
    ./java/org/lamsfoundation/lams/federation/service/IFederationService.java
    • -2
    • +1
    ./java/org/lamsfoundation/lams/usermanagement/AuthenticationMethod.java
    • -1
    • +3
    ./java/org/lamsfoundation/lams/util/ConfigurationKeys.java
  5. … 10 more files in changeset.
Monday 09 Jul 2007
3:20 pm

jliew

pre-select idp in lesson link for learner

Options
    • -1
    • +5
    ./java/org/lamsfoundation/lams/util/ConfigurationKeys.java
  2. … 5 more files in changeset.
Friday 06 Jul 2007
12:05 pm

fmalikoff

LDEV-1256: Added admin_url column to tool and system tool tables

Options
    • -1
    • +13
    ./java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
    • -7
    • +1
    ./java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
    • -1
    • +20
    ./java/org/lamsfoundation/lams/tool/SystemTool.java
    • -1
    • +21
    ./java/org/lamsfoundation/lams/tool/Tool.java
  5. … 5 more files in changeset.
Thursday 05 Jul 2007
3:51 pm

fmalikoff

Branching: The start and end co-ordinates were missing during the import.

Options
    • -0
    • +11
    ./java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
2:29 pm

fmalikoff

LDEV-1261: Fixing a lazy loading exception that started when we removed the hibernate session filter on the user role import. The organisation can't be passed in from the web layer as it isn't connected to the session, and so when it tries to get the user organisation from the organisation, it throws a lazy loading exception.

Options
    • -3
    • +3
    ./java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java
    • -3
    • +15
    ./java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
  3. … 4 more files in changeset.
Wednesday 04 Jul 2007
4:15 pm

fmalikoff

Branching: Teacher chosen branch screen basically working. Still a bit of clean up on the messages to go.

Options
    • -6
    • +31
    ./java/org/lamsfoundation/lams/learningdesign/Grouper.java
    • -3
    • +40
    ./java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java
    • -6
    • +7
    ./java/org/lamsfoundation/lams/lesson/service/ILessonService.java
    • -6
    • +8
    ./java/org/lamsfoundation/lams/lesson/service/LessonService.java
  5. … 10 more files in changeset.
2:11 pm

jliew

add 2 servlets at /servlet/getFedServerGroups and /servlet/getFedServerLessons for flash to use

Options
    • -11
    • +53
    ./java/org/lamsfoundation/lams/federation/service/FederationService.java
    • -3
    • +4
    ./java/org/lamsfoundation/lams/federation/service/IFederationService.java
  3. … 2 more files in changeset.
2:10 pm

jliew

add new column to lams_lesson_fed to store local lesson state of external lessons (for later)

Options
    • -1
    • +19
    ./java/org/lamsfoundation/lams/federation/LessonFederation.java
  2. … 3 more files in changeset.
11:35 am

fmalikoff

Branching: Tweaking the branch objects so that the contribution flags are right for teacher chosen activities (and hence the button will appear to do the selection in monitoring) and some changes to make the teacher chosen screen logic easier.

Options
    • -0
    • +60
    ./java/org/lamsfoundation/lams/learningdesign/ActivityTitleComparator.java
    • -4
    • +4
    ./java/org/lamsfoundation/lams/learningdesign/BranchingActivity.java
    • -1
    • +7
    ./java/org/lamsfoundation/lams/learningdesign/ComplexActivity.java
    • -2
    • +2
    ./java/org/lamsfoundation/lams/learningdesign/ContributionTypes.java
    • -2
    • +11
    ./java/org/lamsfoundation/lams/learningdesign/GroupBranchActivityEntry.java
    • -2
    • +23
    ./java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java
    • -4
    • +16
    ./java/org/lamsfoundation/lams/learningdesign/strategy/BranchingActivityStrategy.java
    • -2
    • +31
    ./java/org/lamsfoundation/lams/learningdesign/strategy/ComplexActivityStrategy.java
    • -0
    • +39
    ./java/org/lamsfoundation/lams/learningdesign/strategy/IContributionTypeStrategy.java
    • -2
    • +2
    ./java/org/lamsfoundation/lams/learningdesign/strategy/SimpleActivityStrategy.java
  11. … 2 more files in changeset.
Tuesday 03 Jul 2007
2:50 pm

mseaton

fixed wddxtags type (firstActivityUIID) + improvement in loading sequences for branching activity

Options
    • -3
    • +4
    ./java/org/lamsfoundation/lams/util/wddx/WDDXTAGS.java
  2. … 4 more files in changeset.
2:09 pm

mseaton

branching activity saves start/end connector coords

Options
    • -1
    • +8
    ./java/org/lamsfoundation/lams/util/wddx/WDDXTAGS.java
  2. … 4 more files in changeset.
10:00 am

fmalikoff

Branching: Adding x and y co-ordinates for the start and stop points. This is to support to UI - the details are not used by the progress engine.

Options
    • -4
    • +65
    ./java/org/lamsfoundation/lams/learningdesign/BranchingActivity.java
    • -4
    • +10
    ./java/org/lamsfoundation/lams/learningdesign/ChosenBranchingActivity.java
    • -1
    • +9
    ./java/org/lamsfoundation/lams/learningdesign/GroupBranchingActivity.java
    • -1
    • +9
    ./java/org/lamsfoundation/lams/learningdesign/ToolBranchingActivity.java
    • -85
    • +129
    ./java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
    • -4
    • +6
    ./java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
    • -13
    • +13
    ./java/org/lamsfoundation/lams/lesson/service/ILessonService.java
    • -15
    • +13
    ./java/org/lamsfoundation/lams/lesson/service/LessonService.java
  9. … 4 more files in changeset.
9:16 am

jliew

complete updateFederationRegistry so that outdated servers are deleted

Options
    • -0
    • +11
    ./java/org/lamsfoundation/lams/federation/FederationServer.java
    • -1
    • +14
    ./java/org/lamsfoundation/lams/federation/service/FederationService.java
Friday 29 Jun 2007
3:28 pm

fmalikoff

Branching: Added a new field firstActivity to the SequenceActivity, so Flash can easily indicate where to start in a sequence activity. That way, the logic works in the same way as it does in a learning design.

Options
    • -24
    • +40
    ./java/org/lamsfoundation/lams/learningdesign/strategy/SequenceActivityStrategy.java
  2. … 2 more files in changeset.
2:55 pm

jliew

file LessonFederation.java was initially added on branch shibboleth_2_0.

Options
    • -0
    • +0
    ./java/org/lamsfoundation/lams/federation/LessonFederation.java
2:55 pm

jliew

added new table to record list of external lessons joined by local groups

Options
    • -0
    • +1
    ./java/org/lamsfoundation/lams/commonContext.xml
    • -11
    • +13
    ./java/org/lamsfoundation/lams/federation/FederationLesson.java
    • -0
    • +21
    ./java/org/lamsfoundation/lams/federation/FederationServer.java
    • -0
    • +116
    ./java/org/lamsfoundation/lams/federation/LessonFederation.java
    • -1
    • +10
    ./java/org/lamsfoundation/lams/federation/service/FederationService.java
    • -0
    • +12
    ./java/org/lamsfoundation/lams/federation/service/IFederationService.java
  7. … 4 more files in changeset.
1:13 pm

fmalikoff

Branching: Added a new field firstActivity to the SequenceActivity, so Flash can easily indicate where to start in a sequence activity. That way, the logic works in the same way as it does in a learning design.

Options
    • -10
    • +19
    ./java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java
    • -4
    • +14
    ./java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
    • -3
    • +31
    ./java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
  4. … 4 more files in changeset.
7:52 am

fmalikoff

Clarifying comparison for group - will now work even if the groups have the same order id. Removed unneeded saving logic from the import code now that the comparison is fixed.

Options
    • -5
    • +10
    ./java/org/lamsfoundation/lams/learningdesign/Group.java
    • -8
    • +6
    ./java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
Thursday 28 Jun 2007
10:08 pm

fmalikoff

Branching: Getting the import working for grouped branching

Options
    • -1
    • +11
    ./java/org/lamsfoundation/lams/learningdesign/dto/GroupBranchActivityEntryDTO.java
    • -12
    • +105
    ./java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
2:43 pm

fmalikoff

Branching: Getting the progress engine working so it will display the branch activities if the sequence/branch contains one or no activities

Options
    • -3
    • +4
    ./java/org/lamsfoundation/lams/learningdesign/Group.java
    • -4
    • +22
    ./java/org/lamsfoundation/lams/learningdesign/GroupBranchActivityEntry.java
    • -1
    • +11
    ./java/org/lamsfoundation/lams/learningdesign/dto/GroupBranchActivityEntryDTO.java
    • -7
    • +16
    ./java/org/lamsfoundation/lams/lesson/service/ILessonService.java
    • -4
    • +17
    ./java/org/lamsfoundation/lams/lesson/service/LessonService.java
    • -1
    • +2
    ./java/org/lamsfoundation/lams/util/wddx/WDDXTAGS.java
    • -1
    • +3
    ./java/org/lamsfoundation/lams/web/util/AttributeNames.java
  8. … 6 more files in changeset.
Friday 22 Jun 2007
1:17 pm

jliew

add wddx methods to service, and test jsp page for them

Options
    • -11
    • +18
    ./java/org/lamsfoundation/lams/federation/service/FederationService.java
    • -13
    • +23
    ./java/org/lamsfoundation/lams/federation/service/IFederationService.java
  3. … 2 more files in changeset.
1:16 pm

jliew

clarify methods covered by spring transaction

Options
    • -4
    • +1
    ./java/org/lamsfoundation/lams/federationContext.xml
Wednesday 20 Jun 2007
12:43 pm

fmalikoff

Methods in the UserManagementService were missing from the transaction definitions, and this was causing issues in the roles import.

Options
    • -0
    • +3
    ./java/org/lamsfoundation/lams/commonContext.xml
Tuesday 19 Jun 2007
1:28 pm

jliew

LDEV-1261 improve import user speed by running in separate thread (bypass hibernate filter), and update browser with progress every 5 seconds so it doesn't timeout.

Options
    • -1
    • +9
    ./java/org/lamsfoundation/lams/util/audit/AuditService.java
    • -0
    • +11
    ./java/org/lamsfoundation/lams/util/audit/IAuditService.java
  3. … 11 more files in changeset.
Friday 15 Jun 2007
1:44 pm

fmalikoff

LDEV-1257: Added support for Groups to be created in authoring (so that the names can be entered) and the mapping table to map groups to a sequence activity (ala branch) for a Group based branching activity.

Options
    • -1
    • +7
    ./java/org/lamsfoundation/lams/learningdesign/dto/LearningDesignDTO.java
Thursday 14 Jun 2007
8:53 am

jliew

LDEV-1259 when saving organisations, check if child sets are null

Options
    • -12
    • +16
    ./java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
Wednesday 13 Jun 2007
6:36 pm

fmalikoff

LDEV-1257: Added support for Groups to be created in authoring (so that the names can be entered) and the mapping table to map groups to a sequence activity (ala branch) for a Group based branching activity.

Options
    • -0
    • +1
    ./java/org/lamsfoundation/lams/commonContext.xml
    • -3
    • +2
    ./java/org/lamsfoundation/lams/learningdesign/ChosenGrouping.java
    • -6
    • +72
    ./java/org/lamsfoundation/lams/learningdesign/Group.java
    • -0
    • +160
    ./java/org/lamsfoundation/lams/learningdesign/GroupBranchActivityEntry.java
    • -2
    • +29
    ./java/org/lamsfoundation/lams/learningdesign/Grouping.java
    • -6
    • +5
    ./java/org/lamsfoundation/lams/learningdesign/RandomGrouping.java
    • -0
    • +91
    ./java/org/lamsfoundation/lams/learningdesign/dto/GroupBranchActivityEntryDTO.java
    • -1
    • +14
    ./java/org/lamsfoundation/lams/learningdesign/dto/GroupDTO.java
    • -2
    • +23
    ./java/org/lamsfoundation/lams/learningdesign/dto/LearningDesignDTO.java
    • -1
    • +12
    ./java/org/lamsfoundation/lams/util/wddx/WDDXTAGS.java
  11. … 9 more files in changeset.
Tuesday 12 Jun 2007
7:42 am

fmalikoff

LDEV-1134: Dummying up a branching page for the progress engine. Had missed the entry for the abstract branching class in the Hibernate file when I switched from 1 branching class to 3.

Options
    • -2
    • +2
    ./java/org/lamsfoundation/lams/learningdesign/Activity.java
    • -2
    • +2
    ./java/org/lamsfoundation/lams/learningdesign/RandomGrouper.java
    • -16
    • +13
    ./java/org/lamsfoundation/lams/learningdesign/strategy/BranchingActivityStrategy.java
  4. … 4 more files in changeset.