Merge commit '41575d24bb' into webgui8. Some tests still failing.

Browse source

Conflicts:
	docs/gotcha.txt
	lib/WebGUI.pm
	lib/WebGUI/Asset.pm
	lib/WebGUI/Asset/File/GalleryFile/Photo.pm
	lib/WebGUI/Asset/Post.pm
	lib/WebGUI/Asset/Template.pm
	lib/WebGUI/Asset/WikiPage.pm
	lib/WebGUI/Asset/Wobject/WikiMaster.pm
	lib/WebGUI/Cache.pm
	lib/WebGUI/Content/Setup.pm
	lib/WebGUI/Role/Asset/Subscribable.pm
	lib/WebGUI/Shop/Cart.pm
	lib/WebGUI/Shop/Pay.pm
	lib/WebGUI/Shop/PayDriver/ITransact.pm
	sbin/testEnvironment.pl
	t/Asset/WikiPage.t
	t/Shop/PayDriver.t
	t/Shop/PayDriver/ITransact.t
	t/Shop/PayDriver/Ogone.t
	t/Shop/TaxDriver/EU.t
	t/Shop/TaxDriver/Generic.t
	t/Workflow/Activity/RemoveOldCarts.t
	t/lib/WebGUI/Test.pm

...

This commit is contained in:

Colin Kuskie 2010-06-25 23:25:26 -07:00

parent b30491f3a6 41575d24bb

commit 5febc0ebbc

258 changed files with 5528 additions and 2230 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

BIN

t/supporting_collateral/orientation_1.jpg Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 402 B

BIN

t/supporting_collateral/orientation_3.jpg Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 402 B

BIN

t/supporting_collateral/orientation_6.jpg Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 402 B

BIN

t/supporting_collateral/orientation_8.jpg Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 402 B