Skip to content

Commit

Permalink
Merge branch '2.3' into 2
Browse files Browse the repository at this point in the history
  • Loading branch information
emteknetnz committed Aug 2, 2022
2 parents 6dcd61e + d0db9a4 commit 7e08be2
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 29 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
15 changes: 0 additions & 15 deletions .scrutinizer.yml

This file was deleted.

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

This file was deleted.

14 changes: 6 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,23 +1,21 @@
# SilverStripe Document Converter
# Silverstripe Document Converter

[![CI](https://github.com/silverstripe/silverstripe-documentconverter/actions/workflows/ci.yml/badge.svg)](https://github.com/silverstripe/silverstripe-documentconverter/actions/workflows/ci.yml)
[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/silverstripe/silverstripe-documentconverter/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/silverstripe/silverstripe-documentconverter/?branch=master)
[![codecov](https://codecov.io/gh/silverstripe/silverstripe-documentconverter/branch/master/graph/badge.svg)](https://codecov.io/gh/silverstripe/silverstripe-documentconverter)
[![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/)

## Overview

The module adds functionality to import OpenOffice-compatible files (doc, docx, etc) into SilverStripe pages and content.
The module adds functionality to import OpenOffice-compatible files (doc, docx, etc) into Silverstripe pages and content.

## Requirements

* SilverStripe CMS ^4
* Silverstripe CMS ^4

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

## Installation

Install with [composer](https://getcomposer.org/) by running `composer require silverstripe/documentconverter` in the root of your SilverStripe project.
Install with [composer](https://getcomposer.org/) by running `composer require silverstripe/documentconverter` in the root of your Silverstripe project.

## Configuration

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 7e08be2

Please sign in to comment.