Commit Graph

20493 Commits

Author SHA1 Message Date
Dan Hensby 7e2d073dd6
Ignore assets dir that can be created on dev/build 2018-09-29 22:52:08 +01:00
Dan Hensby 3584598d7a
Minor improvements 2018-09-29 22:51:26 +01:00
Dan Hensby b0e0566c93
Formatting 2018-09-29 22:51:26 +01:00
Dan Hensby 5a3cc9503b
Formatting 2018-09-29 22:51:26 +01:00
Dan Hensby 2ef63ddbc1
Remove unused function args 2018-09-29 22:51:26 +01:00
Dan Hensby 7a18cd98e0
Improve assertion type 2018-09-29 22:51:26 +01:00
Dan Hensby 90e74a608e
Throwing and catcing an error in tests is mad 2018-09-29 22:51:26 +01:00
Dan Hensby 3c532cea0c
Minor cleanup of DirectorTest 2018-09-29 22:51:26 +01:00
Dan Hensby 3a007d52e6
Code formatting 2018-09-29 22:51:18 +01:00
Dan Hensby b3d2d4c1b1
Remove redundant code 2018-09-26 10:11:28 +01:00
Dan Hensby db43d57618
Remove commented out test 2018-09-26 10:11:28 +01:00
Dan Hensby fe5b431200
Use Member::actAs rather than setting and unsetting member 2018-09-26 10:11:20 +01:00
Dan Hensby 6b618b44c9
Remove regex in favour of simple assertContains 2018-09-26 00:36:58 +01:00
Dan Hensby cb361e8caf
Remove unused code from ControllerTest 2018-09-26 00:30:20 +01:00
Dan Hensby 15bf13daa9
Dont use willReturn assertions to assert argument types 2018-09-26 00:21:37 +01:00
Dan Hensby 7d15d0af70
Refactor email validation into provider based test 2018-09-25 23:15:18 +01:00
Luke Edwards dcebf56056 Make HTML Field button step find more lenient for conditional labels (#8328) 2018-08-21 07:44:52 +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
Daniel Hensby d9154bffbf
FIX text/json is not a valid mimetype 2018-08-15 12:10:39 +01: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 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
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
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