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 14 Dec 2007
12:18 pm

jliew

Refactor admin breadcrumb so that title of a page is separate from the breadcrumb; put more info in orgs and user lists.

Options
    • -1
    • +9
    ./java/org/lamsfoundation/lams/usermanagement/dao/IRoleDAO.java
    • -2
    • +21
    ./java/org/lamsfoundation/lams/usermanagement/dao/hibernate/RoleDAO.java
    • -1
    • +9
    ./java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java
    • -4
    • +1
    ./java/org/lamsfoundation/lams/usermanagement/service/LdapService.java
    • -1
    • +9
    ./java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
  6. … 31 more files in changeset.
Thursday 13 Dec 2007
11:36 am

jliew

LDEV-1284 add check for when organisation is missing in integration entry; don't add new users to the integration org since there no longer is one. Backported from HEAD.

Options
    • -6
    • +0
    ./java/org/lamsfoundation/lams/integration/service/IntegrationService.java
  2. … 1 more file in changeset.
11:33 am

jliew

LDEV-1284 add check for when organisation is missing in integration entry; don't add new users to the integration org since there no longer is one.

Options
    • -6
    • +0
    ./java/org/lamsfoundation/lams/integration/service/IntegrationService.java
  2. … 1 more file in changeset.
Wednesday 12 Dec 2007
12:37 pm

jliew

Merge LDEV-1284 changes to ldap2_0_4 branch

Options
    • -2
    • +3
    ./java/org/lamsfoundation/lams/integration/service/IntegrationService.java
  2. … 1 more file in changeset.
12:27 pm

lfoxton

Changes to merge 2.0.5 with ldap2_0_4 branch to be used for macquarie uni and the webCt-LAMS integration

Options
    • -0
    • +10
    ./java/org/lamsfoundation/lams/integration/service/IIntegrationService.java
    • -1
    • +71
    ./java/org/lamsfoundation/lams/integration/service/IntegrationService.java
    • -0
    • +6
    ./java/org/lamsfoundation/lams/integration/util/LoginRequestDispatcher.java
  4. … 8 more files in changeset.
Monday 10 Dec 2007
2:20 pm

fmalikoff

LDEV-1376: Couple of small tweaks needed on the back end - the validation wanted start to be not null so that was removed (the logic in the runtime test was fine, it was just the validation) and the greater than was sending back a dummy 9999, which is now null.

Options
    • -2
    • +5
    ./java/org/lamsfoundation/lams/learningdesign/BranchCondition.java
    • -10
    • +1
    ./java/org/lamsfoundation/lams/learningdesign/dto/BranchConditionDTO.java
    • -7
    • +1
    ./java/org/lamsfoundation/lams/tool/dto/ToolOutputDefinitionDTO.java
Sunday 09 Dec 2007
5:54 pm

fmalikoff

LDEV-750: Adding insert sequence into sequence functionality. Basic functionality done - still yet to do the Flash side and some security checking.

Options
    • -7
    • +12
    ./java/org/lamsfoundation/lams/learningdesign/Activity.java
    • -3
    • +4
    ./java/org/lamsfoundation/lams/learningdesign/BranchCondition.java
    • -3
    • +3
    ./java/org/lamsfoundation/lams/learningdesign/ChosenBranchingActivity.java
    • -3
    • +3
    ./java/org/lamsfoundation/lams/learningdesign/ChosenGrouping.java
    • -3
    • +3
    ./java/org/lamsfoundation/lams/learningdesign/ComplexActivity.java
    • -3
    • +3
    ./java/org/lamsfoundation/lams/learningdesign/GateActivity.java
    • -3
    • +3
    ./java/org/lamsfoundation/lams/learningdesign/GroupBranchingActivity.java
    • -4
    • +5
    ./java/org/lamsfoundation/lams/learningdesign/Grouping.java
    • -7
    • +7
    ./java/org/lamsfoundation/lams/learningdesign/GroupingActivity.java
    • -1
    • +5
    ./java/org/lamsfoundation/lams/learningdesign/LearningDesign.java
    • -2
    • +2
    ./java/org/lamsfoundation/lams/learningdesign/NullActivity.java
    • -3
    • +3
    ./java/org/lamsfoundation/lams/learningdesign/OptionsActivity.java
    • -3
    • +3
    ./java/org/lamsfoundation/lams/learningdesign/ParallelActivity.java
    • -3
    • +3
    ./java/org/lamsfoundation/lams/learningdesign/PermissionGateActivity.java
    • -3
    • +3
    ./java/org/lamsfoundation/lams/learningdesign/RandomGrouping.java
  16. … 21 more files in changeset.
Friday 07 Dec 2007
9:40 am

jliew

LDEV-1328 fixed group managers and group admins should be able to edit subgroup details

Options
    • -1
    • +9
    ./java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java
    • -1
    • +14
    ./java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
  3. … 3 more files in changeset.
Wednesday 05 Dec 2007
1:52 pm

jliew

LDEV-1323 overhaul add/remove user screen which didn't scale well for sysadmins - users added via search field now, with the option to click a link to retrieve all potential users

Options
    • -1
    • +49
    ./java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java
    • -8
    • +71
    ./java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
  3. … 7 more files in changeset.
Wednesday 21 Nov 2007
8:44 am

fmalikoff

LDEV-1179: Export portfolio now displays a different msg for run offline activities. The screen comes from the learning war, and is called from the code on AbstractExportPortfolioServlet. Tools don't have to do anything, but they can override a new method in the servlet and supply the name of the activity (as per the tool's authoring screen) or do their own screen. Our tools will just display the name of the activity.

Options
    • -3
    • +49
    ./java/org/lamsfoundation/lams/web/servlet/AbstractExportPortfolioServlet.java
    • -1
    • +3
    ./java/org/lamsfoundation/lams/web/util/AttributeNames.java
  3. … 14 more files in changeset.
Friday 16 Nov 2007
12:48 pm

fmalikoff

LDEV-1285: Adding a new Activity type "Options With Sequences" so the Flash will know whether to expect sequences or not. The type is stored in the database otherwise we won't know which type it will be if the user saves the Optional without any child activities. The back end treats all Optional activities the same.

Options
    • -2
    • +12
    ./java/org/lamsfoundation/lams/learningdesign/Activity.java
    • -0
    • +35
    ./java/org/lamsfoundation/lams/learningdesign/OptionsWithSequencesActivity.java
    • -1
    • +4
    ./java/org/lamsfoundation/lams/learningdesign/dao/hibernate/ActivityDAO.java
    • -78
    • +4
    ./java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
    • -9
    • +6
    ./java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
  6. … 3 more files in changeset.
Wednesday 14 Nov 2007
1:49 pm

fmalikoff

LDEV-1402: Changed validation to allow for empty branches in a branching activity.

Options
    • -5
    • +10
    ./java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java
Tuesday 13 Nov 2007
7:30 am

jliew

LDEV-1252 adding new table lams_user_organisation_collapsed; refactored jsps/action/data access to accomodate collapsible courses; added callback servlet UpdateCollapsedGroupServlet.

Options
    • -0
    • +1
    ./java/org/lamsfoundation/lams/commonContext.xml
    • -1
    • +18
    ./java/org/lamsfoundation/lams/usermanagement/UserOrganisation.java
    • -0
    • +70
    ./java/org/lamsfoundation/lams/usermanagement/UserOrganisationCollapsed.java
    • -5
    • +5
    ./java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationDAO.java
    • -0
    • +48
    ./java/org/lamsfoundation/lams/usermanagement/dto/CollapsedOrgDTO.java
    • -4
    • +28
    ./java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
  7. … 15 more files in changeset.
Monday 12 Nov 2007
3:14 pm

fmalikoff

LDEV-1268: Learning designs (when saved and when exported) now have the version in x.x.x.xxxxxx format.

Options
    • -1
    • +3
    ./java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
  2. … 1 more file in changeset.
Friday 09 Nov 2007
4:17 pm

fmalikoff

LDEV-1278: Adding calls that allow the sending of learner progress records in batches. This requires specific HQL to lookup the records, and a new entry (for the size of the batches) in the configuration table.

Options
    • -1
    • +18
    ./java/org/lamsfoundation/lams/lesson/dao/ILearnerProgressDAO.java
    • -2
    • +69
    ./java/org/lamsfoundation/lams/lesson/dao/hibernate/LearnerProgressDAO.java
    • -1
    • +4
    ./java/org/lamsfoundation/lams/util/ConfigurationKeys.java
  4. … 8 more files in changeset.
7:43 am

fmalikoff

LDEV-1268: Applied field removal logic to the tools as well, so now the import should be able to handle tools adding new fields in future versions without breaking. The tools should still implement their filters though, as it gives the tools finer control and is more efficient.

Options
    • -17
    • +14
    ./java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
Thursday 08 Nov 2007
12:28 pm

fmalikoff

LDEV-1268: Attempting to make the import forward compatible. Xstream 1.1 throws an exception when a field exists in an XML file but there isn't a field in the POJO. Now if it encounters an extra field in the core learning design, the field is removed. This won't deal with tools but if a tool import fails at least only that activity is lost.

Options
    • -12
    • +153
    ./java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
    • -0
    • +88
    ./java/org/lamsfoundation/lams/util/VersionUtil.java
Wednesday 07 Nov 2007
1:57 pm

lfoxton

LDEV-1396 - Impliment implicit login requests so that integrated servers can pass user details and perform a loginRequest implicitly

Options
    • -0
    • +10
    ./java/org/lamsfoundation/lams/integration/service/IIntegrationService.java
    • -1
    • +70
    ./java/org/lamsfoundation/lams/integration/service/IntegrationService.java
    • -0
    • +6
    ./java/org/lamsfoundation/lams/integration/util/LoginRequestDispatcher.java
  4. … 4 more files in changeset.
Monday 05 Nov 2007
9:15 am

asukkar

Modified getSupportedLocale to return the default locale when the languageIsoCode and the countryIsoCode is empty.

Options
    • -2
    • +4
    ./java/org/lamsfoundation/lams/util/LanguageUtil.java
Friday 02 Nov 2007
9:22 am

jliew

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

Options
    • -1
    • +8
    ./java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java
    • -27
    • +29
    ./java/org/lamsfoundation/lams/usermanagement/service/LdapService.java
    • -1
    • +14
    ./java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
  4. … 2 more files in changeset.
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
    ./java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java
    • -27
    • +29
    ./java/org/lamsfoundation/lams/usermanagement/service/LdapService.java
    • -1
    • +14
    ./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
    • -2
    • +18
    ./java/org/lamsfoundation/lams/usermanagement/Organisation.java
  2. … 13 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
    ./java/org/lamsfoundation/lams/util/Configuration.java
  2. … 1 more file in changeset.
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
    ./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
    ./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.