Commit Graph

20519 Commits

Author SHA1 Message Date
Ian Patel
759968bbe2 Fix Undefined variable: result when catch Exception 2019-04-05 11:33:01 +13:00
Robbie Averill
67d88c824b
Merge pull request #8880 from tractorcow/pulls/4.2/enum-schema-shifting
BUG Resolve issue where schema changes between enum / non-enum types
2019-04-05 11:09:02 +13:00
Damian Mooyman
6dc41e50a0
MINOR Linting fixes 2019-03-26 17:35:58 +13:00
Damian Mooyman
83ec0b69fa
BUG Resolve issue where schema changes between enum / non-enum types 2019-03-26 14:16:05 +13:00
Dan Hensby
7e34167ddf
Merge branch '4.1' into 4.2 2019-03-06 11:01:17 +00:00
Dan Hensby
625e6d5f54
Merge branch '4.0' into 4.1 2019-03-06 11:00:41 +00:00
Loz Calver
80f83b9043
Merge pull request #8843 from dhensby/pulls/4.0/doinit-comparison
FIX doInit comparison should be lowercased
2019-03-06 09:53:51 +00:00
Daniel Hensby
7416ce275b
FIX doInit comparison should be lowercased 2019-03-05 19:01:12 +00:00
Daniel Hensby
3629875e12
Merge pull request #8831 from tractorcow/pulls/4.2/fix-write-base-record
BUG Fix writeBaseRecord with unique indexes
2019-02-28 13:54:08 +00:00
Damian Mooyman
d1396b7dfe
BUG Fix writeBaseRecord with unique indexes
Fixes #6819
2019-02-27 16:40:12 +13:00
Maxime Rainville
ed013fcfbb Merge branch '4.1' into 4.2 2019-02-27 12:12:39 +13:00
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
79e44b42fa Merge branch '4.1' into 4.2 2019-02-19 08:37:07 +07: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
0758cd8416 Added 4.2.4 changelog 2019-02-19 13:43:45 +13: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
Robbie Averill
d303c2c75a
Merge pull request #8777 from open-sausages/pulls/4.2/fix-behat
4.2 / fix behat
2019-02-01 21:50:36 +02:00
Aaron Carlino
5e7402afee add behat.yml back, pathed to admin 2019-02-01 15:56:29 +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
506aa6c511
Merge pull request #8757 from kinglozzer/8754-versioned-cache-segmentation
FIX: Misconfiguration for versioned cache segmentation (fixes #8754)
2019-01-29 09:26:57 +02:00
Robbie Averill
d00c59c383 Fix tests not loading fixtures and loading themes in CWP recipe kitchen sink 2019-01-28 13:34:52 +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
Loz Calver
568be8e29b FIX: Misconfiguration for versioned cache segmentation (fixes #8754) 2019-01-25 09:33:21 +00: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
Robbie Averill
c58a75eed1
Merge pull request #8717 from tractorcow/pulls/4.2/test-assert-field
BUG Fix issue with assertListEquals() ignoring field getters
2019-01-17 21:49:08 +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
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
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