Commit Graph

749 Commits

Author SHA1 Message Date
Loz Calver
6ba58755be
Merge pull request #652 from silverstripe/dependabot/npm_and_yarn/ssri-6.0.2
Bump ssri from 6.0.1 to 6.0.2
2021-05-04 09:17:39 +01:00
Steve Boyd
f09a1e2d09 Merge branch '3.6' into 3 2021-05-03 14:29:08 +12:00
Dylan Wagstaff
4be03364de
Merge pull request #643 from creative-commoners/pulls/3.6/explain-defaults
DOC Add explanation for default values
2021-05-02 20:54:18 +12:00
dependabot[bot]
45d1b6e55c
Bump ssri from 6.0.1 to 6.0.2
Bumps [ssri](https://github.com/npm/ssri) from 6.0.1 to 6.0.2.
- [Release notes](https://github.com/npm/ssri/releases)
- [Changelog](https://github.com/npm/ssri/blob/v6.0.2/CHANGELOG.md)
- [Commits](https://github.com/npm/ssri/compare/v6.0.1...v6.0.2)

Signed-off-by: dependabot[bot] <support@github.com>
2021-04-29 19:31:11 +00:00
Steve Boyd
7da4a01425 Merge branch '3.6' into 3 2021-04-19 16:40:12 +12:00
Steve Boyd
9f572bc999
Merge pull request #650 from armsofnoodle/featuredImage-doc-block
Add doc blocks
2021-04-09 16:43:28 +12:00
armsofnoodle
d6d57d8689 Add doc blocks for featured image and summary 2021-04-09 15:38:15 +12:00
dependabot[bot]
ef3d9ec2f6
Merge pull request #625 from silverstripe/dependabot/npm_and_yarn/npm-user-validate-1.0.1 2021-04-07 01:17:00 +00:00
dependabot[bot]
dfdcaaef4b
Bump npm-user-validate from 1.0.0 to 1.0.1
Bumps [npm-user-validate](https://github.com/npm/npm-user-validate) from 1.0.0 to 1.0.1.
- [Release notes](https://github.com/npm/npm-user-validate/releases)
- [Commits](https://github.com/npm/npm-user-validate/compare/v1.0.0...v1.0.1)

Signed-off-by: dependabot[bot] <support@github.com>
2021-04-07 00:43:59 +00:00
Steve Boyd
65f4c22e84 DOC Add explanation for default values 2021-04-07 12:14:02 +12:00
Steve Boyd
35f3da3483 Merge branch '3.6' into 3 2021-03-20 14:10:07 +13:00
Steve Boyd
53dc1df1aa
Merge pull request #635 from 3Dgoo/patch-2
FIX Ensure pagination start is not a negative number
2021-02-27 14:47:41 +13:00
3Dgoo
6f3bc628a7
Ensure pagination start is not a negative number 2021-02-25 07:25:18 +10:30
Steve Boyd
54f50eb06b
Update build status badge 2021-01-21 16:28:42 +13:00
Steve Boyd
195a9b0f83 Merge branch '3.6' into 3 2021-01-02 18:08:27 +13:00
Andre Kiste
b286244a68
Merge pull request #632 from creative-commoners/pulls/3.6/travis-shared
MNT Travis shared config, use sminnee/phpunit
2020-12-21 14:45:47 +13:00
Steve Boyd
dca5b11467 MNT Travis shared config, use sminnee/phpunit 2020-12-01 15:44:11 +13:00
Steve Boyd
a07c2bb9ca ENH Update translations 2020-11-18 12:56:01 +13:00
Maxime Rainville
5b14e0b1bd Merge branch '3.5' into 3 2020-10-22 22:51:02 +13:00
Daniel Hensby
053660e795
Merge pull request #624 from MarcioBarrientos/614-category-tag-button
Fix category and tag buttons using input groups from bootstrap
2020-10-02 10:07:35 +01:00
Marcio Barrientos
fc890d71c1 Fix category and tag buttons using input groups from bootstrap 2020-10-01 13:22:28 -06:00
Serge Latyntsev
fc51e77af3
Merge pull request #621 from wernerkrauss/fix-619
FIX forward IDs given by DataList::relation()
2020-09-08 08:15:53 +12:00
wernerkrauss
31a3c3e7d1 FIX forward IDs given by DataList::relation()
This way calling `->relation('BlogPosts')` does not return an UnsavedRelationList

fixes #619
2020-08-28 05:36:15 +02:00
Serge Latyntsev
46f2608cfa
Merge pull request #620 from wernerkrauss/patch-1
FIX: augmentLoadLazyFields doesn't work with renamed tables
2020-08-28 11:26:03 +12:00
wernerkrauss
dd8ce8b8dd FIX augmentLoadLazyFields doesn't work with renamed tables
On a project I renamed the table BlogPosts to News_Posts which led to a broken join clause.
2020-08-27 16:36:36 +02:00
Robbie Averill
8096c50130
Merge pull request #612 from creative-commoners/pulls/3.5/travis
Travis 3.5
2020-06-23 10:17:28 -07:00
Steve Boyd
8d5f020ad2 Travis 3.5 2020-06-23 12:27:34 +12:00
Maxime Rainville
92eb4f5da0 Merge branch '3.4' into 3.5 2020-06-12 14:24:02 +12:00
Maxime Rainville
44904cebf8 Merge branch '3.3' into 3.4 2020-06-12 14:21:47 +12:00
Maxime Rainville
7c338c5398 Merge branch '3.2' into 3.3 2020-06-12 14:20:26 +12:00
Maxime Rainville
e919071f82 Merge branch '3.1' into 3.2 2020-06-12 14:19:48 +12:00
Maxime Rainville
d108ccf883 Merge branch '3.0' into 3.1 2020-06-12 14:19:15 +12:00
Robbie Averill
c4d11e2510
Merge pull request #597 from creative-commoners/pulls/3.0/upgrade.widgets
Add missing widget models to db classname remapping
2019-12-13 17:54:48 -08:00
Serge Latyntcev
21c858b9d5 Merge branch '3.4' into 3 2019-11-18 11:21:20 +13:00
Andre Kiste
43861a0347
Merge pull request #598 from creative-commoners/pulls/3/upgrade-dependencies
Upgrading dependencies
2019-11-11 20:10:34 +13:00
Maxime Rainville
69395eaeaa Add jQuery dependency 2019-11-11 14:36:32 +13:00
Maxime Rainville
d1e8b518a6 Upgradeing dependencies 2019-11-08 17:33:51 +13:00
Dylan Wagstaff
6e1c77af0b Add missing widget models to db classname remapping
SilverStripe 4 has introduced namespacing, and thus ClassName field in
the database is now referring to classes that no longer exist. However
on a dev/build these will be updated so long as there is configuration
mapping the old class name to the new class name. However Blog module
here is missing the widget classes, which causes problems with
migrations. This will fix that.
2019-11-04 11:31:20 +13:00
Guy Marriott
d06fe86d54
Update translations 2019-08-20 16:37:58 +12:00
Robbie Averill
3fa6a1b45f Merge branch '3.4' into 3 2019-08-15 13:51:11 +12:00
Robbie Averill
1216106ad4 Merge branch '3.3' into 3.4 2019-08-15 13:51:04 +12:00
Robbie Averill
40eb69ef62 Use trusty distro in Travis builds 2019-08-15 13:50:58 +12:00
Robbie Averill
8db2e681a2 Merge branch '3.4' into 3 2019-08-15 09:46:26 +12:00
Robbie Averill
c134ce44c1 Switch assertions to test the end of the strings 2019-08-15 09:46:05 +12:00
Ryan Potter
14283d88b8 Set docblock for the setButtonName method, and don't invalidate localisation text. 2019-08-15 09:44:51 +12:00
Ryan Potter
651d6c1da9 Remove .idea folder from version control 2019-08-15 09:44:47 +12:00
Ryan Potter
ea2fcd0b6e Added a method to set the button name in a GridFieldAddByDBField component 2019-08-15 09:44:40 +12:00
Tim Burt
dd18648ed1 Make featured images directory configurable 2019-08-15 09:44:14 +12:00
Robbie Averill
a9a7c21751 Merge branch '3.3' into 3 2019-07-01 10:16:09 +12:00
Robbie Averill
e2bf714757 Merge branch '3.2' into 3.3 2019-07-01 10:15:47 +12:00