Commit Graph

20737 Commits

Author SHA1 Message Date
Daniel Hensby
90dae07493
Merge pull request #8335 from creative-commoners/pulls/4.2/correct-lost-password-links
FIX Message when changing password with invalid token now contains correct links to login
2018-08-20 12:22:43 +01:00
Robbie Averill
18fff5c16c Remove past tense for "log in" in expired token message 2018-08-20 22:31:23 +12:00
Robbie Averill
dbab696690 FIX Message when changing password with invalid token now contains correct links to login
The Security controller should be used to return these links rather than the
ChangePasswordHandler
2018-08-20 22:30:12 +12:00
Robbie Averill
735c87b709
Merge pull request #8327 from dhensby/pulls/4/application-json
FIX text/json is not a valid mimetype
2018-08-19 13:42:27 +12:00
Robbie Averill
4f4df135d1
Merge pull request #8333 from pine3ree/patch-3
$has_one docs
2018-08-19 13:42:00 +12:00
maks
b9922a7314
$has_one docs
The ` $has_one` can be used both for `1-to-1` and `many-to-1` relations, depending on how is configured the inverse mapping on the related class. The documentation seems to suggest that `$has_one` implies a `1-to-1` relation, but then it gives an example of a `many-to-1` relationship. Since we are focusing on `$has_one` I would also put the `Player` class before the `Team` class.
2018-08-18 15:06:08 +02:00
Robbie Averill
99d43d2211
Merge pull request #8330 from pine3ree/patch-3
convert to short array syntax
2018-08-18 09:29:23 +12:00
maks
160d595e22
fix trailing whitespace 2018-08-17 18:16:17 +02:00
maks
16217f3655
fix accidentaly deleted comma 2018-08-17 15:13:13 +02:00
maks
aa1e576a3f
convert to php 5.4+ array syntax 2018-08-17 15:03:46 +02:00
Robbie Averill
706f114aec
Merge pull request #8329 from andrewandante/patch-8
Update 07_Permissions.md
2018-08-17 14:11:48 +12:00
Andrew Aitken-Fincham
a97e22c8f1
Update 07_Permissions.md
Added `$context` to `canCreate()` to reflect actual method signature.
2018-08-17 13:46:29 +12:00
Luke Edwards
9f5b0086cb FIX Paginating a gridfield causing a change event 2018-08-17 09:35:57 +12:00
Daniel Hensby
d9154bffbf
FIX text/json is not a valid mimetype 2018-08-15 12:10:39 +01:00
Robbie Averill
0db594b2d3 FIX Remove double escaping of HTML values in print views
Print view uses the SilverStripe templating to render values which means that
values are safely escaped by default. This can be tested by chaing `$CellString`
to `$CellString.RAW` in the GridField_print.ss template to see this escaping
being disabled.

This pull request removes double escaping of HTML in strings.
2018-08-15 17:57:40 +12:00
Robbie Averill
b22f33ae84 Merge branch '4.2' into 4 2018-08-15 13:23:27 +12:00
Robbie Averill
48c6dec47d Merge branch '4.1' into 4.2 2018-08-15 13:23:07 +12:00
Robbie Averill
1ad2d6535e Merge branch '4.0' into 4.1 2018-08-15 13:22:46 +12:00
Robbie Averill
7daea920f2
Merge pull request #8310 from blueo/patch-1
Add detail to negation docs
2018-08-15 13:20:21 +12:00
Bernard Hamlin
25c84709f1 Add detail to negation docs
I felt the negation docs didn't cover checking if a value was *not* another value and didn't point out that `not` can't be combined with other operators.

[ci skip]
2018-08-15 13:19:35 +12:00
Robbie Averill
953153500d FIX Polymorphic relationship class columns have obsolete class names remapped 2018-08-15 10:40:51 +12:00
Robbie Averill
873873dc30 FIX Pass request to dummy controller before calling init 2018-08-15 10:14:25 +12:00
Robbie Averill
88d3794828
Merge pull request #8321 from scott1702/patch-4
Fix indentation on pagination guide
2018-08-14 15:39:07 +12:00
Scott Hutchinson
3bd2cbf199 DOCS indentation on pagination guide [ci skip]
For all those copy + paste fiends
2018-08-14 15:36:52 +12:00
Anh Le
68f75a9e25
Password changing notification issue on new member
With `notify_password_change = true`, new member is receiving notification email regarding password changing when they should not.
2018-08-13 14:13:05 +07:00
Michael Strong
13372f9a37
BUGFIX Installer redirect to home/ (without domain)
This fixes a bug where the installer redirects to home/ ('home' as the domain) as the url as opposed to localhost/home.

To reproduce:
* Use chrome (untested in other browsers)
* composer create project silverstripe/installer
* Run through the installer

Expected:
* Silverstripe installs and it takes you to the success page

Actual:
* SilverStripe installs and takes you to a different domain (ie. 'http://home')

The problem seems to be, any URL starting with `//` (two slashes) is normalised by the browser to an absolute URL by removing both slashes meaning `//home` becomes just `home` (as in http://home)
2018-08-06 14:48:23 +12:00
Robbie Averill
3b06385b7d
Merge pull request #8299 from nickbyfleet/patch-1
Update index.md
2018-08-01 16:32:37 +12:00
Nicholas Byfleet
6667203d73
Update index.md
Changed a sentence so that it makes sense.
2018-08-01 16:30:18 +12:00
Daniel Hensby
518f798ff8
Merge pull request #8292 from creative-commoners/pulls/4.2/fix-id-conflict
FIX Altering ID of authenticator tabs to resolve ID conflict
2018-07-31 00:35:06 +01:00
Ingo Schommer
2d6964c243
Merge pull request #8261 from open-sausages/pulls/4/secure-remember-me-cookie
NEW Option for secure "remember me" cookie
2018-07-31 09:19:15 +12:00
Daniel Hensby
4d83330981
Merge branch '4.2' into 4 2018-07-30 17:11:42 +01:00
Daniel Hensby
17dbb86257
Merge pull request #8293 from open-sausages/pulls/4.2/restore-default-delete-action-of-record-editor
FIX Restore default delete action on GridFieldConfig_RecordEditor
2018-07-30 17:00:09 +01:00
Ingo Schommer
114b0a5ea7
NEW Option for secure "remember me" cookie
Fixes #8234
2018-07-30 16:41:49 +01:00
root
9d7eefce1d Added 4.2.1 changelog 2018-07-30 14:12:55 +00:00
root
c4b2f758c1 Update translations 2018-07-30 14:12:40 +00:00
Daniel Hensby
d0598c02c5
Merge branch '4.2' into 4 2018-07-30 11:07:15 +01:00
Daniel Hensby
ec5640cbd9
Merge tag '4.2.0' into 4.2
Release 4.2.0
2018-07-30 11:04:57 +01:00
Will Rossiter
9ec77ab9d3 Check database has table before altering.
Work around to prevent several issues with silverstripe-framework#4451 and cwp#0031726.

Throws a LogicException if the table does not exist.
2018-07-30 13:14:03 +12:00
Robbie Averill
7d1ce41e49
Merge pull request #8296 from open-sausages/pulls/4/doc-update-minimum-composer-version
FIX Specify minimum composer version
2018-07-30 13:01:54 +12:00
Maxime Rainville
fde7b9ddc5 FIX Specify minimum composer version
Specify the minimal version of composer to use in upgrading guide.
2018-07-30 12:35:49 +12:00
Robbie Averill
8d1af25e27
Merge pull request #8294 from kinglozzer/manymanythrough-docs
Update many-many-through docs (closes #8290)
2018-07-27 20:56:02 +12:00
Loz Calver
ef335a8a30 Update many-many-through docs (closes #8290) 2018-07-27 09:30:13 +01:00
Maxime Rainville
85b4b48fb5 FIX Restore default delete action on GridFieldConfig_RecordEditor 2018-07-27 17:19:09 +12:00
Guy Marriott
0d90cdb05d
FIX Altering ID of authenticator tabs to resolve ID conflict 2018-07-27 16:01:52 +12:00
Ingo Schommer
36834075df
Merge pull request #8288 from open-sausages/pulls/4/recommend-install-upgrader-with-phar
BUG Recommend install of upgrader with PHAR exec.
2018-07-26 16:19:02 +12:00
Maxime Rainville
900ca9c8d7 BUG Recommend install of upgrader with PHAR exec.
Update the Upgrading guide to recommend installing of the PHAR
executable of the upgrader over using `composer glboal require`.
2018-07-26 14:41:32 +12:00
Robbie Averill
8723336b1c
Merge pull request #8287 from michalkleiner/pulls/4/update-4.2.0-changelog
Fix backtick in changelog breaking sentence formatting
2018-07-26 10:14:58 +12:00
Michal Kleiner
0035f4a907
Fix backtick in changelog breaking sentence formatting 2018-07-26 10:07:29 +12:00
Maxime Rainville
97c7caf1f1
Merge pull request #8281 from michalkleiner/pulls/4/update-php-parser-dependency
MINOR Allow version 4 of nikic/php-parser
2018-07-25 09:36:45 +12:00
Robbie Averill
aa5adaf958
Merge pull request #8282 from mspacemedia/patch-1
Make removeDuplicates() chainable
2018-07-25 08:37:04 +12:00