Will Rossiter
e6cdf09519
Merge pull request #2611 from chillu/pulls/house-rules
...
Written up some "House Rules" for the community, but particularly for the core team.
2013-10-25 17:28:35 -07:00
Ingo Schommer
f65629ab73
"House rules" docs
2013-10-25 12:49:51 +02:00
Will Rossiter
7361d0a6ac
Merge pull request #2605 from willmorgan/cachetofile-false-fix
...
Strict type check for null cache values
2013-10-24 17:49:44 -07:00
Will Morgan
ceab35a0be
Strict type check for null cache values
...
Previously, generated cache results that returned 0, '', array() etc
were being ignored. This change narrows it down to just false.
Ideally we would use a EmptyCacheHit object to be very specific for
these cases, but perhaps this approach is a bit overkill.
2013-10-24 18:01:20 +01:00
Ingo Schommer
723c4e3f4e
Merge pull request #2522 from tractorcow/pulls/3.2-gridstate-api-fix
...
API GridState_Data values can have default values specified during retrieval.
2013-10-24 04:26:16 -07:00
Damian Mooyman
b6b3cd9889
API GridState_Data values can have default values specified during retrieval.
...
Fixes issues with GridStata_Data being returned from various states when value types are necessary.
Pruning of dead code from GridFieldAddExistingAutocompleter
Documentation for GridState
2013-10-24 16:15:33 +13:00
Ingo Schommer
628b920ea7
Fixed merge error in MemberTest
2013-10-23 18:26:05 +02:00
Ingo Schommer
b56ca812dc
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
tests/security/MemberTest.php
2013-10-23 14:53:29 +02:00
Ingo Schommer
634f73c710
Merge pull request #2395 from ARNHOE/patch-1
...
i18n documentation - added note for caching in multi language modules
2013-10-23 03:02:06 -07:00
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
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
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
Ingo Schommer
8ef14d2df4
Fluent API for Email
2013-10-21 10:58:45 +02: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
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