Activity lams/

Merge lams2_3_jboss5 changes into lams2_3

Resolve conflicts from previous merge

Merge lams2_3_jboss5 changes into lams2_3

- -4
- +3
/lams_admin/.classpath
- History
- Source
- Diff
/lams_admin/.classpath
- -1
- +6
/lams_admin/conf/xdoclet/web-settings.xml
- History
- Source
- Diff
/lams_admin/conf/xdoclet/web-settings.xml
- -1
- +1
/lams_admin/web/WEB-INF/jboss-web.xml
- History
- Source
- Diff
/lams_admin/web/WEB-INF/jboss-web.xml
- -116
- +106
/lams_build/3rdParty.userlibraries
- History
- Source
- Diff
/lams_build/3rdParty.userlibraries
- -71
- +101
/lams_build/build.xml
- History
- Source
- Diff
/lams_build/build.xml
- -3
- +3
/lams_build/unix.properties
- History
- Source
- Diff
/lams_build/unix.properties
- -3
- +3
/lams_build/windows.properties
- History
- Source
- Diff
/lams_build/windows.properties
- -271
- +0
/lams_build/conf/j2ee/application_1_3.dtd
- History
- Source
- Diff
/lams_build/conf/j2ee/application_1_3.dtd
- -0
- +341
/lams_build/conf/j2ee/application_5.xsd
- History
- Source
- Diff
/lams_build/conf/j2ee/application_5.xsd
- -218
- +50
/lams_build/conf/j2ee/lams.application.xml
- History
- Source
- Diff
/lams_build/conf/.../lams.application.xml
- -222
- +54
/lams_build/conf/j2ee/rams.application.xml
- History
- Source
- Diff
/lams_build/conf/.../rams.application.xml
- -0
- +18
/lams_build/conf/unix/jboss/bootstrap.slim.xml
- History
- Source
- Diff
/lams_build/conf/.../jboss/bootstrap.slim.xml
- -69
- +0
/lams_build/conf/unix/jboss/ejb-deployer.slim.xml
- History
- Source
- Diff
/lams_build/conf/.../ejb-deployer.slim.xml
- -0
- +411
/lams_build/conf/unix/jboss/jboss-log4j.xml
- History
- Source
- Diff
/lams_build/conf/.../jboss/jboss-log4j.xml
- -395
- +0
/lams_build/conf/unix/jboss/jboss-service.slim.xml
- History
- Source
- Diff
/lams_build/conf/.../jboss-service.slim.xml
… 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)

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

Committing final changes for the 2.3.1 windows patch

Final commit for 2.3.1 patch package, removing the ol mysqlconnector

Committing some jars in lams_build for 2.3.1

LDEV-2370 removing the fckeditor from the remaining tool adapter tools

LDEV-2366 Making changes for the scorm tool

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

Commiting the files for the 2.3.1 unix patch

Committing work done to Flex Learner

small fixes for 2.3.1 patch

Committing the 2.3.1 windows patch

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.

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.

fixed patch level for core and assessment tool

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

file patch20090612_updateTo231.sql was initially added on branch lams2_3.

Undoing some changes not meant for 2.3.1 particularly for LDEV-2389

file patch0017_updateFrom23-231.sql was initially added on branch lams2_3.

updating the configuration scripts to the latest 2.3.1 versions

LDEV-2370 Removing the fckeditor from the mdlchat tool adapter

lams

Line History

Stats

Commits this week: 0

Commit Activity

52 week commits volume

Commits by day

Commits by hour

Commit calendar

Most active committers (90 days)