• last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
updated jsmath to 3.4c

    • -0
    • +137
    /jsmath/web/jsMath-easy-load.js
    • -1
    • +1
    /jsmath/web/jsMath-fallback-symbols.js
    • -0
    • +134
    /jsmath/web/easy/load.js
    • -0
    • +278
    /jsmath/web/extensions/AMSmath.js
    • -1
    • +55
    /jsmath/web/extensions/newcommand.js
  1. … 11 more files in changeset.
add wddx methods to service, and test jsp page for them

file FederationWDDXAction.java was initially added on branch shibboleth_2_0.

file wddx.jsp was initially added on branch shibboleth_2_0.

    • -0
    • +0
    /lams_admin/web/federation/wddx.jsp
add fedId field to html form

    • -0
    • +1
    /lams_admin/conf/xdoclet/struts-forms.xml
    • -4
    • +9
    /lams_admin/web/federation/federation.jsp
clarify methods covered by spring transaction

Code for the win 2.0.3 Installer/Updater and the 2.0.4 Updater added

LAMS-2.0.4.exe is compiled from a separate file, update-204.nsi

    • -0
    • +107
    /win_installer/src/Update204.java
    • binary
    /win_installer/src/update-204.nsi
merging updates to rams language files from lams2_0_3 tag

added Branch to the model (+BranchConnectors for view)

    • binary
    /lams_flash/src/central/flash/lams_authoring.fla
don't fail when can't check spreadsheet type

fix javascript to use onsubmit call

    • -2
    • +2
    /lams_admin/web/import/importGroups.jsp
    • -2
    • +2
    /lams_admin/web/import/importexcel.jsp
setup sequence act on branch view open + activities added to view are added as child view of the default sequence act + improved clearCanvas

    • binary
    /lams_flash/src/central/flash/lams_authoring.fla
Fix to add the system tool entry has been moved to a separate script on the lams2_0_3_fixes tag.

Changed script to include all the edit on the fly changes

Fix to add the system tool entry has been moved to a separate script on the lams2_0_3_fixes tag.

Move the system tool table update to a 2.0.4 script as we'll mark the "fixed" upgraders 2.0.4

    • -5
    • +5
    /lams_common/db/sql/insert_lams_unix_config_data.sql
    • -5
    • +5
    /lams_common/db/sql/insert_lams_windows_config_data.sql
file alter_204_editonfly.sql was initially added on branch lams2_0_3_fixes.

fix roles import using getSession() to check whether user is sysadmin

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

make roles import work with new thread; fix console log message when roles couldn't be assigned; fix wrong key used for jsp error message

changed to only fork a thread if number of rows in spreadsheet is > 500 (so small spreadsheets don't have to wait for status page's first update if<5 seconds)

removing accidentally committed file

    • -15
    • +0
    /lams_admin/web/import/importStatus.jsp
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.

    • -105
    • +1
    /lams_admin/conf/xdoclet/filter-mappings.xml
    • -2
    • +19
    /lams_admin/web/import/importGroups.jsp
    • -0
    • +15
    /lams_admin/web/import/importStatus.jsp
    • -1
    • +7
    /lams_admin/web/import/importexcel.jsp
    • -0
    • +55
    /lams_admin/web/import/status.jsp
Updated generic-dao from 0.8 to 0.9. New version no longer has init() method.

Missed adding the system tool for the System Gate. As a result, if the user tries to go to the gate, they just get the index screen. The problem will have gone out in the Windows upgrader. Doing this fix now and will be okay in the Unix upgrader.

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.

Updating Wizard files for RAMS

LDEV-881: Another attempt to get rid of the java.lang.ArrayIndexOutOfBoundsException: 1 warning. This change should avoid many warnings coming out of Tomcat - not what we really wanted but we need to get rid of the "java.lang.ArrayIndexOutOfBoundsException: 1" warning as it really clutters the logs.

    • -2
    • +2
    /lams_build/conf/windows/jboss/log4j.xml
LDEV-1261 remove import spreadsheet actions from customised hibernate filter - need to enumerate each url in lams_admin that requires the filter from now on

    • -2
    • +102
    /lams_admin/conf/xdoclet/filter-mappings.xml
Updated generic-dao from 0.8 to 0.9