Commit graph

2557 commits

Author SHA1 Message Date
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
Colin Kuskie
3fbc109429 Update Session->Style setScript to default to text/javascript. Update the entire codebase to take advantage of it. 2010-06-24 13:07:03 -07:00
Colin Kuskie
eed390e96b Prevent type-casting warning when a Product has no price. 2010-06-23 08:45:33 -07:00
Colin Kuskie
19c2c5fa1c Remove status description from Session/Http, and update all users of setStatus. 2010-06-17 08:18:24 -07:00
Graham Knop
89d4f46a18 Merge branch 'psgi' into WebGUI8 2010-06-11 23:05:06 -05:00
Colin Kuskie
7df0cc51ed Always get a fresh copy of the survey after doing revision control. 2010-06-11 19:11:12 -07:00
Colin Kuskie
b8fc033bd7 Update the icalFeeds field to use JSON fields correctly. 2010-06-11 11:50:32 -07:00
Graham Knop
b1b1a3cc62 force scalar context in some needed places 2010-06-10 23:52:10 -05:00
Graham Knop
02af1c68f9 Merge branch 'WebGUI8' into psgi 2010-06-08 17:59:17 -05:00
Colin Kuskie
be259d803c Fix problems with assetExportHtml. The method needs to be rethought, and make check that one exists before calling it via can/DOES. Fix a problem with duplicating the session, since duplicate is not a class method. 2010-06-05 22:25:18 -07:00
Patrick Donelan
f16ba76b86 Merge branch 'WebGUI8' into psgi
Conflicts:
	sbin/testEnvironment.pl
2010-06-04 21:01:03 -04:00
Colin Kuskie
0fac75759e Actually build an array of items in getRssFeedItems. Fix several method modifiers. 2010-05-21 19:26:55 -07:00
Colin Kuskie
3870aea526 Remove deprecated methods in SyndicatedContent. 2010-05-21 19:15:22 -07:00
Colin Kuskie
bf268bc66b Fix the canEdit method in the Matrix. 2010-05-21 15:05:00 -07:00
Colin Kuskie
dab177324d Change from encode/decode to to/from in JSON, and call them explicitly. Exception handling for AJAX methods in the GalleryAlbum. 2010-05-21 13:37:06 -07:00
Colin Kuskie
7f23c286da Change newByDynamicClass to newById. 2010-05-13 13:50:04 -07:00
Graham Knop
65dfb6e683 Merge branch 'WebGUI8' into psgi 2010-05-10 17:03:17 -05:00
Colin Kuskie
ecf1c521f3 Updates for Moose. 2010-05-09 21:03:59 -07:00
Colin Kuskie
95fe1e6d52 Module use, and cache updates. 2010-05-09 18:14:27 -07:00
Colin Kuskie
057260f131 fix a ->get conversion typo. 2010-05-09 18:04:19 -07:00
Colin Kuskie
1450d1361d Fix POD problems 2010-05-07 18:27:39 -07:00
Colin Kuskie
1aeb75bce9 Fix POD whitespace problems. 2010-05-06 12:38:00 -07:00
Colin Kuskie
3e168b1c87 Trap calls to newById inside getParent. StoryArchive should use cloneFromDb. 2010-05-05 11:50:31 -07:00
Colin Kuskie
491c302309 Finish rework of hierarchial keywords/categories. 2010-05-04 20:43:50 -07:00
Colin Kuskie
960ff2287c Tests, bugfixes, and adding synopsis to the byKeyword template. 2010-05-04 15:50:14 -07:00
Colin Kuskie
39b44504c3 Finish wiki sub-category API code, with upgrade sub and tests. 2010-05-04 15:04:27 -07:00
Colin Kuskie
7dd02d6108 Pull hierarchial keywords from the wiki, instead of pages in it. 2010-05-03 21:28:28 -07:00
Colin Kuskie
3ea9f29a3f add a method to save the new keywords from the from in www_byKeyword. 2010-05-03 19:29:55 -07:00
Colin Kuskie
5afdefe4fb Foundational work for wiki sub-keywords. 2010-05-03 18:38:38 -07:00
Colin Kuskie
1c70821a6f Really make the wiki sort by popularity (then lineage). Fixes bug #11537 2010-05-02 01:18:26 -07:00
Doug Bell
cb3f83a93e Merge branch '8' into psgi
Conflicts:
	lib/WebGUI/Asset/Template.pm
	lib/WebGUI/Session/Scratch.pm
2010-04-21 13:03:03 -05:00
Colin Kuskie
7273f705e0 Provide defaults for the workflowId and the zoom. 2010-04-20 12:20:36 -07:00
Colin Kuskie
ea9bc5b571 Fix WebGUI::Utility method used in WikiMaster. 2010-04-20 10:43:30 -07:00
Graham Knop
0efa62a73c asset immutability 2010-04-19 18:57:01 -05:00
Graham Knop
a1d8dbd67a more object destruction cleanups 2010-04-19 18:57:01 -05:00
Graham Knop
c4204eff89 clean up more uses of ->get 2010-04-19 18:57:01 -05:00
Doug Bell
b767824711 cache: s/delete/remove/ 2010-04-19 18:51:10 -05:00
Doug Bell
165be5b389 remove eval{} from caching code 2010-04-19 18:41:13 -05:00
Doug Bell
e60c6fdc91 Merge remote branch 'spunky/rfe620'
Conflicts:
	docs/changelog/7.x.x.txt
	docs/upgrades/packages-7.9.3/root_import_gallery-templates_default-gallery-edit-album.wgpkg
2010-04-19 17:25:30 -05:00
kimd
dd72159db0 Added buttons to the GalleryAlbum edit view so users can rotate photos by 90 deg (RFE 620). 2010-04-19 22:24:09 +02:00
Doug Bell
92cd204b31 fix composite cache keys and remove setByHttp 2010-04-19 14:59:24 -05:00
Colin Kuskie
cd0fbf8ecb Remove subclassed methods validParent and addChild from GalleryFile and Gallery. 2010-04-19 10:22:50 -07:00
Colin Kuskie
b4f7bb4334 Do not prevent Assets from being added as children by subclassing addChild. It doesn't prevent paste from working. Fixes bug #11525. 2010-04-19 09:07:53 -07:00
Colin Kuskie
54583d2308 Fix a POD whitespace problem. 2010-04-19 08:37:37 -07:00
Graham Knop
8186754b86 asset immutability 2010-04-18 18:50:56 -05:00
Graham Knop
83dbe97687 more object destruction cleanups 2010-04-18 18:48:59 -05:00
Graham Knop
22619cfb9a clean up more uses of ->get 2010-04-18 18:47:16 -05:00
Colin Kuskie
55d2e510d6 Add top-level keywords, which allows for hierarchial categorization of wiki pages. 2010-04-16 20:46:55 -07:00
Graham Knop
5122518652 remove useless DESTROYs 2010-04-16 20:57:00 -05:00