Damian Mooyman
|
34ac228029
|
BUG Fix issue with assertListEquals() ignoring field getters
|
2019-01-11 11:35:11 +13:00 |
|
Robbie Averill
|
280222abbe
|
Merge branch '4.1' into 4.2
# Conflicts:
# docs/en/05_Contributing/05_Making_A_SilverStripe_Core_Release.md
|
2019-01-08 12:22:20 +01:00 |
|
Robbie Averill
|
802261aa4b
|
Merge branch '4.0' into 4.1
# Conflicts:
# docs/en/05_Contributing/05_Making_A_SilverStripe_Core_Release.md
|
2019-01-08 12:21:27 +01:00 |
|
Daniel Hensby
|
1644765a9f
|
Rebase against satis changes (#8298)
|
2018-12-13 16:49:12 +13:00 |
|
Damian Mooyman
|
22314de559
|
DOCS Update security release docs / satis instructions (#7681)
* DOCS Update security release docs / satis instructions
* Update based on testing
|
2018-12-13 15:50:50 +13:00 |
|
Aaron Carlino
|
ab116cd5d9
|
Merge branch '4.1' into 4.2
|
2018-12-12 15:56:53 +13:00 |
|
Aaron Carlino
|
4ff891fc87
|
Add changelog
|
2018-12-12 14:21:23 +13:00 |
|
Aaron Carlino
|
2f9dae2c71
|
Add changelog
|
2018-12-12 14:11:21 +13:00 |
|
Aaron Carlino
|
00e996f164
|
Add changelog
|
2018-12-12 13:47:17 +13:00 |
|
Aaron Carlino
|
9939719ae3
|
Update translations
|
2018-12-12 12:50:47 +13:00 |
|
Aaron Carlino
|
90a50649dd
|
Update translations
|
2018-12-12 12:34:51 +13:00 |
|
Aaron Carlino
|
fed9afb046
|
Update translations
|
2018-12-12 12:21:17 +13:00 |
|
Robbie Averill
|
fecedc2d98
|
[SS-2018-020] Ensure that table names are escaped to prevent possible SQL injection
|
2018-12-11 20:56:40 +13:00 |
|
Robbie Averill
|
48bd335648
|
[SS-2018-020] Ensure that table names are escaped to prevent possible SQL injection
|
2018-12-11 20:55:58 +13:00 |
|
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 |
|