Compare commits

..

44 Commits

Author SHA1 Message Date
Guy Sartorelli
aa3642d30a
MNT Update release dependencies 2023-09-01 09:41:44 +12:00
Guy Sartorelli
242f1e380e
MNT Update development dependencies 2023-08-31 14:08:07 +12:00
Guy Sartorelli
38ed474e80
MNT Update release dependencies 2023-08-31 14:08:07 +12:00
Sabina Talipova
57d1b43553
Merge pull request #360 from creative-commoners/pulls/5/expose-theme-to-cow
MNT Expose theme to cow
2023-08-30 14:47:31 +12:00
Guy Sartorelli
3750aad8b5
MNT Expose theme to cow 2023-08-30 14:21:46 +12:00
Guy Sartorelli
8706c83d16
Merge branch '5.0' into 5 2023-08-30 10:37:45 +12:00
Guy Sartorelli
6c1f01d514
Merge pull request #359 from creative-commoners/pulls/5.0/module-standardiser-1693278774
MNT Run module-standardiser
2023-08-29 17:07:56 +12:00
Steve Boyd
1af206726d MNT Run module-standardiser 2023-08-29 15:12:54 +12:00
Guy Sartorelli
d031010b24
Merge branch '5.0' into 5 2023-08-29 10:29:38 +12:00
Guy Sartorelli
75fa6341bf
Merge branch '4' into 5.0 2023-08-29 10:29:16 +12:00
Maxime Rainville
6b5a78bfb3
Merge pull request #358 from creative-commoners/pulls/5/new-logo
ENH Change favicon to reflect new logo
2023-08-24 16:33:16 +12:00
Maxime Rainville
fc510dd3e8 ENH Change favicon to reflect new logo 2023-08-18 23:09:48 +12:00
Guy Sartorelli
3bbf050d7e
Merge pull request #357 from creative-commoners/pulls/5/module-standardiser-1691550163
MNT Run module-standardiser
2023-08-15 12:09:54 +12:00
Steve Boyd
7263abd4db MNT Run module-standardiser 2023-08-14 15:46:05 +12:00
Guy Sartorelli
a822137a3a
Merge pull request #354 from minimalic/patch-1
Fix link to V5 Docs
2023-06-09 12:00:40 +12:00
Guy Sartorelli
01a53bd7c1
Merge pull request #355 from minimalic/patch-2
Fixed link to V5 "Contributing Code" Docs
2023-06-09 11:32:54 +12:00
minimalic
d371ae7dc3
Fixed link to V5 "Contributing Code" Docs 2023-06-04 16:14:24 +02:00
minimalic
ab3d7bc206
Fix link to V5 Docs 2023-06-04 16:10:27 +02:00
Steve Boyd
72876e5983 MNT Update development dependencies 2023-05-04 13:27:05 +12:00
Steve Boyd
fd3ad3122d Merge branch '5.0' into 5 2023-05-04 13:27:05 +12:00
Steve Boyd
eaa41f179b MNT Update development dependencies 2023-05-04 12:36:10 +12:00
Steve Boyd
327017690b MNT Update release dependencies 2023-05-04 12:36:05 +12:00
Guy Sartorelli
efdead8e1a
Merge branch '4' into 5.0 2023-04-27 14:42:42 +12:00
Sabina Talipova
4fa9682b40
Merge pull request #353 from creative-commoners/pulls/5.0/cms5-readme
Failed tests are unrelated to this PR
2023-04-24 10:00:35 +12:00
Guy Sartorelli
a5e2f36ab8
DOC Update README.md for CMS 5 2023-04-19 17:47:31 +12:00
Steve Boyd
1f990c02f2 MNT Update development dependencies 2023-04-05 14:54:43 +12:00
Steve Boyd
96e34a5cd1 MNT Update release dependencies 2023-04-05 14:54:39 +12:00
Steve Boyd
1316480faf MNT Update development dependencies 2023-04-05 11:54:35 +12:00
Maxime Rainville
a564e32580
Merge pull request #350 from creative-commoners/pulls/5.0/optimal-file-resolution
ENH Remove duplicated configuration
2023-02-26 21:05:15 +13:00
Guy Sartorelli
c9bfb0e2a6
ENH Remove duplicated configuration
This is the default configuration in assets now. No need to double up on
it.
2023-02-24 10:38:53 +13:00
Steve Boyd
f89a827515 MNT Update development dependencies 2023-02-09 15:04:56 +13:00
Steve Boyd
602914a5e3 MNT Update release dependencies 2023-02-09 15:04:52 +13:00
Steve Boyd
dd70bec9f4 MNT Update development dependencies 2023-02-09 12:36:37 +13:00
Guy Sartorelli
5097dee0d7
Merge pull request #349 from creative-commoners/pulls/5/caret
DEP Use caret for plugins
2023-02-08 15:14:41 +13:00
Steve Boyd
7b49f0e129 DEP Use caret for plugins 2023-02-08 12:11:59 +13:00
Steve Boyd
516042084d Merge branch '4' into 5 2023-02-02 16:39:14 +13:00
Steve Boyd
d150c0058d Merge branch '4' into 5 2023-02-02 16:36:08 +13:00
Guy Sartorelli
9ed58415ab
MNT Remove unnecessary .htaccess file (#342)
This file will be pulled in from recipe-core
2022-12-16 10:06:35 +13:00
Guy Sartorelli
406ee71a48
DEP Require dev branches for composer plugins (#340)
This will fix a problem where our CI is checking out the alpha versions
instead of the current dev branch
2022-12-15 11:48:52 +13:00
Guy Sartorelli
30e39e3da7
Merge pull request #336 from creative-commoners/pulls/5/remove-email-config
MNT Remove unused email config
2022-10-20 13:39:04 +13:00
Steve Boyd
ddad942ea8 MNT Remove unused email config 2022-10-11 20:36:23 +13:00
Guy Sartorelli
06d822eda6
Merge pull request #331 from creative-commoners/pulls/5/major-deps
DEP Update core dependencies for CMS 5
2022-08-09 10:07:58 +12:00
Guy Sartorelli
1f718dcf54
ENH Remove resources-dir config from composer.json (#330) 2022-08-05 13:53:37 +12:00
Steve Boyd
8ca19d5eb7 DEP Update core dependencies for CMS 5 2022-08-05 09:35:35 +12:00
13 changed files with 32 additions and 64 deletions

View File

@ -3,7 +3,8 @@
"child-stability-inherit": true, "child-stability-inherit": true,
"dependency-constraint": "loose", "dependency-constraint": "loose",
"vendors": [ "vendors": [
"silverstripe" "silverstripe",
"silverstripe-themes"
], ],
"tests": [ "tests": [
"vendor/bin/phpunit vendor/silverstripe/framework/tests/php", "vendor/bin/phpunit vendor/silverstripe/framework/tests/php",

View File

@ -1,5 +1,5 @@
# For a complete list of core environment variables see # For a complete list of core environment variables see
# https://docs.silverstripe.org/en/4/getting_started/environment_management/#core-environment-variables # https://docs.silverstripe.org/en/5/getting_started/environment_management/#core-environment-variables
# DB credentials # DB credentials
SS_DATABASE_CLASS="MySQLDatabase" SS_DATABASE_CLASS="MySQLDatabase"

View File

@ -14,7 +14,7 @@ jobs:
endtoend: false endtoend: false
# require the following in ci.yml rather than composer.json require-dev specifically for installer because unlike # require the following in ci.yml rather than composer.json require-dev specifically for installer because unlike
# regular modules, require-dev will get installed to projects during `composer create-project silverstripe/installer` # regular modules, require-dev will get installed to projects during `composer create-project silverstripe/installer`
composer_require_extra: silverstripe/recipe-testing:^2 silverstripe/frameworktest:^0.4.2 mikey179/vfsstream:^1.6.10 composer_require_extra: silverstripe/recipe-testing:^3 silverstripe/frameworktest:^1 mikey179/vfsstream:^1.6.10
extra_jobs: | extra_jobs: |
- endtoend: true - endtoend: true
endtoend_suite: admin endtoend_suite: admin

View File

@ -1,10 +1,10 @@
name: Keepalive name: Keepalive
on: on:
workflow_dispatch: # At 1:05 PM UTC, on day 22 of the month
# The 8th of every month at 4:50pm UTC
schedule: schedule:
- cron: '50 16 8 * *' - cron: '5 13 22 * *'
workflow_dispatch:
jobs: jobs:
keepalive: keepalive:

View File

@ -1,2 +0,0 @@
RewriteEngine On
RewriteRule ^(.*)$ public/$1

View File

@ -9,7 +9,7 @@ Please read our [issue reporting guidelines](http://doc.silverstripe.org/framewo
## Development and Contribution ## ## Development and Contribution ##
For submitting patches, please read our [guide to contributing code](http://doc.silverstripe.org/framework/en/misc/contributing/code). We only accept pull requests on github.com. For submitting patches, please read our [guide to contributing code](https://docs.silverstripe.org/en/5/contributing/code/). We only accept pull requests on github.com.
## Links ## ## Links ##

View File

@ -1,4 +1,4 @@
Copyright (c) 2007-2017, SilverStripe Limited - www.silverstripe.com Copyright (c) 2007-2017, Silverstripe Limited - www.silverstripe.com
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
@ -6,7 +6,7 @@ Redistribution and use in source and binary forms, with or without modification,
* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution. documentation and/or other materials provided with the distribution.
* Neither the name of SilverStripe nor the names of its contributors may be used to endorse or promote products derived from this software * Neither the name of Silverstripe nor the names of its contributors may be used to endorse or promote products derived from this software
without specific prior written permission. without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

View File

@ -5,25 +5,27 @@
Base project folder for a Silverstripe ([http://silverstripe.org](http://silverstripe.org)) installation. Required modules are installed via [http://github.com/silverstripe/recipe-cms](http://github.com/silverstripe/recipe-cms). For information on how to change the dependencies in a recipe, please have a look at [https://github.com/silverstripe/recipe-plugin](https://github.com/silverstripe/recipe-plugin). In addition, installer includes [theme/simple](https://github.com/silverstripe-themes/silverstripe-simple) as a default theme. Base project folder for a Silverstripe ([http://silverstripe.org](http://silverstripe.org)) installation. Required modules are installed via [http://github.com/silverstripe/recipe-cms](http://github.com/silverstripe/recipe-cms). For information on how to change the dependencies in a recipe, please have a look at [https://github.com/silverstripe/recipe-plugin](https://github.com/silverstripe/recipe-plugin). In addition, installer includes [theme/simple](https://github.com/silverstripe-themes/silverstripe-simple) as a default theme.
## Installation ## ## Installation
`composer create-project silverstripe/installer my-app` ```sh
composer create-project silverstripe/installer my-app
```
See [Getting Started](https://docs.silverstripe.org/en/4/getting_started/) for more information. See [Getting Started](https://docs.silverstripe.org/en/getting_started/) for more information.
## Bugtracker ## ## Bugtracker
Bugs are tracked on github.com ([framework issues](https://github.com/silverstripe/silverstripe-framework/issues), Bugs are tracked on github.com ([framework issues](https://github.com/silverstripe/silverstripe-framework/issues),
[cms issues](https://github.com/silverstripe/silverstripe-cms/issues)). [cms issues](https://github.com/silverstripe/silverstripe-cms/issues)).
Please read our [issue reporting guidelines](https://docs.silverstripe.org/en/4/contributing/issues_and_bugs/). Please read our [issue reporting guidelines](https://docs.silverstripe.org/en/contributing/issues_and_bugs/).
## Development and Contribution ## ## Development and Contribution
If you would like to make changes to the Silverstripe core codebase, we have an extensive [guide to contributing code](https://docs.silverstripe.org/en/4/contributing/code/). If you would like to make changes to the Silverstripe core codebase, we have an extensive [guide to contributing code](https://docs.silverstripe.org/en/contributing/code/).
## Links ## ## Links
* [Changelogs](https://docs.silverstripe.org/en/4/changelogs/) * [Changelogs](https://docs.silverstripe.org/en/changelogs/)
* [Bugtracker: Framework](https://github.com/silverstripe/silverstripe-framework/issues) * [Bugtracker: Framework](https://github.com/silverstripe/silverstripe-framework/issues)
* [Bugtracker: CMS](https://github.com/silverstripe/silverstripe-cms/issues) * [Bugtracker: CMS](https://github.com/silverstripe/silverstripe-cms/issues)
* [Bugtracker: Installer](https://github.com/silverstripe/silverstripe-installer/issues) * [Bugtracker: Installer](https://github.com/silverstripe/silverstripe-installer/issues)

View File

@ -1,26 +0,0 @@
# SilverStripe 4.4 changes the way files are resolved. `silverstripe-assets` resolves files using a variety of formats
# by default. When starting a brand new project on SilverStripe 4.4 or greater, those extra formats are not needed and
# will slowdown file resolution requests a bit. This config removes those redundant formats.
---
Name: project-assetsflysystem
After: '#assetsflysystem'
---
SilverStripe\Core\Injector\Injector:
# Define public resolution strategy
SilverStripe\Assets\FilenameParsing\FileResolutionStrategy.public:
class: SilverStripe\Assets\FilenameParsing\FileIDHelperResolutionStrategy
properties:
ResolutionFileIDHelpers:
- '%$SilverStripe\Assets\FilenameParsing\HashFileIDHelper'
- '%$SilverStripe\Assets\FilenameParsing\NaturalFileIDHelper'
DefaultFileIDHelper: '%$SilverStripe\Assets\FilenameParsing\NaturalFileIDHelper'
VersionedStage: Live
# Define protected resolution strategy
SilverStripe\Assets\FilenameParsing\FileResolutionStrategy.protected:
class: SilverStripe\Assets\FilenameParsing\FileIDHelperResolutionStrategy
properties:
DefaultFileIDHelper: '%$SilverStripe\Assets\FilenameParsing\HashFileIDHelper'
ResolutionFileIDHelpers:
- '%$SilverStripe\Assets\FilenameParsing\HashFileIDHelper'
VersionedStage: Stage

View File

@ -1,9 +0,0 @@
# See https://docs.silverstripe.org/en/4/developer_guides/email/ for additional information about setting up email
---
Name: project-emailconfig
After:
- '#emailconfig'
---
SilverStripe\Core\Injector\Injector:
Swift_Transport:
class: Swift_SendmailTransport

View File

@ -3,14 +3,15 @@
"type": "silverstripe-recipe", "type": "silverstripe-recipe",
"description": "The SilverStripe Framework Installer", "description": "The SilverStripe Framework Installer",
"require": { "require": {
"php": "^7.4 || ^8.0", "php": "^8.1",
"silverstripe/recipe-plugin": "^1.2", "silverstripe/recipe-plugin": "~2.0.0@stable",
"silverstripe/recipe-cms": "4.x-dev", "silverstripe/vendor-plugin": "~2.0.1@stable",
"silverstripe-themes/simple": "~3.2.0", "silverstripe/recipe-cms": "~5.1.0@beta",
"silverstripe/login-forms": "4.x-dev" "silverstripe-themes/simple": "~3.3.0@stable",
"silverstripe/login-forms": "~5.1.0@beta"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "^9.5" "phpunit/phpunit": "^9.6"
}, },
"extra": { "extra": {
"project-files": [ "project-files": [
@ -21,8 +22,7 @@
"public-files": [ "public-files": [
"assets/*", "assets/*",
"favicon.ico" "favicon.ico"
], ]
"resources-dir": "_resources"
}, },
"config": { "config": {
"process-timeout": 600, "process-timeout": 600,

View File

@ -29,7 +29,9 @@
<!-- Framework ORM tests are split up to run in parallel --> <!-- Framework ORM tests are split up to run in parallel -->
<testsuite name="framework-core"> <testsuite name="framework-core">
<directory>vendor/silverstripe/framework/tests/php</directory> <directory>vendor/silverstripe/framework/tests/php</directory>
<exclude>vendor/silverstripe/framework/tests/php/ORM</exclude> <exclude>
<directory>vendor/silverstripe/framework/tests/php/ORM</directory>
</exclude>
</testsuite> </testsuite>
<testsuite name="framework-orm"> <testsuite name="framework-orm">
<directory>vendor/silverstripe/framework/tests/php/ORM</directory> <directory>vendor/silverstripe/framework/tests/php/ORM</directory>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 97 KiB