Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge branch '7' into 8 #878

Merged
merged 53 commits into from
Aug 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
43dc86d
API Standardise deprecations
GuySartorelli Feb 17, 2023
3f2b86b
Merge pull request #783 from creative-commoners/pulls/5/deprecations
tractorcow Feb 22, 2023
f07b036
FIX Don't try to preview unlocalised objects (#781)
GuySartorelli May 23, 2023
034dd15
Update FluentExtension.php
mikey-harveycameron May 31, 2023
53ca9ef
Merge pull request #799 from mikey-harveycameron/patch-2
tractorcow May 31, 2023
336dca2
Implement onAfterDuplicate
RVXD Jun 16, 2023
43b4214
Add onAfterDuplicate to FluentVersionedExtension
RVXD Jun 16, 2023
6313e6d
Merge pull request #804 from RVXD/patch-3
tractorcow Jun 21, 2023
9d04d7a
feat: add absolute base url for locale
tractorcow Aug 31, 2023
904e3f4
chore: fix linting
tractorcow Sep 1, 2023
ba53c83
Merge pull request #809 from tractorcow/feat/base-url
tractorcow Sep 1, 2023
9ab08d1
copy Bugfix from here https://github.com/tractorcow-farm/silverstripe…
MLindenhofer Nov 14, 2023
f18bc71
fix: allow plugins
tractorcow Nov 14, 2023
3ac5a90
Merge pull request #815 from MLindenhofer/ML_CopyFixFromMaster
tractorcow Nov 14, 2023
14ecdb1
FIX allows i18nTextCollector to concatenate keys
davejtoews Feb 8, 2024
2a8e81e
Adds full namespace to string literal
davejtoews Feb 9, 2024
42ecdc3
Merge pull request #824 from davejtoews/bugfix-textcollector-warnings
tractorcow Feb 13, 2024
f79f0f9
fix: don't invoke db for ready check outside of dev urls
tractorcow Mar 20, 2024
05ef577
fix: redundant import
tractorcow Mar 20, 2024
1685a68
Merge pull request #831 from tractorcow-farm/fix/check
tractorcow Mar 24, 2024
182e829
Merge remote-tracking branch 'origin/5.1' into 5
tractorcow Mar 24, 2024
4c1f1e8
Merge remote-tracking branch 'origin/5' into 6
tractorcow Mar 24, 2024
8985d8c
fix: check for request prior to access
tractorcow Mar 24, 2024
9e650e6
Merge pull request #833 from tractorcow-farm/fix/dbready-check-6
tractorcow Mar 24, 2024
9aea31d
NEW Added dev/task to initialise DataObjects for existing datasets
nathanbrauer Mar 27, 2024
07328cf
DOC Updated documentation for new DataObject initialisation task
nathanbrauer Apr 2, 2024
acb1466
Merge pull request #835 from nathanbrauer/feature/initial-task-for-da…
tractorcow Apr 2, 2024
5d66753
TLN Update translations
GuySartorelli May 7, 2024
162572d
Merge pull request #845 from creative-commoners/pulls/7.1/tx-1715046311
tractorcow May 7, 2024
f54103b
Merge branch '6.0' into 6
GuySartorelli May 23, 2024
04c6358
Merge pull request #854 from creative-commoners/pulls/6/merge-conflict
emteknetnz May 24, 2024
a702f41
Merge branch '6' into 7
GuySartorelli May 29, 2024
17c5cd2
MNT Run module-standardiser (#858)
GuySartorelli May 30, 2024
392d019
Merge pull request #856 from creative-commoners/pulls/7.1/merge-conflict
emteknetnz May 30, 2024
092638a
ENH Use class name instead of self
emteknetnz Jun 5, 2024
73844e3
Merge pull request #859 from creative-commoners/pulls/7.1/remove-self
tractorcow Jun 5, 2024
eaece0a
FIX Only select columns from the current database
emteknetnz Jun 6, 2024
2714bff
FIX Create a temp locale if there is not a default
emteknetnz Jun 6, 2024
b14687a
.
emteknetnz Jun 6, 2024
87abf4c
Merge pull request #860 from creative-commoners/pulls/7/fix-sink
GuySartorelli Jun 6, 2024
713786b
FIX Preview link when no locale set
emteknetnz Jun 10, 2024
201826e
ENH Revert temporary locale fix
emteknetnz Jun 10, 2024
80293d2
Merge pull request #861 from creative-commoners/pulls/7/fix-preview
GuySartorelli Jun 11, 2024
b7b1de9
Merge branch '7.1' into 7
GuySartorelli Jun 11, 2024
411c1e2
Merge pull request #863 from creative-commoners/pulls/7/merge-from-7.1
emteknetnz Jun 11, 2024
18622bf
MNT Replace sass-lint with stylelint (#862)
GuySartorelli Jun 11, 2024
8c9745e
ENH Don't use keyword self
GuySartorelli Jul 29, 2024
b7ed95b
Merge pull request #867 from creative-commoners/pulls/7/no-keyword-self
emteknetnz Jul 29, 2024
3935c63
MNT Run module-standardiser (#868)
GuySartorelli Aug 1, 2024
41015aa
TLN Update translations (#870)
GuySartorelli Aug 6, 2024
8f7d803
FIX Correct trailing slash for locale in another domain (#872)
GuySartorelli Aug 13, 2024
4ced4a5
Merge branch '7.1' into 7
GuySartorelli Aug 19, 2024
1c43bd6
Merge pull request #877 from creative-commoners/7
tractorcow Aug 20, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions .github/workflows/tag-patch-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Tag patch release

on:
# https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#workflow_dispatch
workflow_dispatch:
inputs:
latest_local_sha:
description: The latest local sha
required: true
type: string

permissions: {}

jobs:
tagpatchrelease:
name: Tag patch release
# Only run cron on the tractorcow-farm account
if: (github.event_name == 'schedule' && github.repository_owner == 'tractorcow-farm') || (github.event_name != 'schedule')
runs-on: ubuntu-latest
permissions:
contents: write
steps:
- name: Tag release
uses: silverstripe/gha-tag-release@v2
with:
latest_local_sha: ${{ inputs.latest_local_sha }}
4 changes: 2 additions & 2 deletions .github/workflows/update-js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: Update JS

on:
workflow_dispatch:
# Run on a schedule of once per quarter
# At 4:20 AM UTC, on day 1 of the month, only in March and September
schedule:
- cron: '20 4 1 */3 *'
- cron: '20 4 1 3,9 *'

permissions: {}

Expand Down
179 changes: 0 additions & 179 deletions .sass-lint.yml

This file was deleted.

1 change: 1 addition & 0 deletions .stylelintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module.exports = require('@silverstripe/eslint-config/.stylelintrc');
2 changes: 1 addition & 1 deletion client/dist/styles/fluent.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions client/src/styles/fluent.scss
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ $fluent-color-localised: rgb(102, 15, 242);
position: relative;

&:before {
color: white;
color: #fff;
position: absolute;
top: 50%;
line-height: 0;
Expand All @@ -72,7 +72,7 @@ $fluent-color-localised: rgb(102, 15, 242);
background-size: 12px;
border-radius: 5px;
border: 0 none;
color: white;
color: #fff;
padding: 5px 21px 5px 24px;
width: 100%;

Expand All @@ -82,7 +82,7 @@ $fluent-color-localised: rgb(102, 15, 242);
padding: 2px;

> option {
color: white;
color: #fff;
}
}
}
Expand Down Expand Up @@ -146,7 +146,7 @@ $fluent-color-localised: rgb(102, 15, 242);
line-height: 1em;
display: block !important;// sass-lint:disable-line no-important
margin: 0;
padding: 0 11px 8px 11px;
padding: 0 11px 8px;
border-bottom: 1px solid #ccc;
color: #999;

Expand Down
Loading
Loading