lams / lams_common / src / java

org

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 0
Total Committers: 22
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 08 Jun 2007
8:19 am

fmalikoff

Split branching activity into 3 activities - one for each method of branching (teacher chosen, grouped and tool based)

Options
    • -7
    • +49
    ./lamsfoundation/lams/learningdesign/Activity.java
    • -20
    • +5
    ./lamsfoundation/lams/learningdesign/BranchingActivity.java
    • -0
    • +132
    ./lamsfoundation/lams/learningdesign/ChosenBranchingActivity.java
    • -0
    • +130
    ./lamsfoundation/lams/learningdesign/GroupBranchingActivity.java
    • -0
    • +131
    ./lamsfoundation/lams/learningdesign/ToolBranchingActivity.java
    • -4
    • +10
    ./lamsfoundation/lams/learningdesign/dao/hibernate/ActivityDAO.java
    • -6
    • +23
    ./lamsfoundation/lams/learningdesign/strategy/BranchingActivityStrategy.java
  8. … 4 more files in changeset.
Thursday 07 Jun 2007
3:26 am

jliew

merge with lams2_0_3 tag on HEAD

Options
    • -2
    • +8
    ./lamsfoundation/lams/integration/service/IntegrationService.java
    • -3
    • +63
    ./lamsfoundation/lams/learningdesign/Activity.java
    • -0
    • +1
    ./lamsfoundation/lams/learningdesign/ContributionTypes.java
    • -4
    • +44
    ./lamsfoundation/lams/learningdesign/LearningDesign.java
    • -1
    • +1
    ./lamsfoundation/lams/learningdesign/SystemGateActivity.java
    • -1
    • +2
    ./lamsfoundation/lams/learningdesign/ToolActivity.java
    • -1
    • +4
    ./lamsfoundation/lams/learningdesign/dao/hibernate/ActivityDAO.java
    • -2
    • +40
    ./lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
    • -6
    • +33
    ./lamsfoundation/lams/learningdesign/dto/DesignDetailDTO.java
    • -4
    • +72
    ./lamsfoundation/lams/learningdesign/dto/LearningDesignDTO.java
    • -1
    • +7
    ./lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
    • -1
    • +3
    ./lamsfoundation/lams/learningdesign/service/LD102Importer.java
    • -1
    • +1
    ./lamsfoundation/lams/learningdesign/strategy/SystemGateActivityStrategy.java
    • -12
    • +46
    ./lamsfoundation/lams/lesson/LearnerProgress.java
    • -5
    • +37
    ./lamsfoundation/lams/lesson/Lesson.java
  16. … 115 more files in changeset.
Tuesday 05 Jun 2007
9:26 am

fmalikoff

LDEV-1134: Changed strategy to suit how we now expect a sequence activity to look - a whole pile of subactivities joined with transitions rather than order ids.

Options
    • -14
    • +25
    ./lamsfoundation/lams/learningdesign/strategy/SequenceActivityStrategy.java
6:33 am

mseaton

adding branch activity to sequence - basic model/dto changes and packet handling

Options
    • -2
    • +22
    ./lamsfoundation/lams/learningdesign/Activity.java
    • -0
    • +140
    ./lamsfoundation/lams/learningdesign/BranchingActivity.java
    • -1
    • +4
    ./lamsfoundation/lams/learningdesign/dao/hibernate/ActivityDAO.java
    • -1
    • +6
    ./lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
    • -1
    • +8
    ./lamsfoundation/lams/learningdesign/dto/LibraryActivityDTO.java
    • -0
    • +79
    ./lamsfoundation/lams/learningdesign/strategy/BranchingActivityStrategy.java
    • -1
    • +2
    ./lamsfoundation/lams/tool/SystemTool.java
  8. … 3 more files in changeset.
6:31 am

jliew

update list of federation servers from registry

Options
    • -6
    • +86
    ./lamsfoundation/lams/federation/service/FederationService.java
    • -0
    • +32
    ./lamsfoundation/lams/federation/service/IFederationService.java
    • -1
    • +5
    ./lamsfoundation/lams/util/ConfigurationKeys.java
  4. … 6 more files in changeset.
Friday 01 Jun 2007
6:52 am

jliew

implement getFedServerGroups and getFedServerLessons, methods to call remote server

Options
    • -0
    • +28
    ./lamsfoundation/lams/federation/FederationException.java
    • -0
    • +34
    ./lamsfoundation/lams/federation/dto/ExtLessonDTO.java
    • -0
    • +40
    ./lamsfoundation/lams/federation/dto/ExtOrgDTO.java
    • -3
    • +132
    ./lamsfoundation/lams/federation/service/FederationService.java
    • -1
    • +23
    ./lamsfoundation/lams/federation/service/IFederationService.java
  6. … 3 more files in changeset.
6:52 am

jliew

file FederationException.java was initially added on branch shibboleth_2_0.

Options
    • -0
    • +0
    ./lamsfoundation/lams/federation/FederationException.java
6:52 am

jliew

file ExtOrgDTO.java was initially added on branch shibboleth_2_0.

Options
    • -0
    • +0
    ./lamsfoundation/lams/federation/dto/ExtOrgDTO.java
6:52 am

jliew

file ExtLessonDTO.java was initially added on branch shibboleth_2_0.

Options
    • -0
    • +0
    ./lamsfoundation/lams/federation/dto/ExtLessonDTO.java
6:51 am

jliew

added fed_id column to lams_fed_server (common id number maintained across federation)

Options
    • -0
    • +17
    ./lamsfoundation/lams/federation/FederationServer.java
  2. … 3 more files in changeset.
Wednesday 30 May 2007
3:13 am

fmalikoff

LDEV-1244: If an imported design was read only when exported, it will now be read only when imported.

Options
    • -2
    • +2
    ./lamsfoundation/lams/learningdesign/dto/LearningDesignDTO.java
    • -0
    • +5
    ./lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
Tuesday 29 May 2007
1:11 pm

fmalikoff

LDEV-1241: Problem with progess engine getting stuck when a user is in a parallel activity within an optional activity and a force complete has occured. If the user selects the parallel activity after the force complete, the parallel activity is set to attempted, but the contained activities were left marked complete. So when the contained activities were "finished", they detected as complete and tried to forward the user to the current activity, which was the aforesaid parallel!

Now the code that sets an activity back to attempted will also check any completed child activities back to completed.

Options
    • -9
    • +36
    ./lamsfoundation/lams/lesson/LearnerProgress.java
  2. … 1 more file in changeset.
8:17 am

jliew

LDEV-1155 revert to storing temp portfolio on server as a constant 'export.zip'; URLEncoded the portfolio name when it is passed as a URL parameter (for i18n purposes); strip out punctuation chars from the export portfolio filename that is downloaded by users.

Options
    • -0
    • +22
    ./lamsfoundation/lams/util/FileUtil.java
  2. … 5 more files in changeset.
Friday 25 May 2007
8:02 am

asukkar

LDEV-1224

Sorted locale list to ensure the returned locale is consistent for a given input.

Options
    • -0
    • +3
    ./lamsfoundation/lams/integration/service/IntegrationService.java
7:42 am

jliew

Adding lams_fed_server and lams_fed_lesson tables to database, with accompanying files and service methods

Options
    • -0
    • +4
    ./lamsfoundation/lams/commonContext.xml
    • -0
    • +28
    ./lamsfoundation/lams/federationContext.xml
    • -0
    • +96
    ./lamsfoundation/lams/federation/FederationLesson.java
    • -0
    • +146
    ./lamsfoundation/lams/federation/FederationServer.java
    • -0
    • +70
    ./lamsfoundation/lams/federation/service/FederationService.java
    • -0
    • +30
    ./lamsfoundation/lams/federation/service/IFederationService.java
  7. … 4 more files in changeset.
7:42 am

jliew

file IFederationService.java was initially added on branch shibboleth_2_0.

Options
    • -0
    • +0
    ./lamsfoundation/lams/federation/service/IFederationService.java
7:42 am

jliew

file FederationService.java was initially added on branch shibboleth_2_0.

Options
    • -0
    • +0
    ./lamsfoundation/lams/federation/service/FederationService.java
7:42 am

jliew

file FederationServer.java was initially added on branch shibboleth_2_0.

Options
    • -0
    • +0
    ./lamsfoundation/lams/federation/FederationServer.java
7:42 am

jliew

file FederationLesson.java was initially added on branch shibboleth_2_0.

Options
    • -0
    • +0
    ./lamsfoundation/lams/federation/FederationLesson.java
7:42 am

jliew

file federationContext.xml was initially added on branch shibboleth_2_0.

Options
    • -0
    • +0
    ./lamsfoundation/lams/federationContext.xml
Wednesday 23 May 2007
2:51 am

jliew

LDEV-1183 group managers get learner as well as monitor in subgroups

Options
    • -12
    • +29
    ./lamsfoundation/lams/usermanagement/service/UserManagementService.java
Tuesday 22 May 2007
8:08 am

fmalikoff

LDEV-1225: When a 2.0 export file was imported, the system tool id wasn't being set for grouping. So if the design was run without being saved again, the grouping page in export portfolio didn't work. Once the design was saved, the field was set hence we didn't pick up the problem before.

Options
    • -0
    • +1
    ./lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
Monday 21 May 2007
10:20 am

fmalikoff

LDEV-1180: Grouping page for export portfolio failing - the import was not setting the system tool column in the grouping activity.

Options
    • -1
    • +2
    ./lamsfoundation/lams/learningdesign/service/LD102Importer.java
Wednesday 16 May 2007
1:39 am

fmalikoff

LDEV-1051 and LDEV-1198: Fixed the break out of frames logic for parallels at the end of a design and inside an optional activity.

Options
    • -4
    • +11
    ./lamsfoundation/lams/lesson/LearnerProgress.java
  2. … 12 more files in changeset.
Tuesday 15 May 2007
1:53 am

fmalikoff

LDEV-1227: Export failing when the content directory under lams-www/secure had an images directory but no files in the images directory. Wasn't detected the directory as empty (as there was an images directory) but the zip failed as there were no files in the zip file. Now the check for an empty directory checks for empty subdirectories as well.

Options
    • -1
    • +1
    ./lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
    • -6
    • +27
    ./lamsfoundation/lams/util/FileUtil.java
Monday 14 May 2007
8:04 am

fmalikoff

Error message of new exception didn't actually include the message of the causing exception.

Options
    • -4
    • +4
    ./lamsfoundation/lams/util/zipfile/ZipFileUtil.java
Wednesday 09 May 2007
3:01 am

fmalikoff

Merging RAMS and Edit On Fly changes from branch to the head.

Options
    • -3
    • +63
    ./lamsfoundation/lams/learningdesign/Activity.java
    • -0
    • +1
    ./lamsfoundation/lams/learningdesign/ContributionTypes.java
    • -4
    • +44
    ./lamsfoundation/lams/learningdesign/LearningDesign.java
    • -0
    • +149
    ./lamsfoundation/lams/learningdesign/SystemGateActivity.java
    • -1
    • +2
    ./lamsfoundation/lams/learningdesign/ToolActivity.java
    • -1
    • +4
    ./lamsfoundation/lams/learningdesign/dao/hibernate/ActivityDAO.java
    • -2
    • +40
    ./lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
    • -6
    • +33
    ./lamsfoundation/lams/learningdesign/dto/DesignDetailDTO.java
    • -3
    • +71
    ./lamsfoundation/lams/learningdesign/dto/LearningDesignDTO.java
    • -1
    • +2
    ./lamsfoundation/lams/learningdesign/service/LD102Importer.java
    • -0
    • +73
    ./lamsfoundation/lams/learningdesign/strategy/SystemGateActivityStrategy.java
    • -5
    • +37
    ./lamsfoundation/lams/lesson/Lesson.java
    • -0
    • +1
    ./lamsfoundation/lams/lesson/lessonApplicationContext.xml
    • -2
    • +20
    ./lamsfoundation/lams/lesson/dao/ILearnerProgressDAO.java
    • -2
    • +62
    ./lamsfoundation/lams/lesson/dao/hibernate/LearnerProgressDAO.java
  16. … 60 more files in changeset.
Wednesday 02 May 2007
5:40 am

fmalikoff

Changed name of server parameter from AllowEditOnFly to AllowLiveEdit, so that it makes more sense on the configuration screen.

Options
    • -2
    • +2
    ./lamsfoundation/lams/util/ConfigurationKeys.java
  2. … 5 more files in changeset.
Friday 27 Apr 2007
2:23 am

fmalikoff

Added a new configuration item - server url context. This should be either "lams" or "rams". Used by the FCKEditor upload servlet code to generate the appropriate paths to the images.

Options
    • -1
    • +2
    ./lamsfoundation/lams/util/ConfigurationKeys.java
  2. … 2 more files in changeset.
Thursday 26 Apr 2007
6:31 am

asukkar

LDEV-1100

Encoded the username component in the userinfo callback url.

Options
    • -1
    • +4
    ./lamsfoundation/lams/integration/service/IntegrationService.java