• last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Added missing library and fixed classpaths - changes needed after code merge.

    • binary
    /lams_build/lib/jbossweb/jbossweb.jar
  1. … 3 more files in changeset.
file quartz.jar was added on branch lams2_head_wildfly on 2014-07-31 10:07:31 +0000

Merge lams2_3 into head

    • -0
    • +1
    /lams_admin/conf/xdoclet/struts-forms.xml
    • -1
    • +6
    /lams_admin/conf/xdoclet/web-settings.xml
    • -116
    • +106
    /lams_build/3rdParty.userlibraries
  1. … 148 more files in changeset.
LDEV-2184 Fixed encoding issue for characters, using xml dictionary rather than flashvar param.

    • binary
    /lams_monitoring/web/CloudWizard.swf
Remove some old conflict markers

Merge lams2_3_jboss5 changes into lams2_3

    • -22
    • +27
    /lams_tool_assessment/web/WEB-INF/web.xml
  1. … 43 more files in changeset.
Resolve conflicts from previous merge

Merge lams2_3_jboss5 changes into lams2_3

    • -1
    • +6
    /lams_admin/conf/xdoclet/web-settings.xml
    • -116
    • +106
    /lams_build/3rdParty.userlibraries
    • -271
    • +0
    /lams_build/conf/j2ee/application_1_3.dtd
    • -0
    • +341
    /lams_build/conf/j2ee/application_5.xsd
    • -218
    • +50
    /lams_build/conf/j2ee/lams.application.xml
    • -222
    • +54
    /lams_build/conf/j2ee/rams.application.xml
    • -0
    • +18
    /lams_build/conf/unix/jboss/bootstrap.slim.xml
    • -0
    • +411
    /lams_build/conf/unix/jboss/jboss-log4j.xml
  1. … 85 more files in changeset.
Committing the lams.jar and moving the 2.3.1 tag to ensure all the required classes are present

LDEV-2372 Testing framework for LAMS

First draft of testing framework.

includes testcases for all phases(authoring, learning, monitor)

except for the one that creates new lessons (cloudWizzard.swf)

    • binary
    /lams_tool_notebook/lib/flash-selenium.jar
    • binary
    /lams_tool_notebook/lib/flex-ui-selenium-0.1.1.jar
    • binary
    /lams_tool_notebook/lib/selenium-java-client-driver-sources.jar
    • binary
    /lams_tool_notebook/lib/selenium-java-client-driver-test-sources.jar
    • binary
    /lams_tool_notebook/lib/selenium-java-client-driver-tests.jar
    • binary
    /lams_tool_notebook/lib/selenium-java-client-driver.jar
    • binary
    /lams_tool_notebook/lib/selenium-server-sources.jar
    • binary
    /lams_tool_notebook/lib/selenium-server.jar
LDEV-2372 Testing framework for LAMS

First draft of testing framework.

includes testcases for all phases(authoring, learning, monitor)

except for the one that creates new lessons (cloudWizzard.swf)

file localCommonContext.xml was initially added on branch lams2_3.

Undo-ing some changes to return to 2.3 branch

    • -102
    • +0
    /lams_central/web/tutorialVideo.jsp
    • -0
    • +163
    /lams_tool_images/web/includes/css/thickbox.css
Committing final changes for the 2.3.1 windows patch

    • binary
    /win_installer/patch/assembly/lams-tool-lavidr10.jar
    • binary
    /win_installer/patch/assembly/lams-tool-lavidr10.war
Final commit for 2.3.1 patch package, removing the ol mysqlconnector

Committing some jars in lams_build for 2.3.1

    • binary
    /lams_build/lib/lams/lams-gradebook.jar
LDEV-2370 removing the fckeditor from the remaining tool adapter tools

  1. … 73 more files in changeset.
LDEV-2366 Making changes for the scorm tool

  1. … 12 more files in changeset.
Change to the quiz tool adapter so it includes the library for imports

LDEV-2366: changes to Moodle so it can pass extra parameters so it can work with multiple instances of Moodle

    • -1
    • +1
    /temp_moodle_dev/moodle/mod/lamstwo/add.php
    • -2
    • +2
    /temp_moodle_dev/moodle/mod/lamstwo/view.php
Commiting the files for the 2.3.1 unix patch

    • -2
    • +3
    /unix_installer/patch-package/build.xml
    • -10
    • +11
    /unix_installer/patch-package/readme
    • binary
    /unix_installer/patch-package/assembly/lams-admin.jar
    • binary
    /unix_installer/patch-package/assembly/lams-admin.war
    • binary
    /unix_installer/patch-package/assembly/lams-central.jar
  1. … 553 more files in changeset.
Committing work done to Flex Learner

    • -0
    • +2
    /lams_flash/src/central/flex/Learner/.flexProperties
    • -0
    • +30
    /lams_flash/src/central/flex/Learner/.project
    • -0
    • +292
    /lams_flash/src/central/flex/Learner/bin-debug/AC_OETags.js
    • -0
    • +121
    /lams_flash/src/central/flex/Learner/bin-debug/Learner.html
    • binary
    /lams_flash/src/central/flex/Learner/bin-debug/Learner.swf
  1. … 75 more files in changeset.
small fixes for 2.3.1 patch

    • binary
    /win_installer/patch/assembly/lams.jar
Committing the 2.3.1 windows patch

    • binary
    /win_installer/patch/assembly/lams-admin.jar
    • binary
    /win_installer/patch/assembly/lams-admin.war
    • binary
    /win_installer/patch/assembly/lams-central.jar
    • binary
    /win_installer/patch/assembly/lams-gradebook.jar
    • binary
    /win_installer/patch/assembly/lams-gradebook.war
    • binary
    /win_installer/patch/assembly/lams-tool-laasse10.jar
    • binary
    /win_installer/patch/assembly/lams-tool-laasse10.war
    • binary
    /win_installer/patch/assembly/lams-tool-lavote11.jar
    • binary
    /win_installer/patch/assembly/lams-tool-lavote11.war
    • binary
    /win_installer/patch/assembly/lams-tool-lawiki10.jar
    • binary
    /win_installer/patch/assembly/lams.jar
  1. … 442 more files in changeset.
LDEV-2369: Added tutorial video functionality to HEAD (previously removed from 2.3 branch).

Fixed IE > 6 bug preventing Thickbox to be centered on the screen.

    • -0
    • +102
    /lams_central/web/tutorialVideo.jsp
    • -163
    • +0
    /lams_tool_images/web/includes/css/thickbox.css
LDEV-2369: Added tutorial video functionality to HEAD (previously removed from 2.3 branch).

Fixed IE > 6 bug preventing Thickbox to be centered on the screen.

    • -0
    • +16
    /lams_central/web/css/pedagogicalPlanner.css
    • -0
    • +9
    /lams_common/db/sql/create_lams_11_tables.sql
  1. … 4 more files in changeset.
fixed patch level for core and assessment tool

    • -2
    • +2
    /lams_common/db/sql/insert_types_data.sql
    • -1
    • +1
    /lams_tool_assessment/build.properties
Undoing some changes not meant for 2.3.1 particularly for LDEV-2389.

Putting back build.xml changes in lams_central as it does not affect undesired functionality.

Updating Greek

fixing some sql and update scripts for 2.3.1

    • -1
    • +1
    /lams_common/db/sql/create_integration_tables.sql
    • -1
    • +1
    /lams_tool_assessment/db/sql/create_lams_tool_assessment.sql