Guy Sartorelli
603ffc064b
Merge branch '4.13' into 4
2023-09-18 11:32:55 +12:00
Guy Sartorelli
9372698a6b
Merge pull request #361 from creative-commoners/pulls/4.13/exclude
...
MNT Fix exclude node
2023-09-07 17:16:32 +12:00
Steve Boyd
3887540da7
MNT Fix exclude node
2023-09-07 14:14:12 +12:00
Guy Sartorelli
635d8be6fc
Merge branch '4.13' into 4
2023-08-29 10:28:52 +12:00
Guy Sartorelli
036f173a38
MNT Run ORM tests in parallel to other tests ( #356 )
2023-08-07 11:57:39 +12:00
Guy Sartorelli
6b966add42
MNT Update development dependencies
2023-04-26 12:45:22 +12:00
Guy Sartorelli
3445801412
Merge branch '4.13' into 4
2023-04-26 12:45:22 +12:00
Guy Sartorelli
a8f62aab68
MNT Update development dependencies
2023-04-26 12:08:16 +12:00
Guy Sartorelli
7264db0e34
MNT Update release dependencies
2023-04-26 12:08:13 +12:00
Guy Sartorelli
b18c0372f2
MNT Update development dependencies
2023-03-29 12:37:21 +13:00
Guy Sartorelli
bd202820de
MNT Update release dependencies
2023-03-29 12:37:18 +13:00
Maxime Rainville
5ce684af70
Merge pull request #351 from creative-commoners/pulls/4/dispatch-ci
...
MNT Use gha-dispatch-ci
2023-03-23 12:07:25 +13:00
Steve Boyd
ea654c1c9e
MNT Use gha-dispatch-ci
2023-03-21 14:10:08 +13:00
Guy Sartorelli
f2f7455177
MNT Update development dependencies
2023-03-10 16:31:44 +13:00
Guy Sartorelli
f38f39761e
MNT Update release dependencies
2023-03-10 16:31:40 +13:00
Guy Sartorelli
e9fcd38f52
MNT Update development dependencies
2023-03-10 12:21:28 +13:00
Steve Boyd
5e497fa85f
Merge branch '4.12' into 4
2023-02-02 16:37:27 +13:00
Guy Sartorelli
1049f90978
Merge pull request #348 from creative-commoners/pulls/4.12/test-other-modules
...
MNT Test additional modules
2023-01-26 14:09:42 +13:00
Steve Boyd
44a3fdb0ea
MNT Test additional modules
2023-01-26 10:20:05 +13:00
Steve Boyd
f10a0206af
MNT Update development dependencies ( #346 )
2022-12-21 13:11:39 +13:00
Guy Sartorelli
4886a740ad
Merge pull request #345 from creative-commoners/pulls/4.12/stabilise
...
DEP Stabilise requirements
2022-12-21 12:25:34 +13:00
Steve Boyd
ed70400f9c
DEP Stabilise requirements
2022-12-21 11:09:10 +13:00
Guy Sartorelli
0d52cbc913
Merge pull request #344 from creative-commoners/pulls/4.12/frameworktest
...
FIX Move test requirements out of require-dev
2022-12-21 11:01:04 +13:00
Steve Boyd
62c49cac6d
FIX Move test requirements out of require-dev
2022-12-21 10:11:27 +13:00
Guy Sartorelli
ce944e8417
MNT Update development dependencies
2022-12-19 01:59:17 +00:00
Guy Sartorelli
58ada1c9ed
Merge branch '4.12' into 4
2022-12-19 01:59:17 +00:00
Guy Sartorelli
07e1b32a53
MNT Update development dependencies
2022-12-19 01:59:12 +00:00
Guy Sartorelli
0b89a51c0c
Merge branch '4.12-release' into 4.12
2022-12-19 14:55:52 +13:00
Guy Sartorelli
9c3ffd47c5
MNT Update release dependencies
2022-12-19 01:26:11 +00:00
Guy Sartorelli
fe1be1b8b7
MNT Update release dependencies
2022-11-30 03:27:41 +00:00
Guy Sartorelli
6a500ec454
Merge pull request #339 from creative-commoners/pulls/4.12/minor-xdev
...
MNT Update development dependencies
2022-11-28 12:47:28 +13:00
Steve Boyd
04f9beecf5
MNT Update development dependencies
2022-11-23 16:23:15 +13:00
Guy Sartorelli
7bc208e571
MNT Update development dependencies
2022-11-10 23:51:55 +00:00
Steve Boyd
4f62379f58
Merge branch '4.11' into 4
2022-08-02 18:47:06 +12:00
Steve Boyd
19c057efee
Merge branch '4.10' into 4.11
2022-08-02 18:46:56 +12:00
Guy Sartorelli
8691390ad9
Merge pull request #329 from creative-commoners/pulls/4.10/standardise-modules
...
MNT Standardise modules
2022-08-02 14:29:06 +12:00
Steve Boyd
030e0d60fa
MNT Standardise modules
2022-08-01 09:59:21 +12:00
Steve Boyd
a19303860f
Merge branch '4.11' into 4
2022-07-25 11:30:18 +12:00
Steve Boyd
4d67d06700
Merge branch '4.10' into 4.11
2022-07-25 11:29:57 +12:00
Guy Sartorelli
56462207b6
Merge pull request #328 from creative-commoners/pulls/4.10/typo
...
MNT Fix typos
2022-07-22 14:19:00 +12:00
Steve Boyd
5b756664cc
MNT Fix typos
2022-07-22 12:01:06 +12:00
Guy Sartorelli
4219d455d5
Merge pull request #326 from creative-commoners/pulls/4.10/module-standards
...
MNT Use GitHub Actions CI
2022-07-18 10:22:29 +12:00
Steve Boyd
a8d6ffdeab
MNT Use GitHub Actions CI
2022-07-18 10:14:54 +12:00
Guy Sartorelli
4eea3f390a
Merge branch '4.11' into 4
2022-06-14 11:33:28 +12:00
Maxime Rainville
45921d29de
Merge pull request #324 from creative-commoners/pulls/4.11/public-graphql-folder
...
ENH Add and ignore public/_graphql
2022-06-07 21:43:21 +12:00
Guy Sartorelli
57195eab03
ENH Add and ignore public/_graphql
...
silverstripe/graphql v4 needs write access to this directory, so it may
be easier for some developers to have the directory there as soon as
they `composer create_project silverstripe/installer`.
Like `.graphql-generated`, best practice is to not commit this directory
to VCS, and instead let it be filled at deploy time.
2022-06-02 10:33:36 +12:00
Maxime Rainville
7c06e8cbd1
Merge pull request #323 from creative-commoners/pulls/4.11/graphql-folder
...
ENH Add `.graphql-generated` directory by default
2022-06-01 21:11:26 +12:00
Guy Sartorelli
612ff2922b
ENH Add .graphql-generated
directory by default.
...
This directory will be required for all new projects (unless explicitly
opting out of graphql v4) - having this directory by default makes it
easier to set more sane permissions (i.e. not requiring the entire
project root to be writable).
2022-05-30 12:25:47 +12:00
Steve Boyd
3a5f852d31
Merge branch '4.11' into 4
2022-05-10 21:58:20 +12:00
Guy Sartorelli
db70cb692a
Merge pull request #322 from creative-commoners/pulls/4.11/devreq
...
DEP 4.11 dev requirements
2022-05-06 13:41:58 +12:00
Steve Boyd
8fe8bf5bec
DEP 4.11 dev requirements
2022-05-05 12:18:08 +12:00
Guy Sartorelli
f19d383c68
Merge pull request #321 from creative-commoners/pulls/4/remove-pgsql
...
MNT Only use mysql in matrix
2022-05-03 09:55:28 +12:00
Steve Boyd
fea0ee4a96
MNT Only use mysql in matrix
2022-05-02 11:12:42 +12:00
Guy Sartorelli
7b08763477
Merge pull request #320 from creative-commoners/pull/4/no-allow-failure
...
MNT Do not allow failures on php 8.1
2022-04-28 16:50:22 +12:00
Steve Boyd
6e5f726df7
MNT Do not allow failures on php 8.1
2022-04-28 15:13:54 +12:00
Sabina Talipova
3ed95a2fc3
Merge pull request #319 from silverstripe/pulls/4/add-composer-installer-plugin
...
MNT Add composer/installers to allow-plugins by default.
2022-04-26 12:32:13 +12:00
Guy Sartorelli
bba20c5159
MNT Add composer/installers to allow-plugins by default.
2022-04-14 17:01:13 +12:00
Maxime Rainville
ce4615980c
MNT Ignore .graphql-generated in source control ( #318 )
2022-04-14 09:42:11 +12:00
Maxime Rainville
567236f2e8
Merge pull request #315 from creative-commoners/pulls/4/php74
...
DEP Set PHP 7.4 as the minimum version
2022-03-07 16:10:35 +13:00
Steve Boyd
d75e848a71
DEP Set PHP 7.4 as the minimum version
2022-02-21 09:51:35 +13:00
GuySartorelli
9a342a58ee
DOC Change "SilverStripe" to "Silverstripe" in readme ( #314 )
2022-02-02 10:15:45 +13:00
GuySartorelli
55f6e03f6e
ENH Explicitly allow SilverStripe composer plugins ( #313 )
...
As of Composer 2.2.0, there is a new configuration property to whitelist plugins which are allowed to run. According to https://getcomposer.org/doc/06-config.md#allow-plugins this will default to disallow all plugins from July 2022.
2022-01-21 10:13:00 +13:00
Steve Boyd
e1d2cd30e6
Merge branch '4.10' into 4
2021-12-22 10:25:41 +13:00
Maxime Rainville
345f091fd4
Merge pull request #312 from creative-commoners/pulls/4/410
...
DEP 4.10 requirements
2021-12-03 17:36:17 +13:00
Steve Boyd
0bc751ad90
DEP 4.10 requirements
2021-12-02 15:54:33 +13:00
Maxime Rainville
e48b1662a8
Merge pull request #310 from creative-commoners/pulls/4/sapphire-test-nine
...
API phpunit 9 support
2021-11-10 17:11:08 +13:00
Steve Boyd
54a8b8ce8f
API phpunit 9 support
2021-11-04 11:13:45 +13:00
Maxime Rainville
081282cac1
MNT Target 4.x release
2021-09-03 11:53:14 +12:00
Maxime Rainville
2065c471ed
MNT Targget 4.9.x release
2021-09-03 11:52:06 +12:00
Maxime Rainville
7ee712f47c
Merge pull request #309 from creative-commoners/pulls/4/cow-update
...
MNT supress changelog generation and loosen dependency constraint
2021-08-25 21:05:58 +12:00
Maxime Rainville
d1fcd1c061
MNT supress changelog generation and loosen dependency constraint
2021-08-25 18:12:01 +12:00
Maxime Rainville
e93ef98999
Merge pull request #308 from creative-commoners/pulls/4/sendmail
...
ENH Use Swift_SendmailTransport for new projects
2021-08-20 13:08:16 +12:00
Steve Boyd
be9d875141
ENH Use Swift_SendmailTransport for new projects
2021-08-19 09:57:24 +12:00
Daniel Hensby
ab68119de6
Merge pull request #306 from s-en-o/patch-1
...
Fix typo
2021-06-21 15:43:17 +01:00
Seno
9487628f7a
Fix typo
2021-06-21 20:58:29 +12:00
Steve Boyd
26e55e5226
Merge branch '4.8' into 4
2021-05-21 13:45:50 +12:00
Steve Boyd
6bb9c73137
Merge pull request #303 from creative-commoners/pulls/4.8/update-composer-dep
...
MNT Update composer dep for 4.8 release
2021-05-04 16:53:04 +12:00
Maxime Rainville
c90a8d3729
MNT Update composer dep for 4.8 release
2021-05-04 16:35:51 +12:00
Bryn Whyman
221b39bb27
Merge pull request #302 from creative-commoners/pulls/4/login-forms-changelog
...
ENH Add login-forms to changelog template
2021-04-30 12:10:53 +12:00
Steve Boyd
4e1fa260ee
ENH Add login-forms to changelog template
2021-04-30 12:06:27 +12:00
Andre Kiste
69df70b045
Merge pull request #301 from creative-commoners/pulls/4/behat-framework
...
MNT Use admin behat suite instead of framework
2021-04-27 17:35:35 +12:00
Andre Kiste
4e47962d23
Merge pull request #299 from creative-commoners/pulls/4/multitab-frameworktest
...
MNT Bump frameworktest
2021-04-27 17:35:28 +12:00
Steve Boyd
5811293a74
MNT Use admin behat suite instead of framework
2021-04-27 12:44:46 +12:00
Steve Boyd
6961632875
MNT Bump frameworktest
2021-04-27 12:36:01 +12:00
Andre Kiste
37f30ca54e
Merge pull request #297 from creative-commoners/pulls/4/vfsstream
...
MNT Install vfsstream on travis
2021-04-27 12:12:15 +12:00
Steve Boyd
643a3bded3
MNT Install vfsstream on travis
2021-04-23 10:15:48 +12:00
Steve Boyd
821589a018
Merge branch '4.7' into 4
2021-01-28 12:37:14 +13:00
Steve Boyd
0ff05595bb
MNT Use frameworktest 0.3.0 for graphql 4 compatibility ( #295 )
2021-01-28 12:36:24 +13:00
Steve Boyd
9e637f7e07
Merge branch '4.7' into 4
2021-01-27 16:40:03 +13:00
Garion Herman
870ba6f55d
Merge pull request #294 from creative-commoners/pull/4.7/php8
...
MNT Update PHP8
2021-01-27 16:10:16 +13:00
Steve Boyd
3e2629a602
MNT Update PHP8
2021-01-27 11:25:31 +13:00
Steve Boyd
da876a829c
Update build status badge
2021-01-21 16:31:53 +13:00
Steve Boyd
d48994d993
Merge branch '4.7' into 4
2021-01-02 19:40:05 +13:00
Andre Kiste
b594a257ca
Merge pull request #293 from creative-commoners/pulls/4.7/travis-shared
...
MNT Travis shared config
2020-12-21 14:59:00 +13:00
Steve Boyd
7be811a914
MNT Travis shared config
2020-12-15 13:57:29 +13:00
Serge Latyntsev
523372bc15
Merge pull request #292 from creative-commoners/pulls/4.7/fix-deps
...
MNT installer 4.7 requires recipe-cms 4.7 and login-forms 4.3
2020-11-11 12:21:23 +13:00
Serge Latyntcev
44728e4d9b
MNT installer 4.7 requires recipe-cms 4.7 and login-forms 4.3
2020-11-11 12:06:43 +13:00
Serge Latyntsev
495b9442d5
Merge pull request #290 from creative-commoners/pulls/4/php-8-builds
...
MNT Add PHP 8 builds
2020-10-23 11:21:40 +13:00
Garion Herman
f955099b6e
MNT Add quotes to Behat config for Symfony 4 compat
2020-10-16 10:02:39 +13:00
Garion Herman
25332311ea
MNT Add $COMPOSER_ARG to dependency installation
2020-10-16 10:02:12 +13:00
Garion Herman
4ea1f7082b
MNT Add PHP 8 builds
2020-10-14 14:31:51 +13:00
Serge Latyntsev
0a57853c60
Merge pull request #289 from creative-commoners/pulls/4/use-changelog-template
...
MNT Tweak changelog template, ensure it is used by Cow
2020-10-13 13:18:18 +13:00
Garion Herman
4ddf1a901e
MNT Tweak changelog template, ensure it is used by Cow
2020-10-09 15:28:58 +13:00
Steve Boyd
1b561f8d80
Update .travis.yml
2020-10-08 10:03:28 +13:00
Manuel Thalmann
6035ccd689
FIX Add redirects to public/
for iis ( #263 )
...
FIX Add redirects to `public/` for iis
2020-09-22 09:31:34 +12:00
Steve Boyd
65b2a72843
Merge branch '4.6' into 4
2020-09-11 09:59:09 +12:00
Steve Boyd
ae68dc4299
Merge pull request #286 from creative-commoners/changelog-template
...
DOCS more information in changelog template
2020-09-11 09:56:20 +12:00
Robbie Averill
1ac80f05a8
Merge pull request #288 from open-sausages/pulls/4/ignow-dot-cow-folder-on-builds
...
BUG Don't include the .cow folders in releases
2020-09-10 09:24:24 -07:00
Maxime Rainville
80d1bdf621
BUG Don't include the .cow folders in releases
2020-09-10 20:23:58 +12:00
brynwhyman
d76bd7d66e
DOCS more information in changelog template
...
I've taken reference from the 4.6.1 change log to use the 'CMS Recipe' table. The other information is taken from the exisitng CWP change log template, see: https://github.com/silverstripe/cwp-recipe-kitchen-sink/blob/2/.changelog.md.twig
2020-09-10 16:50:43 +12:00
Garion Herman
daa0bf08ae
Merge pull request #271 from mandrew/patch-2
...
Set environment type in example
2020-07-27 10:36:02 +12:00
Michael Andrewartha
be7e4c8730
Set environment type in example
...
When running a dev/build for the first time, environment should be set to 'dev' or it won't run.
Setting this in the example gives guidance to someone building a site for the first time (or if it's been ages!)
2020-07-27 10:34:36 +12:00
Steve Boyd
fb77893766
Merge pull request #278 from open-sausages/pulls/4/make-login-forms-core-module
...
BUG Treat login-forms as a core module
2020-07-02 15:48:31 +12:00
Maxime Rainville
27231bf315
BUG Treat login-forms as a core module
2020-06-30 22:14:55 +12:00
Robbie Averill
074c9dc45c
Merge branch '4.6' into 4
...
# Conflicts:
# .travis.yml
2020-06-23 09:52:47 -07:00
Robbie Averill
63830aec7f
Merge pull request #285 from creative-commoners/pulls/4.6/travis
...
Update travis 4.6
2020-06-23 09:49:30 -07:00
Steve Boyd
5877d0ecce
Update travis
2020-06-23 17:16:31 +12:00
Andre Kiste
9f2a17337a
Merge pull request #283 from creative-commoners/pulls/4/add-frameworktest
...
Require frameworktest
2020-06-16 14:48:25 +12:00
Steve Boyd
ffd0a85bd3
Require frameworktest
2020-06-16 12:42:59 +12:00
Maxime Rainville
d6bcc27fb5
Prep installer 4.6 branch. ( #279 )
...
API Bump requirements for recipe-cms to 4.6.x, require frameworktest for asset-admin behat test
2020-05-28 17:11:08 +12:00
Garion Herman
46f687ab5a
Merge branch '4.5' into 4
2020-03-03 15:20:24 +13:00
Robbie Averill
3f9e2618c2
Merge pull request #275 from creative-commoners/pulls/4.5/php-7.4-builds
...
Update Travis config to include PHP 7.4 builds
2020-02-26 16:15:14 +11:00
Garion Herman
6851935652
Add sminnee/phpunit-mock-objects to fix PHP 7.4 compat
2020-02-26 16:45:52 +13:00
Garion Herman
02ca9d772a
Update Travis config to include PHP 7.4 builds
2020-02-26 14:58:21 +13:00
Steve Boyd
6bb01369f5
Merge pull request #270 from creative-commoners/pulls/4.5/remove-source-link-from-readme
...
DOC Update README with valid links to documentation
2020-02-03 17:01:23 +13:00
Steve Boyd
c921509259
Merge pull request #272 from creative-commoners/pulls/4.5/rc-changelog-message
...
DOC Adjust changelog template for RC releases
2020-01-16 13:29:23 +13:00
Garion Herman
966f7343d5
DOC Adjust changelog template for RC releases
2020-01-15 11:44:26 +13:00
Garion Herman
e5840dfbeb
DOC Update README with valid links to documentation
2020-01-06 10:46:35 +13:00
Robbie Averill
03cab91539
Merge pull request #257 from open-sausages/pulls/4/login-forms
...
NEW Add silverstripe/login-forms
2019-12-10 19:52:31 -08:00
Ingo Schommer
87ae55539e
Merge branch '4' into pulls/4/login-forms
2019-12-11 15:46:06 +13:00
Andre Kiste
8f62bb9488
Merge pull request #267 from creative-commoners/pulls/4/rfc-9344
...
RFC-9344 Remove branch aliases
2019-12-10 13:38:53 +13:00
Serge Latyntcev
a3bc3d80c5
RFC-9344 Remove branch aliases
2019-12-09 10:58:15 +13:00
Robbie Averill
54265626f1
Merge pull request #266 from creative-commoners/recover/4
...
Update branch aliases
2019-11-28 16:50:18 -08:00
Serge Latyntcev
3bf4d1f34c
Update branch alias, requirements and travis config
2019-11-29 12:00:14 +13:00
Serge Latyntcev
e3230a7371
Remove obsolete branch-alias
2019-11-14 01:24:53 +00:00
Serge Latyntcev
56b9c16880
Merge branch '4.4' into 4
2019-11-13 15:50:30 +13:00
Serge Latyntcev
93f8699b65
Merge branch '4.3' into 4.4
2019-11-13 15:49:40 +13:00
Garion Herman
b171632ccd
Merge pull request #254 from creative-commoners/pulls/4.4/release-changelog-template
...
Add and configure Cow changelog template
2019-10-22 13:00:41 +13:00
Garion Herman
626d7c9f99
FIX Update changelog template location config
2019-10-22 11:54:04 +13:00
Ingo Schommer
d01cf63018
Merge pull request #260 from open-sausages/pulls/4.3/remove-archive
...
Remove cow archive metadata
2019-09-24 10:41:54 +12:00
Ingo Schommer
03c2c996c5
Remove cow archive metadata
...
See https://github.com/silverstripe/silverstripe-framework/issues/9232
2019-09-20 11:35:43 +12:00
Robbie Averill
0ae3823eeb
Merge pull request #259 from nfauchelle/patch-1
...
Update the default location for tests in a project
2019-08-25 18:38:24 +12:00
Nick
7de2991fa3
Update the default location for tests in a project
...
Change the path since mysite isn't used anymore, new sites have an app folder instead.
2019-08-25 12:32:26 +12:00
Robbie Averill
70580acb2b
Merge pull request #258 from open-sausages/pulls/4/xenial
...
Enhancement / Update travis config to use Xenial
2019-07-26 09:40:10 +02:00
Serge Latyntcev
be4ff49c12
Enhancement / Update travis config to use Xenial
2019-07-26 12:56:40 +12:00
Ingo Schommer
c1d94643a4
Set looser composer constraint
...
As per discussion with Guy on https://github.com/silverstripe/silverstripe-installer/pull/257 . Will pull in stable tags via cow once they're available (on recipe release)
2019-07-16 11:23:54 +12:00
Ingo Schommer
9171342ec2
NEW Add silverstripe/login-forms
...
Using beta tag for now, should move to stable once the module is stable (ideally before 4.5.0)
2019-07-05 16:45:11 +12:00
Garion Herman
e4acec30c8
Shift changelog template into dedicated cow config folder
2019-06-13 12:28:50 +12:00
Robbie Averill
d4af206393
Merge pull request #256 from sminnee/deprecate-pdo
...
NEW: Change .env.example to default to MySQL native driver
2019-06-13 11:15:18 +12:00
Sam Minnee
a968e7ad47
NEW: Change .env.example to default to MySQL native driver
...
https://github.com/silverstripe/silverstripe-framework/issues/8598
2019-06-11 16:19:50 +12:00
Ingo Schommer
09a2f6e298
Merge pull request #255 from creative-commoners/pulls/4.5/php71
...
API Bump minimum PHP version to 7.1
2019-06-07 14:39:36 +12:00
Robbie Averill
002cb6b61d
API Bump minimum PHP version to 7.1
2019-05-23 13:59:31 +12:00
Garion Herman
0eede14f45
Add and configure Cow changelog template
2019-05-13 15:01:48 +12:00
Maxime Rainville
43b8000fd6
NEW Disable legacy resolution for new projects ( #253 )
2019-05-10 09:55:36 +12:00
Ingo Schommer
3e7294ea70
Bump to 4.5.x-dev
...
This conflicts with an earlier commit (cfba4cb
), but after talking to Robbie this new commit is consistent with how we handle other recipes (CWP and core). Both ways are viable, but we've implicitly standardised on this way (set minor release constraints in the main release branch, e.g. constraint to recipe:4.5.x-dev on installer:4.x-dev)
2019-04-30 11:03:06 +12:00
Ingo Schommer
cfba4cbe36
Fixed core dependency to 4.x-dev
...
Likely caused by repeated unreviewed merges from 4.4 (and 4.3) onto the 4 branch here (e.g. through fa67bc614b
).
Note this isn't changing the branch alias, which should still point to 4.5.x-dev here.
2019-04-30 09:21:53 +12:00
Robbie Averill
83f78fc40e
Merge branch '4.4' into 4
2019-04-21 10:33:04 +12:00
Robbie Averill
c9a4efe29d
Merge branch '4.3' into 4.4
2019-04-21 10:32:21 +12:00
Robbie Averill
d0521e1664
Merge branch '4.2' into 4.3
2019-04-21 10:32:11 +12:00
Robbie Averill
e650c43da7
Merge branch '4.1' into 4.2
2019-04-21 10:30:58 +12:00
Robbie Averill
c0d9fd4869
Remove obsolete branch alias
2019-04-21 10:30:43 +12:00
Robbie Averill
810f719f86
Revert "NEW Add Roave Security advisories to composer"
...
This reverts commit a302acfa5a
.
2019-02-26 09:19:08 +11:00
Robbie Averill
1b31ffa28a
Revert "Update development dependencies"
...
This reverts commit 1a55336552
.
2019-02-19 05:25:35 +07:00
Aaron Carlino
1a55336552
Update development dependencies
2019-02-19 10:53:35 +13:00
Ingo Schommer
6e42093c9d
Merge pull request #250 from creative-commoners/pulls/4.1/split-framework-tests
...
Split framework tests from assets and versioned to prevent time limits being exceeded
2019-02-04 09:04:54 +13:00
Robbie Averill
c8451b9071
Split framework tests from assets and versioned to prevent time limits being exceeded
...
Also removed an unneeded editorconfig block which is duplicated and adds PHP 7.2 and 7.3 into the builds
2019-02-02 12:15:17 +03:00
Robbie Averill
a9e1e328ca
Merge pull request #248 from open-sausages/pulls/4.2/fix-tests
...
TravisCI / fix silverstripe/posgresql version
2019-02-01 09:19:02 +02:00
Serge Latyntcev
e279f35abf
TravisCI / fix silverstripe/posgresql version
2019-02-01 16:05:37 +13:00
Robbie Averill
e8614b59bb
Bump postgres version in Travis builds to match silverstripe/framework@4.4
2019-01-31 11:43:39 +02:00
Serge Latyntcev
9fe50bb42b
Merge branch '4.3' into 4
2019-01-28 14:14:23 +13:00
Serge Latyntcev
2473e05496
Merge branch '4.2' into 4.3
2019-01-28 14:09:54 +13:00
Serge Latyntcev
127c62a0c9
Merge branch '4.1' into 4.2
2019-01-28 14:09:19 +13:00
Serge Latyntsev
824bd2cf91
Merge pull request #244 from open-sausages/pulls/4.1/behat-install
...
FIX / Installer tests
2019-01-28 12:11:58 +13:00
Maxime Rainville
0f02f2364f
MINOR Make installer default to using _resources
( #242 )
2019-01-16 21:34:13 +13:00
Maxime Rainville
f04beea2f3
Merge pull request #246 from Firesphere/patch-1
...
Add Roave Security advisories to composer
2019-01-08 10:07:45 +13:00
Simon Erkelens
a302acfa5a
NEW Add Roave Security advisories to composer
...
Add Security Advisories as dev requirement to
- Prevent installation of known breached libraries
- Give devs the option to remove it if they might want to
2019-01-08 09:37:34 +13:00
Serge Latyntcev
3d841a409c
FIX / Behat tests
...
Most of the modules stop exporting metadata files (behat.yml among those) to packagist
Thus when travis runs behat tests it cannot find configuration for the test suites
2018-12-18 16:38:40 +13:00
Robbie Averill
b66e851dda
Merge branch '4.3' into 4
2018-11-21 09:12:30 +01:00
Robbie Averill
3abeb18858
Merge branch '4.2' into 4.3
...
# Conflicts:
# composer.json
2018-11-21 09:12:10 +01:00
Robbie Averill
84aaa17461
Merge branch '4.1' into 4.2
2018-11-21 09:11:20 +01:00
Robbie Averill
d0890776e8
Merge branch '4.0' into 4.1
2018-11-21 09:11:04 +01:00
Robbie Averill
fcd4052a07
Update Slack integration token
2018-11-21 09:10:41 +01:00
Robbie Averill
90f54ccfe9
Merge pull request #240 from JorisDebonnet/patch-4
...
Correct typo
2018-10-17 21:56:44 +02:00
JorisDebonnet
fa3c87f61e
Correct typo
2018-10-17 18:05:20 +02:00
Robbie Averill
fa67bc614b
Bump branch alias and root version in Travis to 4.4.x-dev
2018-10-15 14:54:38 +02:00
Robbie Averill
05fd5a9a96
Bump branch alias and root version in Travis to 4.4.x-dev
2018-10-15 14:44:14 +02:00
Robbie Averill
caf0bc12f7
Merge branch '4.3' into 4
2018-10-15 14:43:00 +02:00
Aaron Carlino
c24d4c73c3
Remove obsolete branch-alias
2018-10-15 16:31:48 +13:00
Dan Hensby
986a2f951a
Update composer.json version constraint
2018-08-04 08:59:12 +02:00
Daniel Hensby
eba91f9bec
Merge branch '4.2' into 4
...
# Conflicts:
# composer.json
2018-07-30 17:14:31 +01:00
Daniel Hensby
539b58d7aa
Merge tag '4.2.1' into 4.2
...
Release 4.2.1
2018-07-30 17:12:06 +01:00
root
0307496292
Update development dependencies
2018-07-30 15:23:32 +00:00
Daniel Hensby
15f8011493
Merge branch '4.2' into 4
...
# Conflicts:
# composer.json
2018-07-30 11:23:08 +01:00
Daniel Hensby
6ad3a067c3
Merge tag '4.2.0' into 4.2
...
Release 4.2.0
2018-07-30 11:14:13 +01:00
root
b1cd5afe28
Update development dependencies
2018-07-24 19:22:22 +00:00
Daniel Hensby
7d838b0631
Update composer dep
2018-07-24 16:47:35 +01:00
Robbie Averill
baf63747b4
Bump Postgres version to 2.1.x-dev for SilverStripe 4.2+
2018-06-29 16:39:17 +12:00
Robbie Averill
28da082fa1
Merge pull request #232 from open-sausages/pulls/4.3/increment-travis-version-to4.3.x-dev
...
Increment travis root version to 4.3.x-dev
2018-06-29 16:38:38 +12:00
Maxime Rainville
1431370940
Increment travis root version to 4.3.x-dev
2018-06-26 17:49:01 +12:00
Damian Mooyman
5e4ad34162
Fix incorrect base recipe dependency
2018-06-15 16:47:59 +12:00
Damian Mooyman
f5b659cb4f
Merge remote-tracking branch 'origin/4.2' into 4
2018-06-15 16:06:14 +12:00
Damian Mooyman
0d5daf5658
Update development dependencies
2018-06-15 15:52:39 +12:00
Damian Mooyman
6a7bd05a1d
Remove obsolete branch-alias
2018-06-15 15:30:04 +12:00
Damian Mooyman
97ef910478
Update installer to use new recipe versioning
2018-06-14 13:29:03 +12:00
Damian Mooyman
d178ebdb9e
Merge pull request #230 from creative-commoners/pulls/4/remove-classmap
...
FIX Remove incorrect classmap for Page and PageController
2018-06-05 12:08:10 +12:00
Robbie Averill
a9e2af6863
FIX Remove incorrect classmap for Page and PageController
...
These files to not always exist in this path, so this autoload definition is misleading
2018-06-01 15:54:11 +12:00
Robbie Averill
9a407320ed
Merge branch '4.1' into 4
2018-05-28 18:32:48 +12:00
Robbie Averill
dc4b512afb
Merge remote-tracking branch 'origin/4.0' into 4.1
...
# Conflicts:
# .travis.yml
2018-05-28 17:57:27 +12:00
Robbie Averill
743f9c649e
Merge remote-tracking branch 'origin/3.6' into 4.0
...
# Conflicts:
# .cow.json
# .gitignore
# composer.json
2018-05-28 17:54:29 +12:00
Robbie Averill
cd6a22c78f
Merge branch 'heads/4.0.4' into 4.0
2018-05-28 17:47:06 +12:00
Robbie Averill
ec5093feb6
Merge pull request #3 from silverstripe-security/pulls/4.0/ss-2018-014
...
[SS-2018-014] Remove jar, css and js from file extension whitelist
2018-05-14 17:20:31 +12:00
Robbie Averill
be96858e85
[SS-2018-014] Remove jar, dotm, potm, xltm from file extension whitelist, hard-code CSS and JS for TinyMCE support
2018-05-14 17:20:03 +12:00
Robbie Averill
c6ff9b1245
Merge pull request #2 from silverstripe-security/pulls/4.0/ss-2018-012
...
[ss-2018-012] Prevent php code execution in assets folder
2018-05-14 17:18:36 +12:00
Damian Mooyman
f9c03fa623
[ss-2018-012] Prevent php code execution in assets folder
2018-05-14 17:18:12 +12:00
Robbie Averill
9d8193d19c
Merge pull request #225 from open-sausages/pulls/4.0/selenium-upgrade
...
Update selenium to chromedriver
2018-04-13 10:50:50 +12:00
Damian Mooyman
7cfaeccfb1
Remove empty psr-4
2018-04-13 10:15:04 +12:00
Damian Mooyman
d678bd76f9
Update selenium to chromedriver
2018-04-13 09:30:04 +12:00
Damian Mooyman
39f0af225f
Merge pull request #223 from open-sausages/pulls/4/appy-days
...
Shift resources into app folder
2018-04-11 15:25:06 +12:00
Damian Mooyman
b18d3752b6
Merge pull request #224 from aNickzz/patch-1
...
Update .gitignore
2018-04-11 10:44:24 +12:00
aNickzz
26f4ef722d
Update .gitignore
...
Update to match #213
2018-04-10 16:34:40 +09:30
Damian Mooyman
f514ba42b6
Bump recipe plugin dependency
2018-04-05 16:43:07 +12:00
Damian Mooyman
0b71d14fe1
Shift resources into app folder
...
Add autoloading skeleton and classmap for Page.php / PageController.php
2018-04-05 15:17:03 +12:00
Damian Mooyman
30df0f5e43
Merge remote-tracking branch 'origin/4.1' into 4
2018-02-07 16:44:41 +13:00
Damian Mooyman
b6730c5c9c
Update root composer version for 4.1 branch
2018-02-07 16:43:17 +13:00
Damian Mooyman
7fb7f885f9
Update branch alias
2018-02-07 16:42:25 +13:00
Damian Mooyman
b060892992
BUG Fix routing error for public assets
...
Port of https://github.com/silverstripe/recipe-core/pull/14 to installer
2018-02-07 13:57:17 +13:00
Damian Mooyman
81045f46c2
Update development dependencies
2018-02-05 17:15:37 +13:00
Damian Mooyman
a892272cc5
Shift public resources into public folder ( #220 )
2018-01-12 16:28:15 +13:00
Damian Mooyman
9ca6c3a89b
Merge pull request #219 from open-sausages/pulls/4.0/no-dev-should-be-needed-here
...
Enhancement add test for a `--no-dev` build
2018-01-08 13:44:37 +13:00
Christopher Joe
4d60f01d2d
Enhancement add test for a --no-dev
build
2017-12-22 15:27:43 +13:00
Christopher Joe
decd8bb446
Merge branch '4.0' of github.com:silverstripe/silverstripe-installer into 4
2017-12-21 13:40:09 +13:00
Damian Mooyman
bb1944f64d
Merge pull request #218 from open-sausages/pulls/4.0/its-a-travis-tee-with-behat
...
FIX travis OS build version so that behat will function
2017-12-21 12:02:27 +13:00
Christopher Joe
dd75e68f86
FIX travis OS build version so that behat will function
2017-12-20 21:40:27 +13:00
Damian Mooyman
1f67410858
Merge pull request #214 from open-sausages/pulls/4.1/composer-does-prefer-dist
...
Feature update composer with --prefer-source flag so that tests are included
2017-12-19 14:28:49 +13:00
Damian Mooyman
e06e3c4e83
Update travis.yml
2017-12-19 12:07:44 +13:00
Christopher Joe
ccece4bf1c
Feature update composer with --prefer-source flag so that tests are included
2017-12-11 12:27:53 +13:00
Damian Mooyman
c9787b772d
Merge remote-tracking branch 'origin/4.0' into 4
...
# Conflicts:
# .cow.json
# composer.json
2017-11-16 10:47:38 +13:00
Damian Mooyman
19e8849eaf
Merge pull request #209 from martinduparc/patch-1
...
Update README.md
2017-11-10 15:53:08 +13:00
Damian Mooyman
d3fc0d4571
Merge pull request #208 from dhensby/pulls/4.0/this-is-ss4
...
DOCS update comments for supported versions
2017-11-10 15:52:12 +13:00
Martin D
76965d53aa
Update README.md
...
Fixed links
2017-11-07 10:21:33 -05:00
Daniel Hensby
ee92941f87
DOCS update comments for supported versions
2017-11-07 12:58:43 +00:00
Damian Mooyman
d6c528b8bc
Fix test paths
2017-10-25 16:20:00 +13:00
Chris Joe
8dc64d17d0
Merge pull request #204 from open-sausages/pulls/4.0/update-plugin
...
Update recipe-plugin to 1.0
2017-10-25 11:21:34 +13:00
Damian Mooyman
35a17cc9c0
Update recipe-plugin to 1.0
2017-10-25 11:14:32 +13:00
Damian Mooyman
46ca9bf59d
Update 4.1 dependencies
2017-10-12 10:17:25 +13:00
Damian Mooyman
d6c07093ce
Update branch alias
2017-10-12 10:16:42 +13:00
Damian Mooyman
8fa7c9a27a
Update test paths
2017-10-11 17:48:36 +13:00
Damian Mooyman
ed0e2297a4
Remove obsolete branch-alias
2017-10-11 17:31:50 +13:00
Chris Joe
33aa9ab719
Merge pull request #203 from open-sausages/pulls/4.0/better-beta4-upgrade
...
Move files to recipe-core
2017-10-10 16:59:22 +13:00
Damian Mooyman
64211f1b1d
Move files to recipe-core
2017-10-10 15:41:25 +13:00
Ingo Schommer
e32b1bbd07
Merge pull request #202 from open-sausages/pulls/4/request-uri
...
Use index.php for serving content
2017-10-09 10:41:39 +01:00
Ingo Schommer
c369cd2358
Move index.php to recipe-core
...
It needs to work with installer-less projects as well
2017-10-05 08:18:51 +01:00
Ingo Schommer
bce724ca76
Use index.php for serving content
...
Removes main.php reliance. Paves the way for
serving SilverStripe from a public/ subfolder in the base path.
This requires an index.php file in the webroot,
since you can't set a RewriteRule to a path outside of the webroot
(e.g. "public/.htaccess" pointing to "../vendor/silverstripe/framework/main.php").
2017-10-05 08:09:45 +01:00
Damian Mooyman
edf6f4c1d3
Merge pull request #201 from open-sausages/pulls/4/gitignore
...
Update gitignore for vendor module move
2017-10-05 09:00:31 +13:00
Ingo Schommer
ec36574665
Update gitignore for vendor module move
...
See https://github.com/silverstripe/silverstripe-framework/issues/7405s
2017-10-04 09:54:57 +01:00
Damian Mooyman
67ed44823e
Merge pull request #200 from open-sausages/pulls/4/vendorise-me-baby
...
Support custom main.php location
2017-10-03 16:11:06 +13:00
Damian Mooyman
8ab058a3fd
Update unit test paths and asset .htaccess
2017-10-03 15:09:02 +13:00
Ingo Schommer
96045afc65
Adjust phpunit path to framework
2017-10-03 05:09:43 +13:00
Ingo Schommer
7de2e07139
Fix main.php path in install.php
2017-10-03 03:19:23 +13:00
Ingo Schommer
2d53abd2c2
Removed stylesheet from frameworkmissing file
...
If the framework is missing, there's no point referencing a stylesheet from it...
2017-10-03 03:18:51 +13:00
Ingo Schommer
e88f7654da
Fix main.php path
2017-10-03 03:18:51 +13:00
Ingo Schommer
f22d9b3735
Fix main.php path
2017-10-03 01:44:14 +13:00
Ingo Schommer
a1384f67b7
Simplify serving static assets in index.php
...
No need to perform custom file reading.
See https://github.com/laravel/laravel/blob/master/server.php#L18
and http://php.net/manual/en/features.commandline.webserver.php
2017-10-03 01:44:06 +13:00
Chris Joe
41b87ab2d5
Merge pull request #198 from open-sausages/pulls/4.0/adjust-timeout
...
Adjust behat timeout for asset-admin tests
2017-09-29 12:03:02 +13:00
Damian Mooyman
0cf5924277
Update .travis.yml
2017-09-29 10:03:30 +13:00
Damian Mooyman
2c81adf3e6
Adjust behat timeout for asset-admin tests
2017-09-29 09:45:55 +13:00
Chris Joe
9e6114c151
Merge pull request #195 from sminnee/gimme-more-files
...
FIX: Include .env.example and .editorconfig in git export
2017-09-06 15:24:55 +12:00
Chris Joe
40c6fcf18f
Merge pull request #197 from open-sausages/pulls/4.0/recipe-info
...
Provide information related to recipe
2017-08-14 23:05:50 +12:00
Saophalkun Ponlu
26cd654dbb
Provide information related to recipe
2017-08-14 17:15:42 +12:00
Damian Mooyman
4df28ad121
Added archive config
2017-08-04 16:39:39 +12:00
Sam Minnee
424b1c04dd
FIX: Include .env.example and .editorconfig in git export
...
The “export” downloads of the installer should include these two files
as they are of use to regular developers.
* .editorconfig encourages the use of our standard code format
* .env.example is a helper for new developers
2017-07-31 17:36:33 +12:00
Damian Mooyman
980bf834b7
Fix recipe plugin version constraint
2017-07-25 11:13:55 +12:00
Chris Joe
dd2ebad5dc
Merge pull request #193 from open-sausages/pulls/4.0/recipe-concept
...
API Convert installer to recipe
2017-07-24 15:13:35 +12:00
Damian Mooyman
2d04b844b7
API Convert installer to recipe
2017-07-24 14:45:14 +12:00
Damian Mooyman
d3de9e075f
Merge pull request #191 from nfauchelle/patch-1
...
Update .gitignore
2017-07-07 22:05:01 +12:00
Nick
afb523424e
Update .gitignore
...
Add in another module which is managed by composer
2017-07-07 21:02:29 +12:00
Damian Mooyman
f9bc5a3fc0
Merge pull request #190 from robbieaverill/patch-1
...
Add editorconfig rule for composer.json to be allowed four spaces
2017-07-06 14:46:24 +12:00
Robbie Averill
5284ca65b0
Add editorconfig rule for composer.json to be allowed four spaces
2017-07-06 12:41:02 +12:00
Christopher Joe
adca3aea68
Update composer alias
2017-07-06 09:03:09 +12:00
Damian Mooyman
7b68ac77ab
Remove obsolete branch-alias
2017-07-03 16:53:55 +12:00
Daniel Hensby
1e7d9f9a15
Merge pull request #185 from robbieaverill/patch-1
...
FIX Delete Page_Controller from SS4 compat branch
2017-06-27 23:38:47 +01:00
Robbie Averill
b8750d9399
FIX Delete Page_Controller from SS4 compat branch
...
I assume this turned up in a merge-up - having this around breaks breaks things. Should be PageController now.
2017-06-28 10:05:38 +12:00
Daniel Hensby
69441aba44
Merge branch '3'
2017-06-27 13:27:40 +01:00
Damian Mooyman
c9c9cf7d58
Merge pull request #182 from jonom/master
...
Added errorpage module requirement
2017-06-27 14:30:48 +12:00
Ingo Schommer
333d3a5408
Merge pull request #183 from open-sausages/pulls/4.0/app-object
...
Remove unneeded globals
2017-06-22 22:58:14 +12:00
Damian Mooyman
a74e513a29
Remove unneeded globals
2017-06-20 17:20:00 +12:00
Jono Menz
4f68a04730
Added errorpage module
2017-06-15 16:02:13 -07:00
Chris Joe
5aa694953e
Merge pull request #180 from open-sausages/pulls/4.0/remove-dummy
...
Remove redundant dummy file in assets
2017-06-08 10:49:28 +12:00
Damian Mooyman
bf76193e13
Remove redundant dummy file in assets
2017-06-06 11:45:15 +12:00
Chris Joe
0e85f88204
Merge pull request #178 from open-sausages/pulls/4.0/add-behat-tests
...
API Add pgsql + behat tests to installer
2017-05-25 12:57:55 +12:00
Damian Mooyman
2e94a11c8b
API Add pgsql + behat tests to installer
2017-05-23 14:50:12 +12:00
Damian Mooyman
d406fa365f
Merge pull request #179 from nfauchelle/ignore-modules-handled-by-composer
...
Add in the module folders which come from the default install
2017-05-22 21:17:05 +12:00
Nick
aa1c2ce05a
Add in the module folders which come from the default SilverStripe composer.json. Since we ignore the /vendor/ folder we should ignore these items as well since composer will maintain them
2017-05-22 20:44:14 +12:00
Damian Mooyman
d9f28b2017
Merge pull request #177 from nfauchelle/psr-2-adjustments
...
Update the PHP files to PSR-2 spec
2017-05-15 09:15:09 +12:00
Nick
d3ed3f7476
Update the PHP files to PSR-2 spec
2017-05-14 21:48:27 +12:00
Damian Mooyman
f54ff29a02
API Remove BlockUntrustedIPs
2017-05-11 09:31:23 +12:00
Damian Mooyman
df40d5f8c6
Update for behat 3
2017-05-05 17:21:32 +12:00
Damian Mooyman
63186c87fe
Merge pull request #162 from open-sausages/pulls/4.0/fix-release-constraints
...
Lock dependency-constraint prior to beta
2017-04-05 16:30:11 +12:00
Damian Mooyman
f9f61cbce2
BUG Fix cow release config
2017-04-05 16:11:19 +12:00
Chris Joe
d839245a73
Merge pull request #168 from open-sausages/pulls/4.0/combine-tests
...
Add combined test suite for installer
2017-04-05 15:16:50 +12:00
Damian Mooyman
f3d64abd55
Add combined test suite for installer
...
Remove teamcity config from default install
Partial implementation of #164
Fixes #166
2017-04-04 16:39:12 +12:00
Loz Calver
c2c184cbb9
Merge pull request #165 from dhensby/pulls/4/test-update
...
Update PHPUnit XML configs to remove SS TestListener
2017-03-30 10:42:27 +01:00
Daniel Hensby
57582636fa
Update PHPUnit XML configs to remove SS TestListener
2017-03-30 10:35:21 +01:00
Damian Mooyman
e6b713a323
Merge pull request #163 from sminnee/license-file
...
FIX: Split licence into separate file to match standard.
2017-03-29 17:35:08 +13:00
Sam Minnee
639631013f
FIX: Split licence into separate file to match standard.
2017-03-29 12:45:25 +13:00
Ingo Schommer
345c225527
Merge pull request #160 from open-sausages/pulls/4.0/campaign-admin
...
Add campaign admin module
2017-03-28 17:51:04 +13:00
Damian Mooyman
41c2f8c82e
Add campaign admin module
2017-03-28 13:32:45 +13:00
Damian Mooyman
3a1b9a82f5
Add versioned module
2017-03-28 10:35:25 +13:00
Damian Mooyman
2809247c24
Lock dependency-constraint prior to beta
...
Fixes https://github.com/silverstripe/silverstripe-framework/issues/6737
2017-03-27 10:00:41 +13:00
Loz Calver
2768e6ca6b
Merge pull request #161 from dhensby/pulls/phpunit
...
Update PHP min version and PHPUnit version
2017-03-24 11:28:22 +00:00
Daniel Hensby
d2c8e3c65f
Update PHP min version and PHPUnit version
2017-03-25 00:20:44 +13:00
Damian Mooyman
33087bcc8d
Add assets as module
2017-03-23 09:24:14 +13:00
Daniel Hensby
a8eda2ab05
Merge pull request #157 from open-sausages/pulls/4.0/fix-devs
...
Fix dev dependencies for root project
2017-03-16 16:42:33 +13:00
Daniel Hensby
0e7f29b5db
Merge pull request #153 from Zauberfisch/patch-1
...
Block common log file names in .htaccess
2017-03-16 16:38:15 +13:00
Damian Mooyman
61e5b3836e
Fix dev dependencies for root project
2017-03-16 16:01:15 +13:00
Ingo Schommer
aacbae8107
Merge pull request #156 from open-sausages/pulls/4.0/admin-module
...
Add admin module to root installer
2017-03-15 12:02:20 +13:00
Damian Mooyman
94f3c609b2
Add admin module to root installer
2017-03-10 15:17:14 +13:00
Damian Mooyman
18a5348caa
Merge pull request #110 from spekulatius/patch-1
...
tab -> space in editorconfig
2017-03-01 13:00:09 +13:00
Damian Mooyman
9c68dc0276
Merge pull request #155 from open-sausages/pulls/4.0/circular-deps
...
Fix remove the wildcard After condition in config.yml
2017-02-28 15:32:18 +13:00
Christopher Joe
ac685e4d38
Fix remove the wildcard After condition in config.yml
2017-02-28 15:30:46 +13:00
Zauberfisch
d7834c5ae7
Block common log file names in .htaccess
2017-02-19 11:10:21 +00:00
Daniel Hensby
5d778fa2a5
Merge pull request #152 from open-sausages/pulls/4.0/disable-trailing-slash-redirect
...
Disable trailing slash redirect for dirs
2017-02-02 10:10:47 +00:00
Ingo Schommer
63948d8064
Disable trailing slash redirect for dirs
...
If you're running mod_dir on Apache, and create a route which matches a directory name
(such as 'framework'), "GET /framework" will result in a 301 to "/framework/?url=framework".
While the SilverStripe routing might decide to enforce trailing slash rules later,
Apache shouldn't have any business here.
The specific bug this fixes was redirecting "/graphql" to "/graphql/",
with the silverstripe/graphql module installed.
See https://httpd.apache.org/docs/current/mod/mod_dir.html#directoryslash
2017-02-02 21:03:09 +13:00
Loz Calver
c92cc50353
Merge pull request #150 from dhensby/pulls/4/dot-env-example
...
NEW Add .env.example file
2017-02-01 11:27:24 +00:00
Daniel Hensby
06b475896d
NEW Add .env support
2017-02-01 11:26:46 +00:00
Daniel Hensby
a4d886e9d4
Merge pull request #149 from colintucker/fix-controller-init-visibility
...
Changed init() visibility to protected
2017-01-23 16:38:11 +00:00
Colin Tucker
0cbee4b0c2
Changed init() visibility to protected
2017-01-22 09:34:57 +11:00
Damian Mooyman
322a94e2c4
Merge pull request #148 from open-sausages/pulls/graphql-dep
...
Added GraphQL dependency
2017-01-17 13:26:32 +13:00
Ingo Schommer
a8572e7b22
Added GraphQL dependency
...
This is required here in order for the "cow" release tool
to include the module in tagging releases.
At the moment, it's only an indirect asset-admin dependency,
but will become a framework dependency once we switch
CampaignAdmin to use GraphQL as well.
2017-01-17 11:44:33 +13:00
Ingo Schommer
5e3e66916d
Merge pull request #146 from robbieaverill/feature/controllers-without-underscores
...
API Change Page_Controller to PageController (PSR-2 compliance)
2017-01-12 08:52:11 +13:00
Robbie Averill
e9a4095c9a
PSR-2 compliance: Move PageController class to its own file
2017-01-05 13:07:23 +13:00
Robbie Averill
fb06cc0075
API Change Page_Controller to PageController (PSR-2 compliance)
2017-01-05 13:03:18 +13:00
Damian Mooyman
51a9fdf5d1
BUG Fix test listener path
2016-11-02 11:13:46 +13:00
Damian Mooyman
9a24d8e437
Update installer for src folder
2016-11-01 15:35:26 +13:00
Daniel Hensby
70e85745fb
Merge pull request #137 from tractorcow/pulls/4.0/cow-meta
...
[WIP] Add experimental release metadata to module
2016-10-12 01:11:01 +01:00
Damian Mooyman
41f865a79c
Add experimental release metadata to module
2016-10-12 10:04:25 +13:00
Daniel Hensby
fce041c5af
Merge pull request #141 from JorisDebonnet/patch-3
...
Updated link to Requirements doc
2016-09-26 14:25:32 +01:00
JorisDebonnet
20740026da
Updated link to Requirements doc
2016-09-26 15:10:33 +02:00
Damian Mooyman
4301fa850d
BUG Fix incorrect backslash escaping in htaccess template ( #140 )
2016-09-22 18:01:44 +12:00
Damian Mooyman
a7ec54cb25
Remove self.version ( #138 )
...
Lock dev branches to dev
2016-09-20 10:20:52 +12:00
Damian Mooyman
98ad908532
Rename SS_ prefixed classes ( #136 )
2016-09-09 15:33:34 +12:00
Ingo Schommer
c9bf8bb016
Merge pull request #135 from open-sausages/pulls/4.0/namespace-everything
...
Upgrade installer
2016-09-08 16:15:56 +12:00
Daniel Hensby
73a519587f
Merge branch '3'
2016-09-08 00:27:46 +01:00
Damian Mooyman
3df2ddde13
Upgrade installer
2016-09-07 17:33:14 +12:00
Ingo Schommer
ba721842c5
Merge pull request #134 from open-sausages/pulls/4.0/remove-i18n-setlocale
...
Remove i18n::set_locale from default installer
2016-09-07 17:08:25 +12:00
Damian Mooyman
638abc5808
Remove i18n::set_locale from default installer
2016-09-07 16:57:11 +12:00
Daniel Hensby
ca725e6269
Merge pull request #132 from robbieaverill/bugfix/131-asset-admin-dev-master
...
FIX use latest dev-master for asset-admin composer contraint
2016-08-31 21:31:30 +01:00
Robbie Averill
a6f1fa3b91
FIX use 1.0.x-dev for asset-admin composer contraint
...
* Resolves #131
2016-09-01 08:03:27 +12:00
Hamish Friedlander
d62ddadb91
Merge pull request #130 from open-sausages/pulls/4.0/namespace-cms
...
Update for CMS namespace
2016-08-11 08:10:05 +07:00
Damian Mooyman
3fa6f04047
Update for CMS namespace
2016-08-04 14:41:44 +12:00
Damian Mooyman
93f4dd1764
API Support nested themes API ( #129 )
2016-07-25 17:26:22 +12:00
Stevie Mayhew
810b49b4a8
Merge pull request #127 from JorisDebonnet/patch-2
...
Update minimum php version in top comments in index.php and install.php
2016-06-04 10:27:27 +12:00
JorisDebonnet
da3ef94acf
Update minimum php version in index.php and install.php comments
2016-06-03 21:52:33 +02:00
Stevie Mayhew
63a028d711
Merge pull request #125 from silverstripe/copyright-in-contributingmd
...
Make installer copyright note conform to others
2016-05-30 14:57:48 +12:00
Sam Minnée
171a543d73
Make installer copyright note conform to others
...
Make the notice here match those on other modules.
See https://github.com/silverstripe/silverstripe-framework/pull/5610
2016-05-30 14:36:08 +12:00
Damian Mooyman
ea4333fec6
Merge 3 into master
2016-05-18 17:30:22 +12:00
Daniel Hensby
00016f6378
Merge pull request #122 from axyr/update-php-version
...
update required php version
2016-05-14 11:20:46 +01:00
Martijn van Nieuwenhoven
3687ef8cb3
update required php version
...
as in framework and cms
2016-05-13 00:01:34 +02:00
Damian Mooyman
639092d333
Merge 3.1 into master
...
# Conflicts:
# composer.json
2016-05-11 17:54:40 +12:00
Damian Mooyman
1a5652d81c
Merge 3 into master
...
# Conflicts:
# composer.json
2016-05-11 14:33:39 +12:00
Ingo Schommer
f52cfeef87
Merge pull request #117 from open-sausages/pulls/4.0/include-asset-admin
...
API Include asset-admin module in installer
2016-05-04 19:36:29 +12:00
Damian Mooyman
8d2cc913e9
API Include asset-admin module in installer
...
Requires https://github.com/silverstripe/silverstripe-asset-admin/pull/132
2016-05-03 15:47:17 +12:00
Daniel Hensby
3c8fc9177c
Merge branch '3'
2016-04-26 02:40:35 +01:00
Daniel Hensby
71971adc8f
Merge pull request #113 from tractorcow/pulls/4.0/update-assets
...
API Replace old assets/.htaccess with better default
2016-03-22 11:30:50 +00:00
Damian Mooyman
8366d22a19
API Replace old assets/.htaccess with better default
2016-02-26 14:05:55 +13:00
Daniel Hensby
38fa596239
Bumping PHPUnit version
2016-01-25 15:09:58 +00:00
Peter Thaleikis
cad28ceff1
tab -> space in editorconfig
2015-11-30 17:19:01 +13:00
Daniel Hensby
eeec7be996
Merge branch '3'
2015-11-10 10:55:37 +00:00
Ingo Schommer
b5a1b91358
Merge remote-tracking branch 'origin/3'
2015-07-16 21:36:29 +12:00
Damian Mooyman
ef770ca42d
Merge remote-tracking branch 'origin/3'
...
Conflicts:
composer.json
2015-01-16 10:35:26 +13:00
Damian Mooyman
46fb50b4be
Update branch alias for master
2014-11-20 17:19:24 +13:00