Skip to content

Commit

Permalink
Merge branch '4.3' into 4
Browse files Browse the repository at this point in the history
  • Loading branch information
emteknetnz committed Aug 2, 2022
2 parents 1caec32 + 9173840 commit 8ac7d73
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 30 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ jobs:
ci:
name: CI
# Only run cron on the silverstripe account
if: (github.event_name == 'schedule' && startsWith(github.repository, 'silverstripe/')) || (github.event_name != 'schedule')
if: (github.event_name == 'schedule' && github.repository_owner == 'silverstripe') || (github.event_name != 'schedule')
uses: silverstripe/gha-ci/.github/workflows/ci.yml@v1
2 changes: 1 addition & 1 deletion .github/workflows/keepalive.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
keepalive:
name: Keepalive
# Only run cron on the silverstripe account
if: (github.event_name == 'schedule' && startsWith(github.repository, 'silverstripe/')) || (github.event_name != 'schedule')
if: (github.event_name == 'schedule' && github.repository_owner == 'silverstripe') || (github.event_name != 'schedule')
runs-on: ubuntu-latest
steps:
- name: Keepalive
Expand Down
16 changes: 0 additions & 16 deletions .scrutinizer.yml

This file was deleted.

4 changes: 0 additions & 4 deletions .travis.yml

This file was deleted.

11 changes: 3 additions & 8 deletions readme.md → README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
# Akismet Silverstripe Module

[![CI](https://github.com/silverstripe/silverstripe-akismet/actions/workflows/ci.yml/badge.svg)](https://github.com/silverstripe/silverstripe-akismet/actions/workflows/ci.yml)
[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/silverstripe/silverstripe-akismet/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/silverstripe/silverstripe-akismet/?branch=master)
[![codecov](https://codecov.io/gh/silverstripe/silverstripe-akismet/branch/master/graph/badge.svg)](https://codecov.io/gh/silverstripe/silverstripe-akismet)
[![SilverStripe supported module](https://img.shields.io/badge/silverstripe-supported-0071C4.svg)](https://www.silverstripe.org/software/addons/silverstripe-commercially-supported-module-list/)
[![Silverstripe supported module](https://img.shields.io/badge/silverstripe-supported-0071C4.svg)](https://www.silverstripe.org/software/addons/silverstripe-commercially-supported-module-list/)

Simple spam filter for Silverstripe using Akismet

Expand All @@ -19,12 +17,12 @@ Please see [the changelog](changelog.md) for module history.

## Requirements

* SilverStripe 4.0+
* Silverstripe 4.0+
* Silverstripe SpamProtection module - <https://github.com/silverstripe/silverstripe-spamprotection>
* Tijs Verkoyen's Akismet API wrapper - <https://github.com/tijsverkoyen/Akismet>
* PHP 5.6 or higher

**Note:** For a SilverStripe 3.x compatible version, please use [the 1.x release line](https://github.com/silverstripe/silverstripe-mimevalidator/tree/1.0).
**Note:** For a Silverstripe 3.x compatible version, please use [the 1.x release line](https://github.com/silverstripe/silverstripe-mimevalidator/tree/1.0).

## Installation Instructions

Expand Down Expand Up @@ -83,7 +81,6 @@ Please note that the API key values defined in the various ways above will be pr
2. Values defined in configuration, whether YAML or in \_config.php files with `Config::modify()->set(...)`
3. Values defined in the environment via .env


## Testing

By default, spam protection is disabled for users with ADMIN priviliges. There is also an option to disable
Expand Down Expand Up @@ -123,7 +120,6 @@ the following to your configuration.

config.yml


```yaml
# Allows spam posts to be saved for review if necessary
SilverStripe\Akismet\AkismetSpamProtector:
Expand All @@ -145,7 +141,6 @@ $form->enableSpamProtection(array(
);
````


## Important notes for those in the EU

Because of the way Akismet works (message, author, and other information sent to a third party) in some countries
Expand Down
1 change: 1 addition & 0 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit bootstrap="vendor/silverstripe/cms/tests/bootstrap.php" colors="true">
<testsuites>
<testsuite name="Default">
Expand Down

0 comments on commit 8ac7d73

Please sign in to comment.