lams-github

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Updating Greek, English, Spanish, French, Italian, Japanese, Korean, Maori, Norwegian, Turkish

Adding Russian

    • -0
    • +128
    /lams_tool_chat/conf/language/lams/ApplicationResources_ru_RU.properties
Updatig Greek, English, Spanish, Italian, Japanese, Maori, Norwegian, Russian and Turkish

Updating Greek, English, Spanish, Japanese, Norwegian

  1. … 10 more files in changeset.
Updating Greek, English, Spanish, Japanese, Maori, Norwegian

Updating Greek, English, Spanish, French, Italian, Japanese, Korean, Maori, Norwegian, Russian, Turkish, Chinese

Updating Greek, English, Spanish, Japanese, Norwegian

Adding Russian

    • -0
    • +71
    /lams_tool_nb/conf/language/lams/ApplicationResources_ru_RU.properties
Updating Greek, English, Spanish, French, Italian, Japanese, Korean, Maori, Norwegian, Russian, Turkish, Chinese, Chinese (taiwan)

Updating Greek, English, Spanish, Japanese, Maori, Norwegian

    • -100
    • +100
    /lams_tool_lamc/conf/language/lams/ApplicationResources_ja_JP.properties
Updating Greek, English, Spanish, French, Italian, Japanese, Maori, Norwegian, Polish, Russian, Turkish, Chinese, Chinese (taiwan)

    • -150
    • +150
    /lams_tool_forum/conf/language/lams/ApplicationResources_tr_TR.properties
Updating Greek, English, Spanish, Maori, Norwegian and Russian, Japanese

Updating Greek, English, Spanish, Norwegian and Russian, Japanese

Updating Greek, English, Spanish, Norwegian and Russian

Updating Japanese

latest jars

    • binary
    /lams_build/lib/lams/lams-learning.jar
rebuilt tool deployer jar - got outdated during all the merging :(

These files seemed to have been added incorrectly to lams2_3_jboss5 branch: adding them here to head (solves compile problem)

    • -0
    • +216
    /lams_tool_forum/conf/language/lams/ApplicationResources_ru_RU.properties
    • -10
    • +14
    /lams_tool_forum/web/WEB-INF/web.xml
    • -10
    • +14
    /lams_tool_sbmt/web/WEB-INF/web.xml
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