Doug Bell
|
29b1f794cd
|
fix merge problems
|
2010-07-12 15:52:38 -05:00 |
|
Doug Bell
|
babfa74209
|
Merge branch 'master' into 8-merge
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/Story.pm
lib/WebGUI/Asset/Template.pm
lib/WebGUI/Asset/Wobject/Calendar.pm
lib/WebGUI/Asset/Wobject/GalleryAlbum.pm
lib/WebGUI/Asset/Wobject/Navigation.pm
lib/WebGUI/AssetLineage.pm
lib/WebGUI/AssetTrash.pm
lib/WebGUI/Config.pm
lib/WebGUI/Form/Template.pm
lib/WebGUI/Group.pm
lib/WebGUI/Inbox.pm
lib/WebGUI/Workflow/Activity/DeleteExpiredSessions.pm
lib/WebGUI/Workflow/Activity/TrashExpiredEvents.pm
sbin/testEnvironment.pl
t/AdSpace.t
t/AdSpace/Ad.t
t/Asset/Asset.t
t/Asset/AssetExportHtml.t
t/Asset/AssetLineage.t
t/Asset/EMSSubmissionForm.t
t/Asset/Event.t
t/Asset/File/GalleryFile/Photo/00base.t
t/Asset/File/GalleryFile/Photo/comment.t
t/Asset/File/GalleryFile/Photo/download.t
t/Asset/File/GalleryFile/Photo/edit.t
t/Asset/File/GalleryFile/Photo/exif.t
t/Asset/File/GalleryFile/Photo/makeResolutions.t
t/Asset/File/GalleryFile/Photo/makeShortcut.t
t/Asset/File/Image/setfile.t
t/Asset/File/setfile.t
t/Asset/Post.t
t/Asset/Post/Thread/getAdjacentThread.t
t/Asset/Sku.t
t/Asset/Sku/ProductCollateral.t
t/Asset/Story.t
t/Asset/Template.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/GalleryAlbum/delete.t
t/Asset/Wobject/Matrix.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/Config.t
t/Group.t
t/Help/isa.t
t/International.t
t/Mail/Send.t
t/Operation/AdSpace.t
t/Operation/Auth.t
t/Pluggable.t
t/Session.t
t/Session/DateTime.t
t/Session/ErrorHandler.t
t/Session/Scratch.t
t/Session/Stow.t
t/Shop/Cart.t
t/Shop/Pay.t
t/Shop/PayDriver/ITransact.t
t/Shop/PayDriver/PayPalStd.t
t/Shop/Ship.t
t/Shop/ShipDriver.t
t/Shop/TaxDriver/EU.t
t/Shop/TaxDriver/Generic.t
t/Shop/Transaction.t
t/Shop/Vendor.t
t/VersionTag.t
t/Workflow/Activity/ArchiveOldStories.t
t/Workflow/Activity/ExpireIncompleteSurveyResponses.t
t/lib/WebGUI/Test.pm
|
2010-07-09 11:48:30 -05:00 |
|
Doug Bell
|
55dbab152c
|
fix cleanup
|
2010-07-09 11:04:20 -05:00 |
|
Doug Bell
|
1ff4a26ea4
|
test changes to updating serialize asset props
|
2010-07-01 13:11:55 -05:00 |
|
Doug Bell
|
bbc756c852
|
fix jsontable and use it for Calendar feeds
|
2010-07-01 13:11:37 -05:00 |
|
Doug Bell
|
6cf68e59a2
|
migrate to JsonTable to edit template attachments
|
2010-06-30 17:03:50 -05:00 |
|
Doug Bell
|
129016325d
|
migrate attachments to JsonTable
|
2010-06-30 15:16:04 -05:00 |
|
Colin Kuskie
|
0853a95873
|
Document per-item cart template variables relating to taxes.
|
2010-06-30 10:29:15 -07:00 |
|
Colin Kuskie
|
89e20a3073
|
Fix how the cart handles items with shipping, added to the cart by visitor. Fixes bug #11693.
|
2010-06-30 09:00:24 -07:00 |
|
Colin Kuskie
|
c5257dca0e
|
Ready for 7.9.9 development.
|
2010-06-29 22:08:11 -07:00 |
|
Colin Kuskie
|
469c2b72b4
|
Preparing for 7.9.8 release.
|
2010-06-29 20:53:03 -07:00 |
|
Colin Kuskie
|
bb2587b1ea
|
Add a new template variable to the Thingy search screen, so that List type form fields can display a better form for searching. Fixes bug #11612.
|
2010-06-29 15:14:12 -07:00 |
|
Doug Bell
|
5e7b332e67
|
fix tests by adding test keys
|
2010-06-29 15:59:04 -05:00 |
|
Colin Kuskie
|
0efc6514e3
|
Don't call asset methods on undef in the GalleryAlbum. Fixes bug #11681.
|
2010-06-29 13:50:36 -07:00 |
|
Colin Kuskie
|
40b8bd8667
|
Fix this test, so that it will pass every day of every month.
|
2010-06-29 13:46:37 -07:00 |
|
Colin Kuskie
|
5b5c100bfa
|
Remove 7.8 packages from HEAD.
|
2010-06-29 13:15:27 -07:00 |
|
Colin Kuskie
|
46b4f08de7
|
Refactor gallery CSS. Use spans instead of inline divs for rows. Add overflow settings for picture details. Fixes bug #11663.
|
2010-06-29 12:13:27 -07:00 |
|
Colin Kuskie
|
8d61e5c3d6
|
When a version tag is approved or denied, run spectre right now. Fixes bug #11671.
|
2010-06-28 14:04:46 -07:00 |
|
Colin Kuskie
|
3ea4ab8a1a
|
Fix many missing and wrong Cart template variables. Kudos to Bart Jol for tracking them down.
|
2010-06-28 11:28:16 -07:00 |
|
Doug Bell
|
121a55d65d
|
add Net::Twitter requirement
|
2010-06-28 11:00:39 -05:00 |
|
Colin Kuskie
|
385931aaab
|
Merge commit 'f2e0fb509a' into WebGUI8. Some tests still failing.
|
2010-06-27 22:32:31 -07:00 |
|
Doug Bell
|
da498182bd
|
fix docs
|
2010-06-27 22:09:07 -05:00 |
|
Doug Bell
|
26e67503e4
|
tests for TwitterLogin macro
|
2010-06-27 22:09:06 -05:00 |
|
Doug Bell
|
687c36fd27
|
add tests
|
2010-06-27 22:09:06 -05:00 |
|
Doug Bell
|
f771e3fcd4
|
create getTwitter method to help testing
|
2010-06-27 22:09:06 -05:00 |
|
Doug Bell
|
78f0be42df
|
fix sub to match doc
|
2010-06-27 22:09:06 -05:00 |
|
Doug Bell
|
52ad887163
|
make twitter handle things automatically
|
2010-06-27 22:09:06 -05:00 |
|
Doug Bell
|
4ee85e9239
|
fix key URL
|
2010-06-27 22:09:06 -05:00 |
|
Doug Bell
|
7af21286c2
|
add template package
|
2010-06-27 22:09:06 -05:00 |
|
Doug Bell
|
4e2ff6a51f
|
add i18n modules
|
2010-06-27 22:09:06 -05:00 |
|
Doug Bell
|
3abea67b66
|
add template for choose username
|
2010-06-27 22:09:05 -05:00 |
|
Doug Bell
|
dd746c21c8
|
i18n
|
2010-06-27 22:09:05 -05:00 |
|
Doug Bell
|
889fa61521
|
add docs to WebGUI::Auth::Twitter
|
2010-06-27 22:09:05 -05:00 |
|
Doug Bell
|
8d95864a7c
|
move upgrade to correct script
|
2010-06-27 22:09:05 -05:00 |
|
Doug Bell
|
03de39e25f
|
twitter api keys in settings
|
2010-06-27 22:09:05 -05:00 |
|
Doug Bell
|
a2e246705f
|
allow twitter enable/disable from settings
|
2010-06-27 22:09:05 -05:00 |
|
Doug Bell
|
f522d9e69d
|
upgrade adds twitter auth
|
2010-06-27 22:09:05 -05:00 |
|
Doug Bell
|
a50de4281c
|
add twitter login macro
|
2010-06-27 22:09:05 -05:00 |
|
Doug Bell
|
54eafd2cd6
|
Auth::Twitter works
|
2010-06-27 22:09:04 -05:00 |
|
Doug Bell
|
b34d7a0ef3
|
better diagnostic message
|
2010-06-27 22:09:04 -05:00 |
|
Doug Bell
|
34a25d1bb6
|
initial twitter auth
|
2010-06-27 22:09:04 -05:00 |
|
Doug Bell
|
9395985570
|
add test for Operation::Auth dispatch
|
2010-06-27 22:09:04 -05:00 |
|
Doug Bell
|
3c0a6aa22f
|
add test for logged-in user
|
2010-06-27 22:09:04 -05:00 |
|
Doug Bell
|
3010e79b0e
|
add test for multi-auth
|
2010-06-27 22:09:04 -05:00 |
|
Doug Bell
|
20e3aef0b5
|
begin tests
|
2010-06-27 22:09:04 -05:00 |
|
Doug Bell
|
68b2c406f7
|
add multiple auth methods and www_ methods
|
2010-06-27 22:09:04 -05:00 |
|
Colin Kuskie
|
e5b82bc861
|
Merge commit '4969f31e1f' into WebGUI8
|
2010-06-26 14:37:31 -07:00 |
|
Colin Kuskie
|
55ec1788ed
|
Test fixes for cross repo-mixup.
|
2010-06-26 13:07:53 -07:00 |
|
Colin Kuskie
|
5febc0ebbc
|
Merge commit '41575d24bb' into webgui8. Some tests still failing.
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
|
2010-06-25 23:25:26 -07:00 |
|
Colin Kuskie
|
b30491f3a6
|
Merge commit '808a866c8b' into webgui8. 7.9.4 release point
Conflicts:
docs/upgrades/packages-7.9.3/root_import_gallery-templates_default-gallery-edit-album.wgpkg
docs/upgrades/upgrade_7.9.2-7.9.3.pl
lib/WebGUI.pm
lib/WebGUI/Asset/MapPoint.pm
lib/WebGUI/Asset/Wobject/Calendar.pm
lib/WebGUI/Asset/Wobject/Gallery.pm
lib/WebGUI/Asset/Wobject/GalleryAlbum.pm
lib/WebGUI/Asset/Wobject/WikiMaster.pm
lib/WebGUI/AssetClipboard.pm
lib/WebGUI/AssetVersioning.pm
lib/WebGUI/Auth.pm
t/Asset/Asset.t
|
2010-06-25 20:08:11 -07:00 |
|