20499 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Robbie Averill	83e461abbf	Merge branch '4.2' into 4	2018-08-27 16:15:57 +12:00
Robbie Averill	37a266f2f0	Merge branch '4.1' into 4.2	2018-08-27 16:14:24 +12:00
Scott Hutchinson	4da5569232	FIX ensure createFromVariables takes correct params on CLIRequestBuilder	2018-08-27 16:12:52 +12:00
Robbie Averill	66c09afc9c	Merge branch '4.0' into 4.1	2018-08-27 16:12:04 +12:00
Robbie Averill	3178fbf3bb	Merge pull request #8028 from andrewandante/pulls/4.0/unset_http_scheme_on_cli ... unset http scheme on CLIRequestBuilder	2018-08-27 16:11:42 +12:00
Robbie Averill	a87165c299	Merge pull request #8326 from creative-commoners/pulls/4.2/remove-double-encoding ... FIX Remove double escaping of HTML values in print views	2018-08-27 13:37:32 +12:00
Luke Edwards	6164d01d65	FIX GridField delete button to offer archive action if possible (#8325) ... * FIX GridField delete button to offer archive action if possible * Refactor archive action to versioned module * Fix GridFieldDeleteAction test	2018-08-24 13:13:32 +12:00
Robbie Averill	c459130986	Merge pull request #8323 from lekoala/patch-11 ... email rendering should not include requirements	2018-08-23 15:10:41 +12:00
Robbie Averill	050afd79c1	Merge pull request #8316 from anhld/anhld-patch-1 ... Password changing notification issue on new member	2018-08-23 14:03:17 +12:00
Thomas Portelange	27ac001d5b	FIX email rendering should not include requirements ... If no body is defined, the email is rendered according to a template. Clearing requirements prevent unnecessary styles/scripts to be included in the html (and that needs to be processed/stripped down the line).	2018-08-23 14:01:27 +12:00
Robbie Averill	f0e54363ff	Merge pull request #8340 from open-sausages/pulls/4/no-that-button ... Fix failing HTML button test step	2018-08-23 11:36:53 +12:00
Luke Edwards	1b67bb08c8	Fix failing HTML button test step	2018-08-23 11:09:17 +12:00
Robbie Averill	373326e49c	Merge pull request #8324 from creative-commoners/pulls/4.2/request-before-init ... FIX Pass request to dummy controller before calling init	2018-08-21 12:08:14 +12:00
Luke Edwards	dcebf56056	Make HTML Field button step find more lenient for conditional labels (#8328)	2018-08-21 07:44:52 +12:00
Daniel Hensby	aa153cb5c7	Merge pull request #8315 from open-sausages/pulls/4.2/changing-change ... FIX Paginating a gridfield causing a change event	2018-08-20 17:59:50 +01:00
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	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
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