lams-github

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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.

    • -1
    • +1
    /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

No need to keep deleting the content repository now as it the repository will overwrite the files.

Updating RAMS Monitoring

improved branch view - can add activities/transitions to branch view

add help-no-tags class for displaying help icon in pages other than authoring (namely, lams_admin)

    • -0
    • +2
    /lams_central/web/css/defaultHTML_learner.css
    • -0
    • +2
    /lams_central/web/css/defaultHTML_rtl.css
update lams:help tags to display properly

    • -1
    • +1
    /lams_admin/web/import/importGroups.jsp
    • -1
    • +1
    /lams_admin/web/import/importexcel.jsp
update lams:help tag with style attribute, mainly for lams_admin to display properly

    • -0
    • +8
    /lams_tool_notebook/web/WEB-INF/lams.tld
    • -0
    • +8
    /lams_tool_scribe/web/WEB-INF/lams.tld
LDEV-1259 bulk import groups via spreadsheet

    • -1
    • +6
    /lams_admin/conf/xdoclet/struts-forms.xml
    • binary
    /lams_admin/web/file/lams_groups_template.xls
    • -0
    • +78
    /lams_admin/web/import/importGroups.jsp
LDEV-1259 when saving organisations, check if child sets are null

LDEV-1257: Tweaking the collection tests when copying the groups - need to check that they aren't null as Hibernate may not have created empty groups yet.

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.

    • -97
    • +107
    /lams_common/db/model/lams_11.clay
    • -0
    • +16
    /lams_common/db/sql/create_lams_11_tables.sql
  1. … 4 more files in changeset.
improved transition opening branching view (adding modality) + transparent fade on unactive canvas views + minimize icon

    • binary
    /lams_flash/src/central/flash/lams_authoring.fla
first stage opening second-level (branching) canvas layer + featuring zoom transition

LDEV-1134: Dummying up a branching page for the progress engine.

    • -0
    • +106
    /lams_learning/web/branchingActivity.jsp
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.

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

    • -7
    • +26
    /lams_common/db/sql/insert_types_data.sql
LDEV-1255: Moving the code for stopping jsps caching to a new custom tag, so that it can be applied consistently across all pages. Moved the utf-8 statements to the same tag so we don't have to remember to put them in all pages.

    • -0
    • +41
    /lams_tool_chat/web/WEB-INF/tags/Head.tag
    • -0
    • +41
    /lams_tool_forum/web/WEB-INF/tags/Head.tag
    • -10
    • +0
    /lams_tool_forum/web/common/header.jsp
    • -2
    • +2
    /lams_tool_forum/web/includes/layout.jsp
  1. … 170 more files in changeset.
LDEV-1255: Moving the code for stopping jsps caching to a new custom tag, so that it can be applied consistently across all pages.

Final changes for the 2.0.3 updater/installer

    • -0
    • +115
    /win_installer/src/Functions.nsh
    • -0
    • +110
    /win_installer/src/GetLlidFolderNames.java
    • -0
    • +130
    /win_installer/src/UpdateLAMS202Chat.java
    • -43
    • +1
    /win_installer/src/updateLocales.sql
    • -471
    • +354
    /win_installer/src/updater.nsi
  1. … 4 more files in changeset.
made changes so this java class xcan communicate with the installer/updater