Commit Graph

20077 Commits

Author SHA1 Message Date
Maxime Rainville
ac53f77115 Merge branch '4.0' into 4.1 2019-02-27 12:11:47 +13:00
Robbie Averill
b59aeaf802
Merge pull request #8815 from open-sausages/pulls/4.0/restore-dynamic-field-assigment
BUG Renable the ability to do dynamic assignment with DBField
2019-02-27 09:51:56 +11:00
Maxime Rainville
6ff319a0e1 BUG Implement peer review feedback, 2019-02-27 11:14:47 +13:00
Maxime Rainville
9a59f2f57d BUG Renable the ability to do dynamic assignment with DBField 2019-02-22 11:08:43 +13:00
Robbie Averill
cb7f15a681 Merge branch '4.0' into 4.1 2019-02-19 08:36:41 +07:00
Aaron Carlino
a481d004ec Added 3.7.3 changelog 2019-02-19 08:36:17 +07:00
Aaron Carlino
4eeec52b09 Added 3.6.7 changelog 2019-02-19 08:35:57 +07:00
Aaron Carlino
3f3a1884d7 Added 4.0.7 changelog 2019-02-12 21:10:53 +13:00
Maxime Rainville
95505db7d6 [SS-2018-021] Fix potential SQL vulnerability in non-scalar value hyrdation 2019-02-12 21:08:09 +13:00
Aaron Carlino
1362b20ee4 Added 4.1.5 changelog 2019-02-12 20:51:18 +13:00
Maxime Rainville
fd90cf6ceb [SS-2018-021] Fix potential SQL vulnerability in non-scalar value hyrdation 2019-02-12 20:44:17 +13:00
Aaron Carlino
3e78a4e851 Update translations 2019-02-12 16:49:52 +13:00
Aaron Carlino
1aa98e77d3 Update translations 2019-02-12 16:49:43 +13:00
Robbie Averill
a104b5b48f
Merge pull request #8769 from creative-commoners/pulls/4.0/escape_for_like
FIX Escape wildcard characters when matching database name in databaseExists
2019-02-10 08:26:28 +03:00
Robbie Averill
ce0cc381fe
Merge pull request #8790 from open-sausages/pulls/4.0/theyll-never-lesson
DOCS: Fix broken lesson links, add missing lessons
2019-02-10 08:24:36 +03:00
Aaron Carlino
c222b96af8 DOCS: Fix broken lesson links, add missing lessons 2019-02-08 14:12:25 +13:00
Guy Marriott
f918dcd36a
FIX Escape wildcard characters when matching database name in databaseExists 2019-01-30 09:31:13 +13:00
Robbie Averill
da184c9f7c
Merge pull request #8667 from mikeyc7m/patch-3
FIX: prevent shortcodeparser warnings when sitetree link includes anchors or querystrings
2019-01-29 13:49:15 +02:00
Robbie Averill
d116b9a8d2 Add test for shortcode parsing with querystring and anchor 2019-01-29 13:15:17 +02:00
mikeyc7m
0491ca03cf FIX prevent death on urls with querystrings & anchors 2019-01-29 13:15:14 +02:00
Robbie Averill
5f69063d4f
Merge pull request #8760 from creative-commoners/pulls/4.0/print-gridfield-template
FIX GridFieldPrintButton no longer assumes that children of GridField would implement their own print template
2019-01-29 09:27:49 +02:00
Robbie Averill
dc9d1b9cc0 FIX GridFieldPrintButton no longer assumes that children of GridField would implement their own print template 2019-01-28 11:45:55 +02:00
Guy Marriott
370bb6bbaa
Merge pull request #8743 from BenediktSeidl/patch-1
fix user feedback when jquery could not be loaded
2019-01-25 09:33:53 +13:00
Benedikt Seidl
d530bc2fb6 fix user feedback when jquery could not be loaded 2019-01-24 20:51:48 +01:00
Maxime Rainville
d24c4d0eda
Merge pull request #8699 from open-sausages/pulls/4.0/update-visibility
NEW: Add visibility updates to `upgrade.yml`.
2019-01-16 14:18:21 +13: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
bergice
a8f4f23c66 NEW: Add visibility updates to upgrade.yml.
This will make the `inspect` upgrader command ensure these visibilities are used
2019-01-08 11:45:18 +13: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
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
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
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
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
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