tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity
3,262 Commits 31 Branches 527 Tags 162 MiB
65c1c6fd20
Commit Graph

3262 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ingo Schommer
65c1c6fd20 NOTFORMERGE Fixed merge error from r91576 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@91592 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:36 +13:00
Ingo Schommer
07fc3650a3 ENHANCEMENT Pluggable password encryption through PasswordEncryptor class (#3665) (merged from r90949) 
BUGFIX Fixed password hashing design flaw in Security::encrypt_password(). Removing base_convert() packing with unsafe precision, but retaining backwards compatibilty through pluggable encryptors: PasswordEncryptor_LegacyPHPHash (#3004) (merged from r90949)
API CHANGE Deprecated Security::encrypt_passwords() (merged from r90949)
API CHANGE Deprecated Security::$useSalt, use custom PasswordEncryptor implementation (merged from r90949)
API CHANGE Removed Security::get_encryption_algorithms() (merged from r90949)
API CHANGE MySQL-specific encyrption types 'password' and 'old_password' are no longer included by default. Use PasswordEncryptor_MySQLPassword and PasswordEncryptor_MySQLOldPassword
API CHANGE Built-in number of hashing algorithms has been reduced to 'none', 'md5', 'sha1'. Use PasswordEncryptor::register() and PasswordEncryptor_PHPHash to re-add others. (merged from r90949)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@91576 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:36 +13:00
Ingo Schommer
2a1abcae2a BUGFIX Legacy password hash migration in MemberAuthenticator::authenticate() which fixes the precision problems mentioned in #3004 when a user logs in (from r90950) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@91572 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:36 +13:00
Ingo Schommer
710f701645 MINOR Moved Security::encryptallpasswords() to EncryptAllPasswordsTask (merged from r90948) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@91564 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:36 +13:00
Carlos Barberis
19bc05a9d8 BUGFIX: changed condition to display uploaded File 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@91549 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:36 +13:00
Will Rossiter
137a67845c FEATURE: added ability to upload images from site content pane. Merged via r9130, r91347, r91350, r91480 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@91496 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:36 +13:00
Luke Hudson
a2bff54f17 NOTFORMERGE revert accidental commit 91456 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@91468 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:36 +13:00
Luke Hudson
4093933fb3 Add core to project before branching 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@91456 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:36 +13:00
Sean Harvey
8b65a55b55 BUGFIX MigrateSiteTreeLinkingTask returns duplicate results from databases like MSSQL - remove any duplicates that may be around 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@91418 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:35 +13:00
Ingo Schommer
8bb3797f04 MINOR BUGFIX Disabling security token in HtmlEditorField?->FlashForm?(), its not passed in by the ajax request (merged from r91392) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@91394 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:35 +13:00
Tom Rix
8497ce85d8 MINOR merged in 91306 from trunk 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@91307 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:35 +13:00
Sean Harvey
5fc556867e MINOR Whitespace change 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@91261 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:35 +13:00
Ingo Schommer
856a7f32ab MINOR reverted changes to i18nTextCollector, and updated documentation (merged from r91211) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@91212 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:35 +13:00
Andrew O'Neil
e2a3cb2e20 BUGFIX: Return correct error when 404 page doesn't exist and page is not found. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@91209 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:35 +13:00
Ingo Schommer
654af798ee MINOR removed concurrent editing (merged from r91198) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@91204 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:35 +13:00
Ingo Schommer
88a8c04d9b BUGFIX Returning TRUE on Translatable->hasTranslation() if called on a record that is in the current locale (merged from r91032) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@91156 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:35 +13:00
Sam Minnee
c9a6d3a1b0 API CHANGE: Added Lower and Upper methods to Varchar, Text, and Enum 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@91048 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:34 +13:00
Sam Minnee
601430653a BUGFIX: Don't failover to standard value in ViewableData_Customised if the customised value is defined but isn't set. $obj->customise(array('Content'=>'')) should set Content to '' 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@91047 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:34 +13:00
Sean Harvey
f80d5edbcb BUGFIX Session::destroy() should make use of setcookie() to remove the cookie from the user, unsetting the superglobal doesn't unset from the browser 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@91045 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:33 +13:00
Sean Harvey
898f5605df FEATURE Added Session::destroy() as a means to remove the current session using session_destroy() 
ENHANCEMENT Added optional $sid parameter to Session::start() to start the session using an existing session ID


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@91044 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:33 +13:00
Ingo Schommer
4a850fe00f BUGFIX Added setup/teardown methods to SiteTreeBrokenLinksTest? to make it work with Translatable enabled (merged from r91033) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@91036 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:33 +13:00
Sam Minnee
55680174df BUGFIX: use second argument only if its an array (from r90927) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@90964 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:32 +13:00
Sam Minnee
1694546870 API CHANGE: Allow fieldList arguments to Form::loadDataFrom() and Form::saveInto(), for situations where the data passed only applies to a segment of the form. (from r90872) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@90963 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:31 +13:00
Sam Minnee
ef5ffe52a1 API CHANGE: Inserting $HiddenFields into a form template will show the input tags of all the hidden fields. (from r90871) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@90962 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:31 +13:00
Sean Harvey
3ccada55ab BUGFIX: MSSQL does not support double, using float instead (from r90928) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@90934 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:31 +13:00
Ingo Schommer
3b794bb97a MINOR Changed silverstripe.com references to silverstripe.org 
MINOR Fixed broken wiki links (#4672)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@90886 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:31 +13:00
Ingo Schommer
8cf532f623 BUGFIX Added ContentController->successfullyinstalled() to $allowed_actions 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@90876 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:31 +13:00
Sam Minnee
e3fa5cae7f BUGFIX: Fix Form.FieldMap, used when constructing forms that have the HTML explicitly specified. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90851 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-05 01:14:54 +00:00
Sam Minnee
c4581f741a BUGFIX: Allow null default on MultiEnum fields 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90850 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-05 01:14:17 +00:00
Ingo Schommer
8633b648a2 MINOR: Updating mergeinfo to ignore mergebacks 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90843 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-05 01:07:36 +00:00
Ingo Schommer
c41870203c BUGFIX: Added rewriteHashlinks = 'php' option to SSViewer so that static publisher can handle internal hashlinks properly. (from r89611) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90842 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-05 01:07:00 +00:00
Ingo Schommer
44cbd308c9 MINOR: Updating mergeinfo to ignore mergebacks 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90840 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-05 01:02:41 +00:00
Ingo Schommer
84d818eddc MINOR: Updating mergeinfo to ignore mergebacks 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90839 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-05 01:01:18 +00:00
Ingo Schommer
233a8fcd85 BUGFIX: was being passed to foreach without a check to see if it's an array or not. (from r86202) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90834 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-05 00:29:21 +00:00
Ingo Schommer
06f71f6cb5 BUGFIX: Added required javascript files (behaviour, prototype, prototype_improvements) to the Field() method of TreeSelectorField.php (from r84320) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90833 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-05 00:26:57 +00:00
Ingo Schommer
4aca266dc7 MINOR: Updating mergeinfo to ignore mergebacks 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90832 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-05 00:17:38 +00:00
Tom Rix
05d3498e22 BUGFIX WidgetArea now works. Can have multiple areas on a page, and has unit tests 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90831 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-05 00:13:56 +00:00
Sean Harvey
adf9bc89fe BUGFIX Fixed Text::scaffoldFormField() showing a "Is Null" checkbox, even if nullifyEmpty is true 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90747 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-03 22:27:56 +00:00
Tom Rix
8216448da3 MINOR run checks before running hasMethod, as an extension does not neccessairily have that method. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90691 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-03 02:33:53 +00:00
Tom Rix
a1fdff6910 MINOR update PermissionCheckboxSetField to look at roles on the actual group 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90677 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-03 01:00:54 +00:00
Sam Minnee
b5a5500ff4 BUGFIX: Make DataObject::dbObject('ClassName') work. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90632 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-02 06:27:00 +00:00
Sam Minnee
3611156794 BUGFIX: When deleting a WidgetArea, delete all the widgets it contains. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90595 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-02 02:00:52 +00:00
Sam Minnee
f2266dae02 BUGFIX #4609: Fixed portoguese locales in common locales list. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90554 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-31 01:39:36 +00:00
Sam Minnee
7b1076e255 BUGFIX #4617: Make delete formatted images case-insensitive. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90553 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-31 01:38:31 +00:00
Sam Minnee
57924a2c95 BUGFIX: Fixed glitch in permission code formats. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90550 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-31 00:58:16 +00:00
Sam Minnee
50831cba9a BUGFIX #2476: Rename lowercase tables to correct casing if they have been transferred from a windows box. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90548 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-31 00:38:38 +00:00
Sam Minnee
bd452e1579 BUGFIX #4063: Corrected base tag for IE6 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90547 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-31 00:16:54 +00:00
Tom Rix
33489cdc7f MINOR i18n'd a whole bunch of the new permission codes 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90493 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-30 01:43:34 +00:00
Tom Rix
3dfa7a2103 MINOR fixed ambiguous column 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90481 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-30 00:23:02 +00:00
Tom Rix
26ee7ade66 MINOR implement OnlyAdminCanApply 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90457 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-29 22:07:44 +00:00