Commit Graph

4129 Commits

Author SHA1 Message Date
Sam Minnee
f0b1f8cec5 MINOR: Added missing file for r101867
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101868 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:09 +13:00
Sam Minnee
6892f1d196 BUGFIX #4188 simon_w: Let require tags in templates be conditional
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101867 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:09 +13:00
Sam Minnee
4864553aca BUGFIX: Recover if a manifestClassParse file doesn't have the necessary content.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101866 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:09 +13:00
Hamish Friedlander
04299df886 API CHANGE: Allow cached blocks within control and if blocks, as long as that control or if block is contained within an uncached block, not a cached block
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101833 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:09 +13:00
Sam Minnee
cfe081dd8b BUGFIX: Added allowed_actions to ContentControllerSearchExtension
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101812 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:09 +13:00
Ingo Schommer
ffde5144df MINOR Fixed JSONDataFormatter excaping (fixes #5309, thanks briley)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101811 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:09 +13:00
Will Rossiter
7fc538d4b1 BUGFIX: fixed undefined error in CTFs. BUGFIX: added action class to actions to allow the popup hook to open links
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101807 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:09 +13:00
Tom Rix
444d6d3137 BUGFIX avoid call to non-object
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101794 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:09 +13:00
Will Rossiter
9bb41119e7 BUGFIX: preserve the port value if given in HTTP::setGetVar (#5280). BUGFIX: allow username only input rather than user:pass combo.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101793 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:08 +13:00
Geoff Munn
deaa1d675e BUGFIX: disable function re-enabled
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101792 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:08 +13:00
Geoff Munn
e05f70102c BUGFIX: deprecated split function replaced
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101791 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:08 +13:00
Ingo Schommer
ec642f1fad MINOR Marked DataObject::has_own_table() as static
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101782 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:08 +13:00
Tom Rix
24514eac1b BUGFIX fix #5320
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101758 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:08 +13:00
Ingo Schommer
4bb0ef5aca MINOR Removed unnecessary console.*() from sapphire javascript files
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101753 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:08 +13:00
Ingo Schommer
c7a103c0dc MINOR Removed unnecessary "show" icons in "Roles" and "Member" ComplexTableFields
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101751 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:08 +13:00
Ingo Schommer
0e4a042ece BUGFIX Always including "Locale" field in Translatable->getCMSFields() regardless of "excluded" page types. Necessary to enable form state serialization for fields like TreeSelectorField on a VirtualPage (fixes #5269)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101747 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:08 +13:00
Ingo Schommer
d41539ad22 BUGFIX Versioned->publish() with $createNewVersion=TRUE now increases version number of in-memory object (fixes #5261)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101739 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:08 +13:00
Will Rossiter
ba88bc4419 MINOR: use red font instead of gray when displaying error
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101729 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:08 +13:00
Sean Harvey
e36c38dbc1 BUGFIX #5277 Sort of default SiteTree records is now explicitly set to avoid strange ordering set by SiteTree::onBeforeWrite for default records
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101724 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:08 +13:00
Ingo Schommer
713263b928 MINOR Fixed tab naming in Group->getCMSFields()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101718 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:07 +13:00
Ingo Schommer
227dd2375c BUGFIX Don't replace "home/" URLSegment in SiteTree->RelativeLink() if Translatable is enabled and the homepage is not on the root level (nested URLs allows you to have homepages called "en/home" and "ru/home") (fixes #5244)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101711 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:07 +13:00
Ingo Schommer
70ac42c577 MINOR Respecting folder sort order in admin/assets by adding Folder::$default_sort="Sort" (#5235)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101698 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:07 +13:00
Sean Harvey
f225418065 MINOR Removed fullstop where it wasn't needed
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101688 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:07 +13:00
Sean Harvey
83554f4102 MINOR Tidied up the layout of the Themes area of the installer slightly - now consistent helptext as other areas
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101687 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:07 +13:00
Sean Harvey
19273e2cd6 MINOR Updated CMS Admin Account text to be more precise
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101686 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:07 +13:00
Sean Harvey
98d64916ed MINOR Altered wording in installer for localised interface
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101683 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:07 +13:00
Sean Harvey
a894e5c1fe MINOR Reverted r101670 as it broke assumptions made in RedirectorPageTest
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101671 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:07 +13:00
Sean Harvey
b8520cc20c ENHANCEMENT RedirectorPage ExternalURL field now defaults to http:// to be consistent with the "Another website" option for HtmlEditorField LinkForm
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101670 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:07 +13:00
Sean Harvey
0e77cfbb09 BUGFIX #5259 RedirectorPage and HtmlEditorField TinyMCE integration now prefixes http:// if no prefix is found
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101668 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:06 +13:00
Will Rossiter
19b7bf2077 ENHANCEMENT: tidied up installer process to streamline process. Moved requirements to top and button to bottom and added visual seperation of the individual steps
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101661 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:06 +13:00
Sean Harvey
935db2a9c5 BUGFIX #5245 Sometimes page records will have a NULL ParentID value, it should be a number even if it's 0 (thanks wrossiter!)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101657 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:06 +13:00
Sean Harvey
20f0da7c05 BUGFIX #5243 Undefined Convert functions in ViewableData replaced with working versions. Thanks benediktb!
MINOR Updated ViewableDataTest to verify ViewableData changes


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101638 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:06 +13:00
Geoff Munn
fcfd9e15a1 BUGFIX: test that the class exists before running subclass tests
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101631 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:06 +13:00
Mateusz Uzdowski
89c7430600 BUGFIX: put back into the SSNavigator the archived site link (#5251)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101623 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:06 +13:00
Sean Harvey
00c6e4fa78 MINOR Made the default database directory relative to assets ".db" which is more precise than ".sqlitedb"
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101619 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:06 +13:00
Sean Harvey
5cbade7291 MINOR Made SQLite path in installer use DIRECTORY_SEPARATOR so it shows as correct on Windows using backslashes instead of forwardslashes - this is more of a cosmetic thing, as slashes can be interchanged and still parsed correctly by PHP
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101618 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:06 +13:00
Hamish Friedlander
0f2ffda4b2 BUGFIX: Explicitly specify the many_many's join table name in the join's ON match statement in ManyManyComplexTableField
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101608 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:06 +13:00
Mateusz Uzdowski
4bd3712206 BUGFIX: the function makes an assumption we are working on Draft site, and breaks if we are not. Rewritten to be stage-independent, as get_version (open #5231)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101603 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:06 +13:00
Will Rossiter
28c0d8171b MINOR: fixed notice level error
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101600 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:06 +13:00
Normann Lou
b73ffd5f47 BUGFIX: get a object inside transaction block will alway exist
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101592 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:06 +13:00
Geoff Munn
3dfeb93a78 BUGFIX: tables and column quoted properly
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101554 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:05 +13:00
Geoff Munn
06679080d8 BUGFIX: tables and column quoted properly
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101493 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:05 +13:00
Geoff Munn
f2622f7b29 BUGFIX: results sorted alphabetically for consistency
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101492 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:05 +13:00
Geoff Munn
c9a8482e11 BUGFIX: results sorted alphabetically for consistency
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101491 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:05 +13:00
Sam Minnee
5dfadd0e9c BUGFIX: HTTP::setGetVar() returns a relative URL if a relative URL is passed, to make behaviour closer to 2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101392 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:05 +13:00
Will Rossiter
5804a20a18 ENHANCEMENT: refactored requirements section to hide successful tests
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101381 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:05 +13:00
Michael Andrewartha
1baae6723b BUGFIX: disabling unused file list as feature is still buggy.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101380 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:05 +13:00
Sean Harvey
bd41a235e3 ENHANCEMENT Added links to installation introduction text for sources of help and suggested web hosts
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101378 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:05 +13:00
Sean Harvey
4a516d8eed MINOR Removed rewritest.php places in sapphire since it's no longer part of the phpinstaller/branches/2.4 package
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101353 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:05 +13:00
Sean Harvey
bc728ae194 MINOR Made reinstall message more precise by adding web.config to the files that will get overwritten
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101341 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:05 +13:00