Robbie Averill
|
96bd17d469
|
Merge branch '4.1' into 4.2
|
2018-12-06 09:38:45 +00:00 |
|
Robbie Averill
|
3f532466d1
|
Merge branch '4.0' into 4.1
|
2018-12-06 09:37:52 +00:00 |
|
Guy Marriott
|
6edcbe9086
|
Merge pull request #8592 from open-sausages/pulls/4.0/tree-multiselect-null
FIX TreeMultiselectField passes value 'unchanged' as null to ORM
|
2018-12-06 14:23:48 +13:00 |
|
Serge Latyntcev
|
4ee63eb4e7
|
TreeMultiselectFieldTest / make scrutinizer happy
|
2018-11-29 12:13:56 +13:00 |
|
Serge Latyntcev
|
38f8217f01
|
TreeMultiselectFieldTest / setUp is protected in PHPUnit5
|
2018-11-29 09:55:28 +13:00 |
|
Serge Latyntcev
|
f526c794fc
|
Minor / Refactor php tests for TreeMultiselectField
|
2018-11-23 16:03:44 +13:00 |
|
Serge Latyntcev
|
9ce6d91b76
|
FIX / TreeMultiselectField::objectForKey handles list of IDs correctly
|
2018-11-22 12:11:18 +13:00 |
|
Serge Latyntcev
|
80885fc231
|
ADD php test TreeMultiselectField::testEmptyChoiceReadonly
|
2018-11-20 16:45:23 +13:00 |
|
Robbie Averill
|
ef0f9dff8a
|
Merge branch '4.1' into 4.2
|
2018-11-15 13:41:00 +02:00 |
|
Robbie Averill
|
c6e3a398c7
|
Merge branch '4.0' into 4.1
|
2018-11-15 13:40:08 +02:00 |
|
Robbie Averill
|
c181a17790
|
Merge pull request #8610 from kinglozzer/urltoken-redirect-loop
FIX: Redirect loop with multiple confirmation tokens present (fixes #8607)
|
2018-11-15 13:38:21 +02:00 |
|
Loz Calver
|
b5bae137bd
|
FIX: Redirect loop with multiple confirmation tokens present (fixes #8607)
|
2018-11-15 10:59:42 +00:00 |
|
Serge Latyntcev
|
15aaf9db9f
|
Fix a code style typo
|
2018-11-13 10:20:49 +13: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 |
|
Serge Latyntcev
|
4b4fbabed5
|
FIX TreeMultiselectField passes value 'unchanged' as null to ORM for 'ID' column key
|
2018-11-08 15:41:46 +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 |
|
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 |
|
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 |
|
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 |
|
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
|
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 |
|
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 |
|
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 |
|
Luke Edwards
|
b8bb4f7f4e
|
Merge pull request #8483 from open-sausages/pulls/4/666-fix-enter-form-submission
BUG: Fix `ENTER` not triggering form save button as `GridField`s used `submit` type buttons
|
2018-10-18 15:07:37 +13:00 |
|
bergice
|
a6a1743997
|
BUG: Fix ENTER not triggering form save button as GridFields used submit type buttons
|
2018-10-18 12:37:24 +13:00 |
|
Sam Minnée
|
7915fe0c0f
|
Merge pull request #8303 from hchokshi/pulls/4.2/viewable-data-customised-isset
Implement __isset for ViewableData_Customised
|
2018-10-06 09:37:19 +13:00 |
|
Robbie Averill
|
598e9358fd
|
Merge branch '4.1' into 4.2
|
2018-10-03 15:27:51 +02:00 |
|
Robbie Averill
|
7f685b0bea
|
Merge pull request #8423 from creative-commoners/pulls/4.2/default-locale-for-members
FIX New members now receive the configured default locale, not the current locale
|
2018-10-03 13:18:05 +02:00 |
|
Loz Calver
|
ddc86967ff
|
Merge pull request #8406 from creative-commoners/pulls/4.2/having-docblocks
DOCS Update do blocks for DataQuery::having() to reflect correct input types
|
2018-10-02 10:26:31 +02:00 |
|
Harsh Chokshi
|
60dd5f288b
|
Implement __isset for ViewableData_Customised
Resolves #8302.
|
2018-10-01 09:40:12 +13:00 |
|
Robbie Averill
|
231d6d9a9f
|
FIX New members now receive the configured default locale, not the current locale
|
2018-09-28 16:25:10 +02:00 |
|