From 720336dd78c0242a6ea79ec8fb22c32a00fc4fa8 Mon Sep 17 00:00:00 2001
From: Guy Sartorelli <36352093+GuySartorelli@users.noreply.github.com>
Date: Mon, 21 Aug 2023 13:16:28 +1200
Subject: [PATCH 1/2] ENH Update translations (#70)

---
 lang/es.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lang/es.yml b/lang/es.yml
index 2d3c6da..6726406 100644
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -1,8 +1,8 @@
 es:
-  SitewideContentReport:
+  SilverStripe\SiteWideContentReport\SitewideContentReport:
     AccessFromAllSubsites: '(accesible desde todos los sub sitios)'
     Created: Creado
-    Description: 'Todas las páginas y archivo en todos los sub sitios'
+    DescriptionIncludingSubsites: 'Todas las páginas y archivo en todos los sub sitios'
     Directory: Directorio
     Draft: Borrador
     FileType: 'Tipo de archivo'
@@ -16,11 +16,10 @@ es:
     Stage: Estado
     Subsite: 'Sub sitio'
     Title: 'Reporte del contenido en todo el sitio'
-    URL: URL
-  SilverStripe\SiteWideContentReport\SitewideContentReport:
+  SitewideContentReport:
     AccessFromAllSubsites: '(accesible desde todos los sub sitios)'
     Created: Creado
-    DescriptionIncludingSubsites: 'Todas las páginas y archivo en todos los sub sitios'
+    Description: 'Todas las páginas y archivo en todos los sub sitios'
     Directory: Directorio
     Draft: Borrador
     FileType: 'Tipo de archivo'
@@ -34,3 +33,4 @@ es:
     Stage: Estado
     Subsite: 'Sub sitio'
     Title: 'Reporte del contenido en todo el sitio'
+    URL: URL

From 9007222364454357b2e9a363157a04181087864c Mon Sep 17 00:00:00 2001
From: Steve Boyd <emteknetnz@gmail.com>
Date: Tue, 29 Aug 2023 15:16:46 +1200
Subject: [PATCH 2/2] MNT Run module-standardiser

---
 .github/workflows/keepalive.yml |  6 +++---
 .github/workflows/merge-up.yml  | 17 +++++++++++++++++
 .github/workflows/update-js.yml | 17 +++++++++++++++++
 license.md => LICENSE           |  0
 composer.json                   |  4 ++--
 5 files changed, 39 insertions(+), 5 deletions(-)
 create mode 100644 .github/workflows/merge-up.yml
 create mode 100644 .github/workflows/update-js.yml
 rename license.md => LICENSE (100%)

diff --git a/.github/workflows/keepalive.yml b/.github/workflows/keepalive.yml
index 4cf5fbb..4cd13e1 100644
--- a/.github/workflows/keepalive.yml
+++ b/.github/workflows/keepalive.yml
@@ -1,10 +1,10 @@
 name: Keepalive
 
 on:
-  workflow_dispatch:
-  # The 4th of every month at 10:50am UTC
+  # At 7:35 AM UTC, on day 16 of the month
   schedule:
-    - cron: '50 10 4 * *'
+    - cron: '35 7 16 * *'
+  workflow_dispatch:
 
 jobs:
   keepalive:
diff --git a/.github/workflows/merge-up.yml b/.github/workflows/merge-up.yml
new file mode 100644
index 0000000..b4bde6e
--- /dev/null
+++ b/.github/workflows/merge-up.yml
@@ -0,0 +1,17 @@
+name: Merge-up
+
+on:
+  # At 11:00 AM UTC, only on Wednesday
+  schedule:
+    - cron: '0 11 * * 3'
+  workflow_dispatch:
+
+jobs:
+  merge-up:
+    name: Merge-up
+    # Only run cron on the silverstripe account
+    if: (github.event_name == 'schedule' && github.repository_owner == 'silverstripe') || (github.event_name != 'schedule')
+    runs-on: ubuntu-latest
+    steps:
+      - name: Merge-up
+        uses: silverstripe/gha-merge-up@v1
diff --git a/.github/workflows/update-js.yml b/.github/workflows/update-js.yml
new file mode 100644
index 0000000..ca47569
--- /dev/null
+++ b/.github/workflows/update-js.yml
@@ -0,0 +1,17 @@
+name: Update JS
+
+on:
+  workflow_dispatch:
+  # Run on a schedule of once per quarter
+  schedule:
+    - cron: '35 7 1 */3 *'
+
+jobs:
+  update-js:
+    name: Update JS
+    # Only run cron on the silverstripe account
+    if: (github.event_name == 'schedule' && github.repository_owner == 'silverstripe') || (github.event_name != 'schedule')
+    runs-on: ubuntu-latest
+    steps:
+      - name: Update JS
+        uses: silverstripe/gha-update-js@v1
diff --git a/license.md b/LICENSE
similarity index 100%
rename from license.md
rename to LICENSE
diff --git a/composer.json b/composer.json
index 31cd98a..3850318 100644
--- a/composer.json
+++ b/composer.json
@@ -13,7 +13,7 @@
         "silverstripe/reports": "^5"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.5",
+        "phpunit/phpunit": "^9.6",
         "squizlabs/php_codesniffer": "^3",
         "silverstripe/subsites": "^3",
         "silverstripe/taxonomy": "^3",
@@ -49,4 +49,4 @@
     },
     "prefer-stable": true,
     "minimum-stability": "dev"
-}
\ No newline at end of file
+}