tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-09-16 22:46:20 +02:00
Code Issues Projects Releases Wiki Activity
12,618 Commits 30 Branches 526 Tags 154 MiB
538f09b94f
Commit Graph

12618 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Cam Spiers
ac418ce99e Feature to allow that changing the SSTemplateParser through the Injector system 
The motivation for this was to allow module developers to change what parser is used to parse SilverStripe templates.
This change enables people to compile their own version of the SilverStripe template parser and use it without modifying core files.
 2013-10-18 12:42:39 +13:00
Nathan J. Brauer
fee54c75f0 API: Change DropdownField::getSource() to not return the emptyString value. 2013-10-18 11:16:27 +13:00
Will Rossiter
1c983bc16d API: LookupField::Field now returns an HTMLText instance. 
Moved LookupField into a template, removed getSource() as the DropdownField getSource() has been simplified to just a getter
 2013-10-18 10:28:17 +13:00
Will Morgan
18cb8d721c Making cacheToFile key more resilient against mixed/nested types 2013-10-17 17:36:07 +01:00
Ingo Schommer
8051f5586c Merge pull request #2539 from dhensby/patch-2 
FIX Changing `public` statics to `private`
 2013-10-17 04:02:08 -07:00
Daniel Hensby
a1ad45486b FIX Changing public static $priority to private 
Deprecation error thrown in master whilst this is public
 2013-10-17 11:55:59 +01:00
Ingo Schommer
e1b7df38ef HTML attr encoding for UploadField config 
Also fixed UploadField operation with canUpload=false,
which broke the JS because no config could be found,
since the <input> field wasn't present. We can't put the data-config
attribute on the field holder, since fields can be rendered
without their field holder through FormField->SmalLFieldHolder().

Fixes https://github.com/silverstripe/silverstripe-cms/issues/874
 2013-10-17 10:55:11 +02:00
Ingo Schommer
8c527eab40 Merge pull request #2524 from tractorcow/pulls/3.2-change-level-identifiers 
API Better declaration of DataObject field change levels.
 2013-10-17 01:24:30 -07:00
Ingo Schommer
b6c16fcbf1 Merge pull request #2554 from tractorcow/pulls/3.1-moneyfield-style-fix 
BUG Fixed incorrect CSS class on MoneyField holder
 2013-10-17 01:22:01 -07:00
Ingo Schommer
15845c8547 Merge pull request #2556 from tractorcow/pulls/3.1-bug-fieldgroup-name-fix 
BUG Fixes serious issue with FieldList::addFieldsToTab failing to accept multiple field groups.
 2013-10-17 01:21:08 -07:00
Hamish Friedlander
8801a50704 FIX oembed to avoid mixed media issues 2013-10-17 17:06:40 +13:00
Damian Mooyman
24950692cd BUG Fixes serious issue with FieldList::addFieldsToTab failing to accept multiple field groups. 
Additional groups beyond the first are ignored.
Test cases included.
 2013-10-17 15:38:22 +13:00
Andrew Short
688d853a95 Merge pull request #2555 from halkyon/readme_fixes 
Use quotes around composer require argument for some shells.
 2013-10-16 18:38:58 -07:00
Sean Harvey
d7e1a1c45f Use quotes around composer require argument for some shells. 
The asterisk is a reserved character in some shells and will cause an error
if you don't put quotes around the argument, as it will be interpreted.
 2013-10-17 14:36:34 +13:00