Commit Graph

4706 Commits

Author SHA1 Message Date
Guy Sartorelli
da1a1489af
Merge branch '4' into 5 2022-08-31 14:07:09 +12:00
Steve Boyd
bd74939c14
Merge pull request #154 from creative-commoners/pulls/4/rescue-master-psr12
Rescue Master Branch PR: PSR12 compliance
2022-08-29 18:15:29 +12:00
Robbie Averill
01f2663179
Use Injector to instantiate new base report instances 2022-08-26 13:53:16 +12:00
Robbie Averill
213f7167a6
ENH Fix phpcs violations 2022-08-26 13:53:08 +12:00
Robbie Averill
c5f42d99a3
MNT Update phpcs ruleset to use PSR-12 as a base 2022-08-26 13:48:51 +12:00
Guy Sartorelli
050c683f8b
Merge pull request #151 from creative-commoners/pulls/5/major-deps
DEP Update core dependencies for CMS 5
2022-08-09 09:48:40 +12:00
Steve Boyd
65bc353f43 DEP Update core dependencies for CMS 5 2022-08-04 17:43:22 +12:00
Steve Boyd
d21503c88c Merge branch '4.11' into 4 2022-08-02 18:38:12 +12:00
Steve Boyd
eacecdbb56 Merge branch '4.10' into 4.11 2022-08-02 18:38:08 +12:00
Guy Sartorelli
c0bdbc3d3b
Merge pull request #150 from creative-commoners/pulls/4.10/standardise-modules
MNT Standardise modules
2022-08-02 14:29:45 +12:00
Steve Boyd
567124b34a MNT Standardise modules 2022-08-01 15:36:42 +12:00
Guy Sartorelli
bd7fb5a45d Merge branch '4.11' into 4 2022-07-11 11:24:14 +12:00
Guy Sartorelli
f18dd784e5 Merge branch '4.10' into 4.11 2022-07-11 11:24:02 +12:00
Guy Sartorelli
86d338680a
Merge pull request #149 from creative-commoners/pulls/4.10/module-standards
MNT Use GitHub Actions CI
2022-07-05 16:31:12 +12:00
Steve Boyd
fca925673f MNT Use GitHub Actions CI 2022-07-05 16:04:25 +12:00
Guy Sartorelli
8e3d6cb3eb
Merge pull request #148 from creative-commoners/pulls/4/php81
ENH PHP 8.1 compatibility
2022-04-22 16:18:26 +12:00
Steve Boyd
0bceb0903c ENH PHP 8.1 compatibility 2022-04-13 17:39:46 +12:00
Guy Sartorelli
6d565028c8
ENH Prefer dependency injection for GridFieldComponents. (#147)
GridFieldComponents packaged with silverstripe/framework are injectable as of 4.11.0
2022-03-04 10:13:45 +13:00
Maxime Rainville
ede88ee491
Merge pull request #146 from creative-commoners/pulls/4/php74
DEP Set PHP 7.4 as the minimum version
2022-02-18 22:05:50 +13:00
Steve Boyd
013c5d74cf DEP Set PHP 7.4 as the minimum version 2022-02-10 17:31:38 +13:00
GuySartorelli
375c31904f
ENH Add configuration to cap report counts for large datasets. (#139)
Opted not to return the result from `getCount()` directly since the PHPDoc says this returns an int (even though it technically already returns a string if the report isn't set up correctly...)
2022-01-31 17:20:11 +13:00
Steve Boyd
0cb265434a Merge branch '4.10' into 4 2021-12-22 10:12:27 +13:00
Maxime Rainville
411a98e45b
Merge pull request #143 from creative-commoners/pulls/4.10/dynamic
MNT Rely on dynamic REQUIRE_RECIPE
2021-12-14 10:30:03 +13:00
Steve Boyd
cb71f6b7f2 MNT Rely on dynamic REQUIRE_RECIPE 2021-12-13 11:47:20 +13:00
Maxime Rainville
6dd0627678
Merge pull request #142 from creative-commoners/pulls/4/dms
MNT Remove polyfill
2021-11-09 10:57:04 +13:00
Steve Boyd
1b2a9a8926 MNT Remove polyfill 2021-11-05 13:23:15 +13:00
Maxime Rainville
3ab86f3d0a
Merge pull request #141 from creative-commoners/pulls/4/sapphire-test-nine
API phpunit9 support
2021-10-28 00:00:38 +13:00
Steve Boyd
9f76ec2a43 API phpunit9 support 2021-10-27 17:52:11 +13:00
Steve Boyd
908dc49dca Merge branch '4.9' into 4 2021-09-06 16:08:45 +12:00
Steve Boyd
22839ec8c2
MNT Update REQUIRE_RECIPE 2021-09-06 16:06:23 +12:00
Steve Boyd
8098a7c61f Merge branch '4.8' into 4 2021-05-17 16:34:51 +12:00
Steve Boyd
1d9940aab0 MNT Remove COMPOSER_ROOT_VERSION 2021-05-17 16:34:21 +12:00
Steve Boyd
27288dc508 Update translations 2021-05-17 10:53:21 +12:00
Steve Boyd
e101f1e034
Update build status badge 2021-01-21 16:07:28 +13:00
Steve Boyd
90bdc6f3ce Merge branch '4.7' into 4 2020-11-11 17:02:56 +13:00
Steve Boyd
82b5059265
Merge pull request #132 from creative-commoners/pulls/4.7/phpcs
MNT Update how phpcs is called
2020-11-11 13:02:46 +13:00
Serge Latyntcev
da8bc5c240 MNT Travis shared config 2020-11-11 11:35:21 +13:00
Steve Boyd
ee4c391682 MNT Update how phpcs is called 2020-11-06 17:11:09 +13:00
Maxime Rainville
b62a6c66d1 Merge branch '4.6' into 4 2020-11-02 13:33:44 +13:00
Andre Kiste
466ec19b60
Merge pull request #131 from creative-commoners/pulls/4/php8
MNT PHP8 support
2020-10-13 12:58:20 +13:00
Serge Latyntcev
3314f95da6 MNT PHP8 support 2020-10-13 08:55:47 +13:00
Guy Marriott
8f40ddb5eb
Merge pull request #130 from robbieaverill/pulls/4.7/exceptions
ENH Replace E_USER_ERROR errors with exceptions
2020-10-04 16:58:15 -07:00
Robbie Averill
6ed13f7e07
Merge pull request #128 from creative-commoners/pulls/4.6/travis
Update travis 4.6
2020-09-24 17:12:23 -07:00
Robbie Averill
9b9e673e4b ENH Replace E_USER_ERROR errors with exceptions 2020-09-24 17:11:47 -07:00
Steve Boyd
b0cb0b695e Update travis 2020-06-23 15:39:47 +12:00
Robbie Averill
275a1bc7f4
Merge pull request #127 from open-sausages/pulls/4/set-up-47-dev
Merge up 1.6 branch + update travis to target x-dev branches
2020-06-04 09:09:45 -07:00
Maxime Rainville
f931dc37df Update travis config to target x-dev branches 2020-06-04 15:17:53 +12:00
Robbie Averill
cb55795013
Merge pull request #126 from open-sausages/pulls/4.6/update-travis
Target 4.6 minor branches in build
2020-05-28 09:17:45 -07:00
Maxime Rainville
0499717d7c Target 4.6 minor branches in build 2020-05-28 18:17:07 +12:00
Garion Herman
f681448dbb Merge branch '4.5' into 4 2020-02-28 15:06:41 +13:00