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
Thursday 13 Dec 2007
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
    ./src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java
  2. … 1 more file in changeset.
Wednesday 12 Dec 2007
1:51 pm

jliew

LDEV-1284 integration organisation no longer mandatory; marking file as ascii, not binary

Options
    • -53
    • +53
    ./db/sql/create_integration_tables.sql
1:50 pm

jliew

LDEV-1284 integration organisation no longer mandatory; marking file as ascii, not binary

Options
    • -53
    • +53
    ./db/sql/create_integration_tables.sql
1:46 pm

jliew

merge changes from HEAD to ldap2_0_4 branch for LDEV-1284, making integration organsiations not mandatory (requires alter_206_integration.sql update script to be run)

Options
    • -2
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerOrgMap.hbm.xml
    • -0
    • +2
    ./db/sql/updatescripts/alter_206_integration.sql
  3. … 2 more files in changeset.
1:46 pm

jliew

file alter_206_integration.sql was initially added on branch ldap2_0_4.

Options
    • -0
    • +0
    ./db/sql/updatescripts/alter_206_integration.sql
1:40 pm

jliew

LDEV-1284 integration organisation no longer mandatory; orgid column in lams_ext_server_org_map can be null now.

Options
    • -2
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerOrgMap.hbm.xml
    • -0
    • +3
    ./db/sql/updatescripts/alter_21_branching.sql
  3. … 2 more files in changeset.
12:37 pm

jliew

Merge LDEV-1284 changes to ldap2_0_4 branch

Options
    • -1
    • +1
    ./db/sql/updatescripts/Alter21Integration.java
    • -2
    • +3
    ./src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java
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
    ./src/java/org/lamsfoundation/lams/integration/service/IIntegrationService.java
    • -1
    • +71
    ./src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java
    • -0
    • +6
    ./src/java/org/lamsfoundation/lams/integration/util/LoginRequestDispatcher.java
  4. … 8 more files in changeset.
4:12 am

Ernie Ghiglione

Updating Dutch and Chinese

Options
    • -0
    • +52
    ./conf/language/lams/ApplicationResources_nl_BE.properties
    • -2
    • +11
    ./conf/language/lams/ApplicationResources_zh_CN.properties
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
    ./src/java/org/lamsfoundation/lams/learningdesign/BranchCondition.java
    • -10
    • +1
    ./src/java/org/lamsfoundation/lams/learningdesign/dto/BranchConditionDTO.java
    • -7
    • +1
    ./src/java/org/lamsfoundation/lams/tool/dto/ToolOutputDefinitionDTO.java
7:23 am

fmalikoff

LDEV-1218: Adding the batch size for the learner progress screen to the monitoring call.

Options
    • -0
    • +3
    ./db/sql/insert_lams_unix_config_data.sql
    • -0
    • +3
    ./db/sql/insert_lams_windows_config_data.sql
    • -0
    • +3
    ./db/sql/insert_rams_unix_config_data.sql
    • -0
    • +3
    ./db/sql/insert_rams_windows_config_data.sql
    • -1
    • +2
    ./db/sql/updatescripts/alter_21_branching.sql
  6. … 1 more file in changeset.
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
    ./src/java/org/lamsfoundation/lams/learningdesign/Activity.java
    • -3
    • +4
    ./src/java/org/lamsfoundation/lams/learningdesign/BranchCondition.java
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/learningdesign/ChosenBranchingActivity.java
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/learningdesign/ChosenGrouping.java
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/learningdesign/ComplexActivity.java
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/learningdesign/GateActivity.java
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/learningdesign/GroupBranchingActivity.java
    • -4
    • +5
    ./src/java/org/lamsfoundation/lams/learningdesign/Grouping.java
    • -7
    • +7
    ./src/java/org/lamsfoundation/lams/learningdesign/GroupingActivity.java
    • -1
    • +5
    ./src/java/org/lamsfoundation/lams/learningdesign/LearningDesign.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/learningdesign/NullActivity.java
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/learningdesign/OptionsActivity.java
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/learningdesign/ParallelActivity.java
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/learningdesign/PermissionGateActivity.java
    • -3
    • +3
    ./src/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
    ./src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java
    • -1
    • +14
    ./src/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
    ./src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java
    • -8
    • +71
    ./src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
  3. … 7 more files in changeset.
Tuesday 04 Dec 2007
12:02 pm

fmalikoff

LDEV-1301: Changing some of the I18N labels for the configuration screen to reuse existing labels. Removed the LearnerProgressBatchSize as we aren't using it for the Learner Progress screen after all.

Options
    • -22
    • +19
    ./db/sql/insert_lams_unix_config_data.sql
    • -22
    • +19
    ./db/sql/insert_lams_windows_config_data.sql
    • -23
    • +20
    ./db/sql/insert_rams_unix_config_data.sql
    • -22
    • +19
    ./db/sql/insert_rams_windows_config_data.sql
    • -50
    • +124
    ./db/sql/updatescripts/alter_21_branching.sql
Friday 23 Nov 2007
9:01 pm

Ernie Ghiglione

Updating English, Norwegian and Polish

Options
    • -4
    • +4
    ./conf/language/lams/ApplicationResources.properties
    • -4
    • +4
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -5
    • +6
    ./conf/language/lams/ApplicationResources_no_NO.properties
    • -2
    • +3
    ./conf/language/lams/ApplicationResources_pl_PL.properties
  5. … 4 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
    ./src/java/org/lamsfoundation/lams/web/servlet/AbstractExportPortfolioServlet.java
    • -1
    • +3
    ./src/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
    • -0
    • +5
    ./conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml
    • -1
    • +2
    ./db/sql/insert_types_data.sql
    • -0
    • +2
    ./db/sql/updatescripts/alter_21_branching.sql
    • -2
    • +12
    ./src/java/org/lamsfoundation/lams/learningdesign/Activity.java
    • -0
    • +35
    ./src/java/org/lamsfoundation/lams/learningdesign/OptionsWithSequencesActivity.java
    • -1
    • +4
    ./src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/ActivityDAO.java
    • -78
    • +4
    ./src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
    • -9
    • +6
    ./src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
12:46 pm

fmalikoff

Cache the themes otherwise it gets loaded every time the User object is used (and User is cached!)

Options
    • -0
    • +3
    ./conf/hibernate/mappings/org/lamsfoundation/lams/themes/CSSThemeVisualElement.hbm.xml
Thursday 15 Nov 2007
8:53 am

jliew

fix missing semi-colon

Options
    • -2
    • +2
    ./db/sql/updatescripts/Alter21Integration.java
8:52 am

jliew

removing accidental commit

Options
    • -10
    • +0
    ./db/sql/lams_user_organisation_collapsed.sql
Wednesday 14 Nov 2007
1:49 pm

fmalikoff

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

Options
    • -5
    • +10
    ./src/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
    • -1
    • +7
    ./conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/UserOrganisation.hbm.xml
    • -0
    • +40
    ./conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/UserOrganisationCollapsed.hbm.xml
    • -0
    • +47
    ./db/model/lams_11.clay
    • -1
    • +9
    ./db/sql/create_lams_11_tables.sql
    • -0
    • +10
    ./db/sql/lams_user_organisation_collapsed.sql
    • -1
    • +10
    ./db/sql/updatescripts/alter_21_branching.sql
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/commonContext.xml
    • -1
    • +18
    ./src/java/org/lamsfoundation/lams/usermanagement/UserOrganisation.java
    • -0
    • +70
    ./src/java/org/lamsfoundation/lams/usermanagement/UserOrganisationCollapsed.java
    • -5
    • +5
    ./src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationDAO.java
    • -0
    • +48
    ./src/java/org/lamsfoundation/lams/usermanagement/dto/CollapsedOrgDTO.java
    • -4
    • +28
    ./src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
  13. … 9 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
    ./src/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
    • -0
    • +3
    ./db/sql/insert_lams_unix_config_data.sql
    • -0
    • +3
    ./db/sql/insert_lams_windows_config_data.sql
    • -0
    • +3
    ./db/sql/insert_rams_unix_config_data.sql
    • -0
    • +3
    ./db/sql/insert_rams_windows_config_data.sql
    • -0
    • +1
    ./db/sql/updatescripts/alter_21_branching.sql
    • -1
    • +18
    ./src/java/org/lamsfoundation/lams/lesson/dao/ILearnerProgressDAO.java
    • -2
    • +69
    ./src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LearnerProgressDAO.java
    • -1
    • +4
    ./src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java
  9. … 3 more files in changeset.
8:53 am

fmalikoff

LDEV-1268: Message added to warn when a user is opening an export file that was created in a later version of LAMS.

Options
    • -1
    • +2
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +2
    ./conf/language/lams/ApplicationResources_en_AU.properties
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
    ./src/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
    ./src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
    • -0
    • +88
    ./src/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
    ./src/java/org/lamsfoundation/lams/integration/service/IIntegrationService.java
    • -1
    • +70
    ./src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java
    • -0
    • +6
    ./src/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
    ./src/java/org/lamsfoundation/lams/util/LanguageUtil.java