Commit Graph

1020 Commits

Author SHA1 Message Date
Andrew O'Neil
23a6e4f1ac BUGFIX: Don't force SSL when running from CLI
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@98254 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:39:38 +13:00
Andrew O'Neil
e33a314256 BUGFIX: Allow percentage fields to store 100%
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@83164 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:39:38 +13:00
Michael Andrewartha
e798007f0a MINOR: fixed html image saving problem on HtmlEditorField
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@75173 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:39:38 +13:00
Sam Minnee
13547d82a1 ENHANCEMENT Added SetSize() method to Image class so that we can call it from the template
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@74212 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:39:38 +13:00
Sam Minnee
205e64eaf1 Merged r73261 from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@73401 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:39:38 +13:00
Sean Harvey
7adb9ce17d BUGFIX: Allow translation of front-end content into all languages, not just common ones (Merged from r64943)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@73367 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:39:38 +13:00
Sean Harvey
8335201279 MINOR Added TODO item for an alternative approach at looking at Text->FirstParagraph (Merged from r64274)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@73366 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:39:38 +13:00
Sean Harvey
8c2037a677 ENHANCEMENT Text->FirstParagraph?() now works for <div> containers in HTML, as you may not always have paragraph tags.
MINOR Added phpDoc comments above Text->FirstParagraph?() to note down the assumptions made with this method.

(Merged from r64271)



git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@73365 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:39:38 +13:00
Sean Harvey
4a11206b3f BUGFIX Added missing action 'DeleteImageForm' to Image::$allowed_actions
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@73319 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:39:37 +13:00
Sean Harvey
8c98055d26 BUGFIX Added missing action 'EditImageForm' to Image::$allowed_actions
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@73305 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:39:37 +13:00
Sean Harvey
1eb4aecad7 BUGFIX Fixed too strict permission checking on Image::$allowed_actions. Replaced broken * permission check with explicit method names
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@73302 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:39:37 +13:00
Sean Harvey
b5302a0f9d BUGFIX Fixed array to string conversion caused by patch committed in r73272
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@73298 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:39:37 +13:00
Sean Harvey
e9217a7c1d BUGFIX Validating $_FILES in Image::loadUploadedImage() (Original patch was applied to Upload->validate() in trunk - r73254)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@73295 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:39:37 +13:00
Sean Harvey
5f13d417ac BUGFIX Validating $_FILES in Folder::addUploadToFolder() (Original patch was applied to Upload->validate() in trunk - r73254)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@73294 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:39:37 +13:00
Sean Harvey
c0b02a2828 BUGFIX Fixed undefined variable $backURL that should've been $_REQUEST['BackURL']
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@73292 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:39:37 +13:00
Sean Harvey
4dbe5c60ee BUGFIX Using $allowed_actions in Image_Uploader (Merged from r73255)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@73280 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:39:37 +13:00
Sean Harvey
33f2996ea3 BUGFIX Validating $_FILES in File::loadUploaded (Original patch was applied to Upload->validate() in trunk - r73254)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@73279 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:39:37 +13:00
Sean Harvey
c914013287 BUGFIX Existence check for Member autologin token (Merged from r73253)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@73278 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:39:37 +13:00
Sean Harvey
2ab2acc44f BUGFIX Checking for Director::is_site_url() before redirecting in Controller->redirectBack() and MemberLoginForm (Merged from r73252)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@73276 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:39:37 +13:00
Sean Harvey
a4e1df6f7a BUGFIX Added isDev() and Permission::check() directives to DatabaseAdmin (Merged from r73251)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@73273 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:39:37 +13:00
Sean Harvey
19ceaa905a BUGFIX Fixed Director::makeRelative() to accept https:// protocol
BUGFIX Fixed GET-parameter replacement in Director::is_absolute_url()
ENHANCEMENT Added Director::is_relative_url() and Director::is_site_url()
BUGFIX Validating $_FILES array in Director::direct()

(Merged from r73250)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@73272 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:39:36 +13:00
Sam Minnee
f69463a107 Removed some notice-level errors in reporting
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@72258 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:39:36 +13:00
Will Rossiter
a76f104af1 MINOR: notice level fix for undefined var in text field
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@72084 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:39:36 +13:00
Sam Minnee
67d79a907e After a javascript validation error from a form submission, focus on the first errored field
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@69634 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:39:36 +13:00
Sam Minnee
93c98bf926 BUGFIX: Corrected layout of Security/lostpassword and Secuirty/changepassword pages to not show a glitchy main menu, ie, matches Security/login
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@69598 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:39:36 +13:00
Sam Minnee
70c960763c Corrected changed-password email layout
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@69594 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:39:36 +13:00
Andrew O'Neil
6cd3ab35bc BUGFIX: Fix readonly checkbox fields always setting the field to true
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@69138 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:39:36 +13:00
Sam Minnee
3d302182b6 Merged db/build fix for auto_increment
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@67482 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:39:36 +13:00
Andrew O'Neil
d2130a44f3 Reverted r66440 - this was causing too many bugs
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@66769 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:39:36 +13:00
Andrew O'Neil
407604eb1b Merged r57599 from branches/roa
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@66440 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:39:36 +13:00
Sam Minnee
6ae1692c27 BUGFIX: Fixed usability issue with CalendarDateField required field validation. Slightly over-coupled; resolve that in the jQuery validation rewrite.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@65490 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:39:36 +13:00
Sam Minnee
b38253c2e0 Removed 'Welcome back, FirstName', message that appears if you log-in, out, then in again
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@65488 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:39:35 +13:00
Sam Minnee
5f0f9c4801 Preserve BackURL get-variable on failed log-ins
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@65473 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:39:35 +13:00
Andrew O'Neil
304dea39d9 fix typo
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@65423 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:39:35 +13:00
Andrew O'Neil
115d2a7b06 FEATURE: Default permission failure message set can be changed
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@65263 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:39:35 +13:00
Andrew O'Neil
903326869a Merged bugfixes from asfonz branch
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@65261 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:39:35 +13:00
Sean Harvey
7b60ec00e2 BUGFIX Fixed ComplexTableField showing export link correctly
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@65258 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:39:35 +13:00
Sean Harvey
9fe82d4537 BUGFIX Fixed i18n entity problem with TableListField_Item.ss
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@65219 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:39:35 +13:00
Sam Minnee
701ae9a4d9 BUGFIX: Don't allow calling of magically added methods via URL unless explicitly listed in allowed_actions
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@64988 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:39:35 +13:00
Normann Lou
0431518314 BUGFIX: Fixed HTTP/1.0 support
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@64722 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:39:35 +13:00
Andrew O'Neil
8bd4ee733a Fix typo
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@64643 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:39:35 +13:00
Andrew O'Neil
766ce65d0b MINOR: PHP notice fixes
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@64638 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:39:35 +13:00
Andrew O'Neil
8edd31a8ed MINOR: fix php notice
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@64637 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:39:35 +13:00
Andrew O'Neil
a3d64e5304 Allow default value to be set on CountryDropdownField
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@64636 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:39:35 +13:00
Andrew O'Neil
f6aba9147d Add ability to disable 'None' option and to choose the title field in TypeDropdown
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@64635 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:39:34 +13:00
Andrew O'Neil
4c73c41ca9 BUGFIX: Allow disabling of updateCMSFields() on SiteTree so subclasses that want decorators to have access to
their added fields can call it themselves. 


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@64634 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:39:34 +13:00
Andrew O'Neil
a7bc06c656 MINOR: Fix PHP notices
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@64625 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:39:34 +13:00
Josh Kosmala
226f7b230e Show '(Choose)' text on TreeDropdownField when a non-existent object is selected, as can happen when related data is removed
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@64355 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:39:34 +13:00
Josh Kosmala
26fde80558 When calling Folder::findOrMake(), set the Title as well as the Name of new folders
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@64354 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:39:34 +13:00
Andrew O'Neil
069c4464ad Add macron about native name of maori
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@64130 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:39:34 +13:00