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
13,090 Commits 31 Branches 527 Tags 162 MiB
e07b14f5bc
Commit Graph

13090 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ingo Schommer
d7e10e620a Merge pull request #2537 from wilr/membervalidator 
FIX: Use Injector API for managing Member_Validator instance.
 2013-10-23 03:01:15 -07:00
Ingo Schommer
943c369110 Merge pull request #2526 from clyonsEIS/3.1 
Add backwards compatibility for has_extension
 2013-10-23 02:35:00 -07:00
Ingo Schommer
3f479ad282 Merge pull request #2575 from dhensby/patch-2 
FIX #2496 `ConfirmedPasswordField` mismatch passwords saved
 2013-10-23 02:29:42 -07:00
Ingo Schommer
55729dfc27 Removed deprecated log/email logic from Debug (fixes #2573) 
Was deprecated in 2009 with a682ab9c0e,
and removed in 2012 with 9eca2d676f
 2013-10-23 11:22:34 +02:00
Ingo Schommer
3422761a41 Adjust UploadField edit form size 
Thanks @kinglozzer for getting this started.
Fixes https://github.com/silverstripe/silverstripe-cms/issues/878
Replaces https://github.com/silverstripe/silverstripe-framework/pull/2221
 2013-10-23 11:16:56 +02:00
Stephen Shkardoon
d2360ec8aa MINOR typo where display_errors wasn't checked properly 2013-10-23 22:00:05 +13:00
Ingo Schommer
0e37eaf5fa Merge pull request #2586 from ss23/3.0-staging-fix 
FIX: Move stage choosing into a pre-request filter.
 2013-10-23 01:47:57 -07:00
Ingo Schommer
6694fc5980 Merge pull request #2585 from ss23/3.1-staging-fix 
FIX: Move stage choosing into a pre-request filter.
 2013-10-23 01:47:41 -07:00
Ingo Schommer
14196fc6a3 Merge pull request #2577 from colymba/fix-cacheFilename 
image cacheFilename checks for numeric strings
 2013-10-23 01:37:00 -07:00
colymba
f89f203392 Raised minimum PHP Veresion to 5.3.3 2013-10-23 11:10:42 +03:00
colymba
46272ffb93 image cacheFilename checks for numeric strings 
using JSON_NUMERIC_CHECK json_encode flag and avoid duplicate files
creation
 2013-10-23 10:16:18 +03:00
Andrew Short
156bb87d57 FIX: Move stage choosing into a pre-request filter. 
This ensures that the correct stage is selected, even if the request
does not come through the model as controller system. This fixes an
issue where custom controllers would always be on the "Stage" stage.
 2013-10-23 18:29:13 +13:00
Andrew Short
e7c8fed6ab FIX: Move stage choosing into a pre-request filter. 
This ensures that the correct stage is selected, even if the request
does not come through the model as controller system. This fixes an
issue where custom controllers would always be on the "Stage" stage.
 2013-10-23 18:22:15 +13:00
Simon Welsh
699272a2e7 Merge pull request #2584 from ss23/patch-3 
MINOR typo where display_errors wasn't checked properly
 2013-10-22 20:34:33 -07:00
Stephen Shkardoon
696e6f65ab MINOR typo where display_errors wasn't checked properly 2013-10-23 16:32:31 +13:00
Ingo Schommer
ea5b3e4269 Merge pull request #2520 from wilr/destructivestyles 
Style destructive actions destructively
 2013-10-22 17:07:38 -07:00
Ingo Schommer
77696e207a Merge pull request #2557 from camspiers/template-parser-configurable 
Feature to allow changing the SSTemplateParser used in SSViewer
 2013-10-22 17:00:03 -07:00
Ingo Schommer
ad09d4297f Merge pull request #2582 from kinglozzer/2567-add-existing-gridfield-styling 
GridField 'Add existing' action styling improvements (fixes #2567)
 2013-10-22 11:54:17 -07:00
Ingo Schommer
6f02c5bd98 Email fluent API regression (fixes #2581) 2013-10-22 20:31:29 +02:00
Loz Calver
e9fdfb05b2 GridField 'Add existing' action styling improvements 2013-10-22 16:44:28 +01:00
Ingo Schommer
fad8926785 Better definition of "pre-release" branch in docs 2013-10-22 16:20:00 +02:00
Ingo Schommer
927dd6c606 Removed duplicate "quickfire" section in docs 2013-10-22 16:20:00 +02:00
Ingo Schommer
6f41b6fae6 Merge pull request #2566 from NicoHaase/master 
BUG: An enum field in the search panel model admin misses an option to not filter on that field
 2013-10-22 06:43:36 -07:00
Nico Haase
ab10c2ecdc BUG: An enum field in the search panel model admin misses an option to not filter on that field 2013-10-22 15:39:37 +02:00
Ingo Schommer
39efaca54f Disable "lost password" feature, breaks on "php -S" 
PHP's built-in webserver doesn't reliably expose SCRIPT_NAME,
see https://github.com/silverstripe/silverstripe-framework/issues/2580.
This breaks URL routing on /Security/passwordsent/admin%40test.com
 2013-10-22 15:26:20 +02:00
Ingo Schommer
d9aa7acfbd Merge pull request #2578 from JayDevlin/fix-session-get_timeout 
BUG Session::get_timeout()
 2013-10-22 05:56:29 -07:00
Devlin
112e08e5f2 FIX Session::get_timeout 2013-10-22 14:20:18 +02:00
Ingo Schommer
1895f289cc Merge pull request #2560 from TomSpeak/patch-2 
NEW Hook for `Member::registerFailedLogin`
 2013-10-22 11:57:21 +02:00
Ingo Schommer
f2d362b629 Merge pull request #2576 from halkyon/fulltextsearch_test 
FulltextSearchableTest doesn't clean up after itself.
 2013-10-22 01:56:29 -07:00
Sean Harvey
acaf0e40cc FulltextSearchableTest doesn't clean up after itself. 
The extension doesn't get unloaded correctly at the end of the test,
resulting in tests afterwards sometimes failing because the table
type is reset back to InnoDB.

See silverstripe/silverstripe-cms ed8ee4e9b for a similar fix done
in the cms module.
 2013-10-22 17:52:51 +13:00
mandrew
56d7c1fde2 Behat tests for lost password 2013-10-22 00:06:36 +02:00
Daniel Hensby
2a6f1f1949 FIX #2496 ConfirmedPasswordField mismatch passwords saved 
Fixes #2496

Also fixes another issue where 'Password' is hard coded as field name in `validate()`
 2013-10-21 22:27:41 +01:00
Daniel Hensby
974d575826 Allowing chaining on PasswordValidator 
Allowing chaining on `PasswordValidator`.

Also using injector pattern for `ValidationResult` instanciation
 2013-10-21 20:01:30 +01:00
Ingo Schommer
8ef14d2df4 Fluent API for Email 2013-10-21 10:58:45 +02:00
Zauberfisch
32bb98b0d7 API: DataObject->getRemoteJoinField() no longer defaults to ParentID but throws an exception instead 2013-10-21 04:11:00 +00:00
Zauberfisch
8de1ce4a56 array check to ensure getRemoteJoinField() gets an array from Config::inst()->get($remoteClass, 'has_one') (related issue: #2570) 2013-10-21 04:04:28 +00:00
Ingo Schommer
5c1a9d9da5 Using Behat EmailContext by default 2013-10-21 00:50:29 +02:00
Ingo Schommer
9b23e8c6c3 "Link type" selection in "insert link" panel 2013-10-20 22:54:02 +02:00
Ingo Schommer
97569d75d1 "Description" field visibility in "insert link" 2013-10-20 22:46:06 +02:00
Ingo Schommer
d75f545887 Clear DB caches in SecurityTest 2013-10-20 14:23:23 +02:00
Ingo Schommer
25b6175e67 Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	.travis.yml
	forms/FormField.php
 2013-10-20 13:52:56 +02:00
colymba
19928ff5e8 NEW GDBackend can save interlaced image 
Disabled by default use config GDBackend.image_interlace: 1 to enable
 2013-10-19 14:46:23 +03:00
Ingo Schommer
f532b8483b Merge remote-tracking branch 'origin/3.0' into 3.1 2013-10-19 12:01:53 +02:00
Ingo Schommer
337a29abce Merge pull request #2559 from willmorgan/cachetofile-arguments 
Making cacheToFile  key more resilient against mixed/nested types
 2013-10-18 07:22:06 -07:00
Ingo Schommer
36e7282f6f Merge pull request #2561 from TomSpeak/patch-3 
BUG FailedLoginCount reset
 2013-10-18 07:20:48 -07:00
Thomas Speak
d22ca62c6f BUG FailedLoginCount reset 
If you fail your maximum login attempts and are locked out, further failed login attempts add to your already existing FailedLoginCount as it is only reset if you log in successfully. This means that if you're locked out, then try again, one failure will automatically lock you out again, regardless of what you set your max limit to.

Example:

lock_out_after_incorrect_logins: 3
FailedLoginCount: 0

The user fails three login attempts.

lock_out_after_incorrect_logins: 3
FailedLoginCount: 3

The user is now locked out.

Lockout time passes.

The user fails their 4th login.

lock_out_after_incorrect_logins: 3
FailedLoginCount: 4

This will continue to happen until the user successfully logs in, without giving them the pre-defined amount of login attempts again due to this condition being met after every incorrect login:
```php
if($this->FailedLoginCount >= self::config()->lock_out_after_incorrect_logins) {
```

FailedLoginTestCount Test Added
 2013-10-18 13:48:11 +01:00
Thomas Speak
e8287cd2f5 NEW Hook for Member::registerFailedLogin 
Adding a hook for registerFailedLogin so that it is possible to add some custom logic when a user fails to login

Also rearranged the write as this function could hit the DB up to 3 times. Now it will me 0 or 1 times.
 2013-10-18 10:17:28 +01:00
Ingo Schommer
69c888a2ac Merge pull request #2563 from tractorcow/pulls/3.1-error-control-usage 
BUG Less misuse of error control operator (@)
 2013-10-18 02:06:32 -07:00
Che Van Lawrence
2be25e70ba Merge pull request #2545 from hafriedlander/fix/protocol_and_oembed 
FIX oembed to avoid mixed media issues
 2013-10-17 19:09:35 -07:00
Damian Mooyman
371ccca350 BUG Less misuse of error control operator (@) 
This is necessary to prevent get_last_error() from returning suppressed errors when retrieving values from nested arrays
 2013-10-18 14:30:51 +13:00