Commit Graph

1151 Commits

Author SHA1 Message Date
Sam Minnee
215e3a3f60 API CHANGE: Added DataDifferencer, for comparing DataObjects. Note that it won't be used by the core features until 2.3.3, but is made available here for the cmsworkflow module.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@77658 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:27 +13:00
Sam Minnee
1eee3cc54b BUGFIX: Ensure that when a page is deleted from stage or live, its descendants are also deleted.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@77461 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:26 +13:00
Sean Harvey
b57f60b4ee MINOR #3951 Allow setting test mode by calling ?isTest=1 from the URL (ronan)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@77269 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:26 +13:00
Sam Minnee
a1d17bc6e0 ENHANCEMENT: Added databse name to output of dev/build (merged from r77265)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@77266 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:26 +13:00
Sean Harvey
faf652a296 BUGFIX Fixed undefined variable $langAvail in Translatable
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@77256 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:26 +13:00
Ingo Schommer
56977a0c49 MINOR Merged from trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@77008 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:25 +13:00
Sean Harvey
59c1f0668e MINOR Removed double up of semi colon in DataObject
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@77002 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:25 +13:00
Sam Minnee
8db0532981 BUGFIX: Make requirements combiner work with jQuery
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76955 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:25 +13:00
Sean Harvey
ad7d3a5b9d BUGFIX #4038 If attempting to set a default locale that doesn't exist, throw a warning in Translatable::set_default_locale()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76949 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:25 +13:00
Sean Harvey
60623a42c3 BUGFIX Fixed case where SiteTree->getCMSFields() is missing a parent page, and thus it results in a non-object
MINOR Removed unused variable $parentPageTitle, and added missing array that wasn't defined (but used later on causing an undefined variable error)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76948 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:25 +13:00
Hamish Friedlander
c0ae471423 API: Allow specifying any callback to setMarkingFunction, not just a function name.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76942 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:24 +13:00
Sean Harvey
d710ad6784 BUGFIX Fixed ErrorPage not showing up properly due to a SQL query that was merged from trunk not compatible with 2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76896 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:24 +13:00
Sean Harvey
aeacbfda89 BUGFIX #4058 Requirements::process_combined_files() fixed small typo in the output
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76890 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:24 +13:00
Ingo Schommer
25e9e7149e MINOR Merged from trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76873 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:24 +13:00
Ingo Schommer
42972ec891 MINOR Merged from trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76867 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:24 +13:00
Ingo Schommer
dfa9f984bb MINOR Merged from trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76864 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:24 +13:00
Ingo Schommer
6af50b83e4 MINOR Merged from trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76855 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:24 +13:00
Ingo Schommer
aa51d57ada MINOR Merged from trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76842 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:23 +13:00
Normann Lou
a6d804b05d BUGFIX: typo by legacy: ViewersGroup -> ViewerGroups, EditorsGroup -> EditorGroups
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76765 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:23 +13:00
Saophalkun Ponlu
e3261ee713 MINOR: reverted r76626
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76741 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:23 +13:00
Ingo Schommer
98e53ac2f7 MINOR merged from trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76738 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:23 +13:00
Sam Minnee
c05728ad30 API CHANGE: Added SiteTree::doDeleteFromLive()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76723 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:23 +13:00
Saophalkun Ponlu
5066247b68 MINOR: removed file path and extension from image's alt attribe that accessware.co.nz complains about
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76626 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:23 +13:00
Ingo Schommer
65ae0bbd67 MINOR Merged from trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76614 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:23 +13:00
Ingo Schommer
7e2bc1458d MINOR Merged from trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76605 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:23 +13:00
Ingo Schommer
7e50b9ef1c MINOR Partially merged r70306, r74986, r75027 from trunk, seems like parts have been missed in previous merges
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76593 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:22 +13:00
Ingo Schommer
0de8502b41 MINOR Merged r70325 from trunk (which fixed #4017)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76515 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:22 +13:00
Sam Minnee
5e19dd061f BUGFIX: Escaped SiteTree.ID in LinkTracking selection so that show deleted pages would work.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76508 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:22 +13:00
Ingo Schommer
2f61a5a84f MINOR Revised Translatable documentation about TranslationMasterID
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76304 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:22 +13:00
Sam Minnee
6cdc1feab6 API CHANGE: When there are script tags in the body, put requirements script just before them, instead of at the very top of the body. Since this reduces the cost of the (sometimes necessary) script tags in the body, the notice-level error has been removed.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76207 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:22 +13:00
Sam Minnee
8b23541512 API CHANGE: Made DBField::$default_search_filter_class public rather than protected, so that it could be access with Object::get_static()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76123 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:22 +13:00
Sam Minnee
8c9b7b282c BUGFIX: Fixed extraFilter argument for SiteTree::get_by_url() when translatable is enabled
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76036 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:22 +13:00
Sam Minnee
fafca08c44 MINOR: Merged translatable URL handling fixes from trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76035 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:21 +13:00
Ingo Schommer
5620ba92d1 MINOR merged from trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@75937 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:21 +13:00
Ingo Schommer
897d4f193a MINOR Merged from trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@75916 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:21 +13:00
Sam Minnee
60958496fc BUGFIX: Automatically publish virtual pages when their source pages are published
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@75873 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:21 +13:00
Sam Minnee
f880f4e2c7 BUGFIX #3970: Make virtual page editing work.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@75869 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:21 +13:00
Sam Minnee
257496816f MINOR: Improved temporary table generation to be more test-friendly.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@75868 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:21 +13:00
Sean Harvey
45ff4b6a47 MINOR Removed extra data stuff from ComponentSet/ComplexTableField as this is not fully developed yet
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@75855 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:21 +13:00
Ingo Schommer
51523935fc MINOR Merged from 2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@75838 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:21 +13:00
Sam Minnee
98f7d9b644 ENHANCEMENT: Added page location fields in the behaviour tab, as an alternative to drag and drop
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@75814 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:20 +13:00
Sean Harvey
2387bbcbc1 BUGFIX Fixed faulty regex that broke rewritten links to be relative to the base href
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@75787 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:20 +13:00
Ingo Schommer
2c6ba80f8d MINOR merged from 2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@75783 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:20 +13:00
Sean Harvey
7a4b18090c ENHANCEMENT Allow selecting a single field from ComponentSet::getExtraData()
MINOR Removed redundant code from ComplexTableField
MINOR Added more test cases for extra data on ComplexTableFieldTest


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@75759 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:20 +13:00
Ingo Schommer
38a794b97a MINOR Merged from trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@75746 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:20 +13:00
Sean Harvey
faeed904dc #3927 ENHANCEMENT Added support for many-many auto-setting relations with a standard ComplexTableField
MINOR Added tests for ComplexTableField - ComplexTableFieldTest


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@75738 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:20 +13:00
Sam Minnee
7861a8f740 ENHANCEMENT: Added Versioned::get_including_deleted(), for querying deleted pages.
ENHANCEMENT: Added childrenMethod argument to Hierarchy tree-generation functions.
ENHANCEMENT: Added 'show deleted pages' function to CMS, with a restore page option.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@75736 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:20 +13:00
Ingo Schommer
2622c152d5 MINOR merged from trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@75708 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:19 +13:00
Ingo Schommer
42e7894f66 MINOR Merged Translatable fixes from trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@75685 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:19 +13:00
Sean Harvey
fe87ef75d4 MINOR Check that parent::__construct() is called on RequestHandler subclasses, throw a warning if not
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@75657 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:19 +13:00