Colin Kuskie
|
0180b11064
|
Merge commit 'b8845e25fa' into WebGUI8. Up to 7.10.0
|
2010-09-22 07:58:06 -07:00 |
|
Colin Kuskie
|
0f7cb3b53f
|
Preparing for 7.9.13 release.
|
2010-08-25 11:44:02 -07:00 |
|
Colin Kuskie
|
3e8e2d452c
|
Merge branch 'master' into WebGUI8. Merged up to 7.9.12
|
2010-08-13 12:25:19 -07:00 |
|
Colin Kuskie
|
7b218942b3
|
Merge commit '63865eb39f' into WebGUI8. up to 7.9.11
|
2010-08-13 11:52:08 -07:00 |
|
Colin Kuskie
|
ca9a3bd6c7
|
Merge branch 'master' into WebGUI8, up to 7.9.10. Some tests failing due to changes in default content.
|
2010-07-27 22:55:57 -07:00 |
|
Doug Bell
|
708b47d73c
|
Merge remote branch 'upstream/WebGUI8' into 8-merge
Conflicts:
docs/gotcha.txt
docs/previousVersion.sql
lib/WebGUI/Asset/Wobject/GalleryAlbum.pm
lib/WebGUI/Asset/Wobject/Navigation.pm
lib/WebGUI/AssetLineage.pm
lib/WebGUI/Config.pm
lib/WebGUI/Form/Template.pm
lib/WebGUI/Group.pm
lib/WebGUI/VersionTag.pm
lib/WebGUI/Workflow/Activity/TrashExpiredEvents.pm
t/AdSpace.t
t/Asset/AssetExportHtml.t
t/Asset/AssetLineage.t
t/Asset/Story.t
t/Asset/Template/HTMLTemplateExpr.t
t/Asset/Wobject/Gallery/00base.t
t/Asset/Wobject/GalleryAlbum/00base.t
t/Asset/Wobject/GalleryAlbum/ajax.t
t/Asset/Wobject/InOutBoard.t
t/Asset/Wobject/StoryArchive.t
t/Asset/Wobject/Survey/ExpressionEngine.t
t/Asset/Wobject/Survey/Reports.t
t/AssetAspect/RssFeed.t
t/Auth/mech.t
t/Group.t
t/Mail/Send.t
t/Operation/AdSpace.t
t/Session/ErrorHandler.t
t/Session/Scratch.t
t/Session/Url.t
t/Shop/Cart.t
t/Shop/Pay.t
t/Shop/Ship.t
t/Shop/ShipDriver.t
t/Shop/TaxDriver/Generic.t
t/Shop/Vendor.t
t/VersionTag.t
t/lib/WebGUI/Test.pm
|
2010-07-14 18:20:00 -05:00 |
|
Graham Knop
|
80d62fccef
|
move create.sql file and remove previousVersion.sql
|
2010-07-12 14:17:54 -05:00 |
|