Commit Graph

20779 Commits

Author SHA1 Message Date
Robbie Averill
0bb94b018b FIX Remove default password validation rules before running unit tests 2018-11-13 14:09:08 +02:00
Robbie Averill
10f502f0c7 Merge branch '4.2' into 4.3 2018-11-09 11:39:05 +02:00
Robbie Averill
5b7723df7f Merge branch '4.1' into 4.2
# Conflicts:
 #	lang/fi.yml
 #	lang/nl.yml
2018-11-09 11:38:04 +02:00
Robbie Averill
df4d2bd838 Merge branch '4.0' into 4.1
# Conflicts:
 #	lang/da.yml
 #	lang/eo.yml
 #	lang/fi.yml
 #	lang/it.yml
 #	lang/nl.yml
 #	lang/sv.yml
2018-11-09 11:36:34 +02:00
Aaron Carlino
a843e136e8 Added 4.0.5 changelog 2018-11-09 11:09:07 +13:00
Aaron Carlino
1db568cdb6 Update translations 2018-11-08 16:25:41 +13:00
Robbie Averill
c3a52099e1
Merge pull request #8583 from wernerkrauss/fix-8572
Convert::memstring2bytes should return integer value
2018-11-07 19:33:40 +02:00
Robbie Averill
358cef0cdf
Merge pull request #8514 from wilr/pulls/lookup-injector
FIX use Injector for FormField::castedCopy
2018-11-07 19:20:36 +02:00
Werner M. Krauß
3f321f935a Convert::memstring2bytes should return integer value
bytes are by nature an integer

fixes #8572
2018-11-07 17:01:36 +01:00
Aaron Carlino
9c474a71b9 MINOR: Use all-inclusive 4.3.0-rc1 backlog 2018-11-07 23:41:26 +13:00
Aaron Carlino
687e8c84b1 Add changelog 2018-11-07 23:20:11 +13:00
Vagrant Default User
55674959f8 Added 4.1.3 changelog 2018-11-07 22:38:52 +13:00
Vagrant Default User
26d404ca4c Update translations 2018-11-07 21:37:35 +13:00
Aaron Carlino
a65d313fd7 Added 4.2.2 changelog 2018-11-07 19:12:38 +13:00
Aaron Carlino
74de2ce3b7 Update translations 2018-11-07 17:57:45 +13:00
Aaron Carlino
1944a5a99b Update translations 2018-11-07 16:31:27 +13:00
Loz Calver
11fe5b3adf Implement ConfirmationTokenChain to handle multiple tokens at once 2018-11-07 11:33:24 +13:00
Robbie Averill
9aabe0a0f7 [SS-2018-018] Ignore arguments in mysqli::real_connect backtrace calls 2018-11-07 11:33:24 +13:00
Loz Calver
8d7c2dafab [SS-2018-019] Add confirmation token to dev/build 2018-11-07 11:33:24 +13:00
Loz Calver
02ad0f44aa Implement ConfirmationTokenChain to handle multiple tokens at once 2018-11-07 11:32:55 +13:00
Robbie Averill
5425195238 [SS-2018-018] Ignore arguments in mysqli::real_connect backtrace calls 2018-11-07 11:32:55 +13:00
Loz Calver
af000bea9b [SS-2018-019] Add confirmation token to dev/build 2018-11-07 11:32:55 +13:00
Loz Calver
5563537cc8 Implement ConfirmationTokenChain to handle multiple tokens at once 2018-11-07 11:31:33 +13:00
Robbie Averill
214e28127f [SS-2018-018] Ignore arguments in mysqli::real_connect backtrace calls 2018-11-07 11:31:33 +13:00
Loz Calver
0610f76da0 [SS-2018-019] Add confirmation token to dev/build 2018-11-07 11:31:33 +13:00
Loz Calver
0877442c64 Implement ConfirmationTokenChain to handle multiple tokens at once 2018-11-07 11:24:51 +13:00
Robbie Averill
637b4225c6 [SS-2018-018] Ignore arguments in mysqli::real_connect backtrace calls 2018-11-07 11:24:51 +13:00
Loz Calver
3dbb10625c [SS-2018-019] Add confirmation token to dev/build 2018-11-07 11:24:51 +13:00
Robbie Averill
3c58ae009e Merge branch '4.2' into 4.3 2018-11-06 11:05:08 +01:00
Robbie Averill
22c7fa2bc9 Merge branch '4.1' into 4.2 2018-11-06 11:04:43 +01:00
Robbie Averill
6d2665d687 Merge branch '4.0' into 4.1 2018-11-06 11:04:28 +01:00
Robbie Averill
db425c76a3
Merge pull request #8573 from wernerkrauss/fix-8570
Convert::memstring2bytes should preserve -1
2018-11-06 11:02:23 +01:00
Werner M. Krauß
adafd73943 Convert::memstring2bytes should preserve -1
fixes #8570
2018-11-06 10:22:13 +01:00
Aaron Carlino
0ba275cb40 Merge branch '4.2' into 4.3 2018-11-06 15:09:01 +13:00
Aaron Carlino
e60cea8561 Merge branch '4.1' into 4.2 2018-11-06 15:08:42 +13:00
Aaron Carlino
c4bb60bc20 Merge branch '4.0' into 4.1 2018-11-06 15:08:09 +13:00
Luke Edwards
97180c2612 Fix readonly grid state always being truthy (#8562) 2018-11-02 14:28:47 +13:00
Luke Edwards
8866e7674a BUG: Fix duplicate plugins on HTML editor fields (#8559)
* BUG: Fix duplicate plugins on HTML editor fields

* Add new test
2018-11-02 12:26:53 +13:00
Maxime Rainville
5172dcbb1e
Merge pull request #8561 from open-sausages/pullss/4.0/reference-ss-object-upgrade-yml
MINOR Add a reference to SS_Object in .upgrade.yml to allow upgrade from SS3.7
2018-11-02 09:14:13 +13:00
Maxime Rainville
46e4c19070 MINOR Add a reference to SS_Object in .upgrade.yml to allow upgrade from SS3.7 2018-11-01 22:38:26 +13:00
Michael Strong
55f95b7bc8 BUGFIX many many through not sorting by join table (#8534)
* BUGFIX many many through not sorting by join table

* #8534 added docs to support many many sorting fix

* #8534 added test cases for many_many default sorting
2018-11-01 14:17:15 +13:00
Luke Edwards
c7b8b80e8b Persist GridField readonly state, add view button (#8535)
* Persist GridField readonly state, add view button

* Minor clarity fixes
2018-11-01 11:12:52 +13:00
Andre Kiste
511c368e8c
Merge pull request #8521 from open-sausages/pulls/4.3/searching-for-legacy
Add config to force legacy filter header globally
2018-10-29 14:57:21 +13:00
Luke Edwards
3284bf48d6 Fix search filtering relations and clear filters (#8477) 2018-10-26 14:43:56 +13:00
Luke Edwards
d879148bff Add config to force legacy filter header globally 2018-10-26 14:28:15 +13:00
Sam Minnée
e72fc9e3d0 FIX DataObject singleton creation (#8516)
Ensure DataObject instances are aware they are singletons so functions like populateDefaults() can be skipped. (fixes #4878)

Correctly applies https://github.com/silverstripe/silverstripe-framework/pull/7850 to the 4.x line
This has already been fixed in 3.x
2018-10-25 11:42:45 +13:00
Daniel Hensby
b47d9abd7c
Merge pull request #8488 from open-sausages/pulls/4/update-pattern-lib-doc
MINOR Update doc to explain how to use and build the pattern lib
2018-10-24 17:33:46 +01:00
Aaron Carlino
a3a4f48cb7 MINOR Update doc to explain how to use and build the pattern lib 2018-10-24 16:48:29 +13:00
Maxime Rainville
4e62698391 Add entry to change log about CMSPageHistoryController deprecation. (#8508)
* Add entry to change log about CMSPageHistoryController deprecation.

* Correct typo #8508

* Tweaking CMS History controller changelog entry #8508
2018-10-24 15:27:15 +13:00
Will Rossiter
66a404ad1a FIX use Injector for FormField::castedCopy
Allows LookupField to be replaced with user specificed classes.
2018-10-24 12:13:14 +13:00