Compare commits

...

60 Commits
4 ... 5.2.0-rc1

Author SHA1 Message Date
Guy Sartorelli ad5f5f1f6f
MNT Update release dependencies 2024-03-25 12:11:48 +13:00
Steve Boyd d0c15256ba MNT Update development dependencies 2024-03-05 14:41:36 +13:00
Steve Boyd 2d15fb2b5e MNT Update release dependencies 2024-03-05 14:41:33 +13:00
Steve Boyd 8a3047a0a5 MNT Update development dependencies 2024-03-05 14:34:16 +13:00
Guy Sartorelli 80c2dc5063
MNT Run module-standardiser (#363) 2023-12-21 16:20:24 +13:00
Guy Sartorelli abb17865e4
MNT Update development dependencies 2023-10-16 16:47:02 +13:00
Guy Sartorelli e86725dc6e
Merge branch '5.1' into 5 2023-10-16 16:47:02 +13:00
Guy Sartorelli afdcf82e1d
MNT Update development dependencies 2023-10-16 16:24:13 +13:00
Guy Sartorelli 8f560c9d9f
MNT Update release dependencies 2023-10-16 16:24:10 +13:00
Maxime Rainville a5d3ccb882
Merge pull request #362 from creative-commoners/pulls/5.1/update-favicon
FIX Add padding to favicon
2023-10-02 22:05:48 +13:00
Guy Sartorelli a3f8e7ef3e
FIX Add padding to favicon 2023-09-28 09:54:41 +13:00
Guy Sartorelli 05b53e4f75
MNT Update development dependencies 2023-09-19 11:11:27 +12:00
Guy Sartorelli a8ea681f3c
MNT Update release dependencies 2023-09-19 11:11:24 +12:00
Guy Sartorelli b668229973
Merge branch '5.0' into 5.1 2023-09-18 11:38:16 +12:00
Guy Sartorelli 6119d97ebd
Merge branch '4' into 5.0 2023-09-18 11:34:14 +12:00
Guy Sartorelli 87ad69b735
MNT Update development dependencies 2023-09-01 09:41:48 +12:00
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
17 changed files with 184 additions and 63 deletions

View File

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

View File

@ -1,5 +1,5 @@
# 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
SS_DATABASE_CLASS="MySQLDatabase"

1
.github/ISSUE_TEMPLATE.md vendored Normal file
View File

@ -0,0 +1 @@
<!-- Blank templates are for use by maintainers only! If you aren't a maintainer, please go back and pick one of the issue templates. -->

72
.github/ISSUE_TEMPLATE/1_bug_report.yml vendored Normal file
View File

@ -0,0 +1,72 @@
name: 🪳 Bug Report
description: Tell us if something isn't working the way it's supposed to
body:
- type: markdown
attributes:
value: |
We strongly encourage you to [submit a pull request](https://docs.silverstripe.org/en/contributing/code/) which fixes the issue.
Bug reports which are accompanied with a pull request are a lot more likely to be resolved quickly.
- type: input
id: affected-versions
attributes:
label: Module version(s) affected
description: |
What version of _this module_ have you reproduced this bug on?
Run `composer info` to see the specific version of each module installed in your project.
If you don't have access to that, check inside the help menu in the bottom left of the CMS.
placeholder: x.y.z
validations:
required: true
- type: textarea
id: description
attributes:
label: Description
description: A clear and concise description of the problem
validations:
required: true
- type: textarea
id: how-to-reproduce
attributes:
label: How to reproduce
description: |
⚠️ This is the most important part of the report ⚠️
Without a way to easily reproduce your issue, there is little chance we will be able to help you and work on a fix.
- Please, take the time to show us some code and/or configuration that is needed for others to reproduce the problem easily.
- If the bug is too complex to reproduce with some short code samples, please reproduce it in a public repository and provide a link to the repository along with steps for setting up and reproducing the bug using that repository.
- If part of the bug includes an error or exception, please provide a full stack trace.
- If any user interaction is required to reproduce the bug, please add an ordered list of steps that are required to reproduce it.
- Be as clear as you can, but don't miss any steps out. Simply saying "create a page" is less useful than guiding us through the steps you're taking to create a page, for example.
placeholder: |
#### Code sample
```php
```
#### Reproduction steps
1.
validations:
required: true
- type: textarea
id: possible-solution
attributes:
label: Possible Solution
description: |
*Optional: only if you have suggestions on a fix/reason for the bug*
Please consider [submitting a pull request](https://docs.silverstripe.org/en/contributing/code/) with your solution! It helps get faster feedback and greatly increases the chance of the bug being fixed.
- type: textarea
id: additional-context
attributes:
label: Additional Context
description: "*Optional: any other context about the problem: log messages, screenshots, etc.*"
- type: checkboxes
id: validations
attributes:
label: Validations
description: "Before submitting the issue, please make sure you do the following:"
options:
- label: Check that there isn't already an issue that reports the same bug
required: true
- label: Double check that your reproduction steps work in a fresh installation of [`silverstripe/installer`](https://github.com/silverstripe/silverstripe-installer) (with any code examples you've provided)
required: true

View File

@ -0,0 +1,35 @@
name: 🚀 Feature Request
description: Submit a feature request (but only if you're planning on implementing it)
body:
- type: markdown
attributes:
value: |
Please only submit feature requests if you plan on implementing the feature yourself.
See the [contributing code documentation](https://docs.silverstripe.org/en/contributing/code/#make-or-find-a-github-issue) for more guidelines about submitting feature requests.
- type: textarea
id: description
attributes:
label: Description
description: A clear and concise description of the new feature, and why it belongs in core
validations:
required: true
- type: textarea
id: more-info
attributes:
label: Additional context or points of discussion
description: |
*Optional: Any additional context, points of discussion, etc that might help validate and refine your idea*
- type: checkboxes
id: validations
attributes:
label: Validations
description: "Before submitting the issue, please confirm the following:"
options:
- label: You intend to implement the feature yourself
required: true
- label: You have read the [contributing guide](https://docs.silverstripe.org/en/contributing/code/)
required: true
- label: You strongly believe this feature should be in core, rather than being its own community module
required: true
- label: You have checked for existing issues or pull requests related to this feature (and didn't find any)
required: true

8
.github/ISSUE_TEMPLATE/config.yml vendored Normal file
View File

@ -0,0 +1,8 @@
blank_issues_enabled: true
contact_links:
- name: Security Vulnerability
url: https://docs.silverstripe.org/en/contributing/issues_and_bugs/#reporting-security-issues
about: ⚠️ We do not use GitHub issues to track security vulnerability reports. Click "open" on the right to see how to report security vulnerabilities.
- name: Support Question
url: https://www.silverstripe.org/community/
about: We use GitHub issues only to discuss bugs and new features. For support questions, please use one of the support options available in our community channels.

39
.github/PULL_REQUEST_TEMPLATE.md vendored Normal file
View File

@ -0,0 +1,39 @@
<!--
Thanks for contributing, you're awesome! ⭐
Please read https://docs.silverstripe.org/en/contributing/code/ if you haven't contributed to this project recently.
-->
## Description
<!--
Please describe expected and observed behaviour, and what you're fixing.
For visual fixes, please include tested browsers and screenshots.
-->
## Manual testing steps
<!--
Include any manual testing steps here which a reviewer can perform to validate your pull request works correctly.
Note that this DOES NOT replace unit or end-to-end tests.
-->
## Issues
<!--
List all issues here that this pull request fixes/resolves.
If there is no issue already, create a new one! You must link your pull request to at least one issue.
-->
- #
## Pull request checklist
<!--
PLEASE check each of these to ensure you have done everything you need to do!
If there's something in this list you need help with, please ask so that we can assist you.
-->
- [ ] The target branch is correct
- See [picking the right version](https://docs.silverstripe.org/en/contributing/code/#picking-the-right-version)
- [ ] All commits are relevant to the purpose of the PR (e.g. no debug statements, unrelated refactoring, or arbitrary linting)
- Small amounts of additional linting are usually okay, but if it makes it hard to concentrate on the relevant changes, ask for the unrelated changes to be reverted, and submitted as a separate PR.
- [ ] The commit messages follow our [commit message guidelines](https://docs.silverstripe.org/en/contributing/code/#commit-messages)
- [ ] The PR follows our [contribution guidelines](https://docs.silverstripe.org/en/contributing/code/)
- [ ] Code changes follow our [coding conventions](https://docs.silverstripe.org/en/contributing/coding_conventions/)
- [ ] This change is covered with tests (or tests aren't necessary for this change)
- [ ] Any relevant User Help/Developer documentation is updated; for impactful changes, information is added to the changelog for the intended release
- [ ] CI is green

View File

@ -14,7 +14,7 @@ jobs:
endtoend: false
# 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`
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: |
- endtoend: true
endtoend_suite: admin

View File

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

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.
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 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.
* 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.
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.
## 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),
[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: CMS](https://github.com/silverstripe/silverstripe-cms/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",
"description": "The SilverStripe Framework Installer",
"require": {
"php": "^7.4 || ^8.0",
"silverstripe/recipe-plugin": "^1.2",
"silverstripe/recipe-cms": "4.x-dev",
"silverstripe-themes/simple": "~3.2.0",
"silverstripe/login-forms": "4.x-dev"
"php": "^8.1",
"silverstripe/recipe-plugin": "~2.0.0@stable",
"silverstripe/vendor-plugin": "~2.0.2@stable",
"silverstripe/recipe-cms": "~5.2.0@rc",
"silverstripe-themes/simple": "~3.3.1@stable",
"silverstripe/login-forms": "~5.2.0@rc"
},
"require-dev": {
"phpunit/phpunit": "^9.5"
"phpunit/phpunit": "^9.6"
},
"extra": {
"project-files": [
@ -21,8 +22,7 @@
"public-files": [
"assets/*",
"favicon.ico"
],
"resources-dir": "_resources"
]
},
"config": {
"process-timeout": 600,

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB