lams-github

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge lams2_3 to head (continuing...)

    • -18
    • +11
    /lams_central/web/WEB-INF/web.xml
  1. … 36 more files in changeset.
merge lams2_3_jboss5 changes

LDEV-2372 Lams Testing framework works with JBoss 5 now

LDEV-2374: Data flow between tools: framework and example for Q&A -> Vote.

    • -2
    • +21
    /lams_common/db/sql/create_lams_11_tables.sql
  1. … 71 more files in changeset.
more merging (lams2_3_jboss5 new files into head)

    • -0
    • +18
    /lams_build/conf/unix/jboss/jbossweb/context.xml
    • -0
    • +173
    /lams_build/conf/unix/jboss/jbossweb/server.xml
    • -0
    • +252
    /lams_build/conf/unix/jboss/jbossweb/war-deployers-jboss-beans.xml
    • -0
    • +22
    /lams_build/conf/windows/jboss/jbossweb/context.xml
    • -0
    • +179
    /lams_build/conf/windows/jboss/jbossweb/server.xml
    • binary
    /lams_build/lib/jboss/src/jbosscache-core-3.1.0-src.zip
    • binary
    /lams_build/lib/jboss/src/jgroups-2.6.10-src.zip
    • binary
    /lams_build/lib/jbossweb/src/jbossweb-2.1.3.GA.zip
more merging lams2_3 into head

    • binary
    /lams_build/lib/lams/lams-learning.jar
    • -0
    • +57
    /lams_central/web/fckeditor/editor/plugins/paint/content.jsp
    • binary
    /lams_central/web/images/css/course_gradebook.png
  1. … 18 more files in changeset.
Merge lams2_3 to head (including things not merged last time due to eclipse's merge wizard not handling the lams2_3 start point as expected)

    • binary
    /lams_build/lib/lams/lams-monitoring.jar
  1. … 153 more files in changeset.
remove merge conflict flags

Added missing library and fixed classpaths - changes needed after code merge.

    • binary
    /lams_build/lib/jbossweb/jbossweb.jar
  1. … 3 more files in changeset.
Merge lams2_3 into head

    • -116
    • +106
    /lams_build/3rdParty.userlibraries
    • -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
    • -301
    • +140
    /lams_build/conf/unix/jboss/jboss-service.xml
    • -25
    • +0
    /lams_build/conf/unix/jboss/login-config.xml
    • -0
    • +109
    /lams_build/conf/unix/jboss/service/lams-cache-jboss-beans.xml
    • -0
    • +126
    /lams_build/conf/unix/jboss/service/treecache.xml
    • -0
    • +18
    /lams_build/conf/windows/jboss/bootstrap.slim.xml
    • -0
    • +411
    /lams_build/conf/windows/jboss/jboss-log4j.xml
    • -301
    • +140
    /lams_build/conf/windows/jboss/jboss-service.xml
  1. … 111 more files in changeset.
Merge lams2_3 into head

    • -0
    • +1
    /lams_admin/conf/xdoclet/struts-forms.xml
    • -1
    • +6
    /lams_admin/conf/xdoclet/web-settings.xml
    • -6
    • +6
    /lams_central/conf/xdoclet/servlets.xml
  1. … 22 more files in changeset.
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
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

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
    • -1
    • +1
    /temp_moodle_dev/moodle/mod/lamstwo/view.php
Commiting the files for the 2.3.1 unix patch

    • 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
    • -126
    • +9
    /win_installer/patch/src/patch.nsi
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
  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
    • +16
    /lams_central/web/css/pedagogicalPlanner.css
    • -0
    • +9
    /lams_common/db/sql/create_lams_11_tables.sql
  1. … 4 more files in changeset.
LDEV-2370 Removing the fckeditor from the mdlchat tool adapter

LDEV-2071: Upgraded HttpUnit library in TestHarness to version 1.7.

    • binary
    /TestHarness4LAMS2/123.zip
    • binary
    /TestHarness4LAMS2/lib/js-1.6R5.jar
    • binary
    /TestHarness4LAMS2/lib/jtidy-4aug2000r7-dev.jar
    • binary
    /TestHarness4LAMS2/lib/junit-3.8.1.jar
    • binary
    /TestHarness4LAMS2/lib/servlet-api-2.4.jar
    • binary
    /TestHarness4LAMS2/lib/xercesImpl-2.6.1.jar
    • binary
    /TestHarness4LAMS2/lib/xercesImpl.jar
    • binary
    /TestHarness4LAMS2/lib/xml-apis.jar
Updating httpunit library

    • binary
    /TestHarness4LAMS2/lib/httpunit.jar
Changes from Marcin

LDEV-2366 Changing the moodle wiki tool so it can handle multiple integrated moodle servers

  1. … 9 more files in changeset.
LDEV-2366 Changing the moodle quiz tool so it can handle multiple integrated moodle servers

  1. … 9 more files in changeset.
LDEV-2366 Changing the moodle lesson tool so it can handle multiple integrated moodle servers

  1. … 9 more files in changeset.