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

fix typo in translation key #1238

Closed
wants to merge 64 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
2b9d983
DEP PHP Support in CMS5
Dec 13, 2022
2024622
Merge pull request #1182 from creative-commoners/pulls/6/upgrade-cms5
Jan 12, 2023
14e1e5e
MNT Broken builds
emteknetnz Jan 19, 2023
9ca8399
Merge pull request #1186 from creative-commoners/pulls/6/broken-builds
Jan 20, 2023
b6fbd37
MNT Remove legacy upgrader config
emteknetnz Jan 20, 2023
232f1ac
Merge pull request #1188 from creative-commoners/pulls/6/remove-legac…
Jan 22, 2023
2ea1b07
MNT Broken builds
emteknetnz Jan 24, 2023
b25e905
MNT Unit test PHP 8.2 compatibility
emteknetnz Jan 19, 2023
c11d22b
Merge pull request #1190 from creative-commoners/pulls/6/broken-builds
GuySartorelli Jan 25, 2023
1ea2b8e
API Remove deprecated code (#1185)
sabina-talipova Jan 25, 2023
65d455f
Merge pull request #1187 from creative-commoners/pulls/6/php82
GuySartorelli Jan 25, 2023
1c0dd09
DEP Upgrade frontend build stack (#1191)
GuySartorelli Jan 30, 2023
77af081
Merge branch '5' into 6
emteknetnz Feb 2, 2023
22696bd
Merge branch '5' into 6.0
emteknetnz Mar 2, 2023
a8b45f3
Merge branch '6.0' into 6
emteknetnz Mar 2, 2023
2b9c2c3
Merge branch '5' into 6.0
emteknetnz Mar 7, 2023
f03b754
Merge branch '6.0' into 6
emteknetnz Mar 7, 2023
6ff2d0d
MNT Use gha-dispatch-ci
emteknetnz Mar 21, 2023
d60b97a
Merge pull request #1196 from creative-commoners/pulls/5/dispatch-ci
Mar 23, 2023
2edc35e
Merge branch '5' into 6.0
emteknetnz Mar 29, 2023
0074666
Merge branch '6.0' into 6
emteknetnz Mar 29, 2023
046527e
MNT Update dev JS
emteknetnz Apr 3, 2023
d651c12
Merge pull request #1202 from creative-commoners/pulls/6.0/devjs
Apr 3, 2023
c021ac1
DOC Update README.md for CMS 5
GuySartorelli Apr 19, 2023
82fb0d4
Merge pull request #1204 from creative-commoners/pulls/6.0/cms5-readme
sabina-talipova Apr 24, 2023
c57050e
Merge branch '5.15' into 5
GuySartorelli Apr 26, 2023
86f703f
Merge branch '5' into 6.0
GuySartorelli Apr 27, 2023
d222fa6
Merge branch '6.0' into 6
emteknetnz May 4, 2023
7af0009
FIX Passing array to setReplyTo method instead of string (#1208)
sabina-talipova May 17, 2023
1ccb587
Merge branch '5.15' into 5
emteknetnz May 30, 2023
5e08252
Merge branch '5' into 6.0
emteknetnz May 30, 2023
8e59783
Merge branch '6.0' into 6
emteknetnz May 30, 2023
a5e5afc
Merge branch '5.15' into 5
emteknetnz May 31, 2023
8a40ba9
Merge branch '5' into 6.0
emteknetnz May 31, 2023
7e370a9
Merge branch '6.0' into 6
emteknetnz May 31, 2023
6f699d0
Merge branch '5.15' into 6.0
emteknetnz Jun 1, 2023
4210189
Merge branch '6.0' into 6
emteknetnz Jun 1, 2023
94fe703
Merge branch '5.15' into 5
emteknetnz Jun 7, 2023
3c7fb05
Merge branch '5' into 6.0
emteknetnz Jun 7, 2023
183cd08
Merge branch '6.0' into 6
emteknetnz Jun 7, 2023
95d3cee
ENH Update translations
emteknetnz Jun 14, 2023
77548a2
Merge pull request #1215 from creative-commoners/pulls/6/tx-1686703601
GuySartorelli Jun 14, 2023
98cfb16
Merge branch '5.15' into 5
emteknetnz Jun 16, 2023
cd30814
Merge branch '5' into 6.0
emteknetnz Jun 16, 2023
b8b24e4
Merge branch '6.0' into 6
emteknetnz Jun 16, 2023
2d89d1b
DEP Update eslint module (#1222)
sabina-talipova Jul 11, 2023
f385459
MNT Run module-standardiser
emteknetnz Aug 9, 2023
4e86fcd
Merge pull request #1227 from creative-commoners/pulls/6/module-stand…
GuySartorelli Aug 15, 2023
1fb7c8a
Merge branch '5.15' into 5
github-actions[bot] Aug 16, 2023
1279551
Merge branch '5' into 6.0
emteknetnz Aug 22, 2023
39932fe
Merge branch '6.0' into 6
emteknetnz Aug 22, 2023
79dda2f
Merge branch '5.15' into 5
github-actions[bot] Aug 23, 2023
0e66e78
Merge branch '5' into 6.0
github-actions[bot] Aug 23, 2023
3576db9
Merge branch '6.0' into 6
github-actions[bot] Aug 23, 2023
2b68b0e
MNT Run module-standardiser
emteknetnz Aug 29, 2023
8330681
Merge pull request #1233 from creative-commoners/pulls/6.0/module-sta…
GuySartorelli Aug 29, 2023
cd1fdd3
Merge branch '6.0' into 6
GuySartorelli Aug 29, 2023
16c3c51
DEP Update JS dependencies (#1235)
github-actions[bot] Aug 31, 2023
830e539
Merge branch '5.15' into 5
github-actions[bot] Sep 6, 2023
a0d4ee3
fix typo in translation key
baukezwaan Sep 11, 2023
ca449db
Merge branch '5' into 6.0
GuySartorelli Sep 17, 2023
b1274c9
Merge branch '6.0' into 6.1
github-actions[bot] Sep 17, 2023
da62736
Merge branch '6.1' into 6
github-actions[bot] Sep 17, 2023
500878c
Merge branch 'silverstripe:6' into fix_translation_key
baukezwaan Sep 18, 2023
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
5 changes: 0 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,8 @@ on:
push:
pull_request:
workflow_dispatch:
# Every Saturday at 12:30pm UTC
schedule:
- cron: '30 12 * * 6'

jobs:
ci:
name: CI
# Only run cron on the silverstripe account
if: (github.event_name == 'schedule' && github.repository_owner == 'silverstripe') || (github.event_name != 'schedule')
uses: silverstripe/gha-ci/.github/workflows/ci.yml@v1
16 changes: 16 additions & 0 deletions .github/workflows/dispatch-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: Dispatch CI

on:
# At 12:30 PM UTC, only on Saturday and Sunday
schedule:
- cron: '30 12 * * 6,0'

jobs:
dispatch-ci:
name: Dispatch CI
# 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: Dispatch CI
uses: silverstripe/gha-dispatch-ci@v1
6 changes: 3 additions & 3 deletions .github/workflows/keepalive.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
name: Keepalive

on:
workflow_dispatch:
# The 4th of every month at 10:50am UTC
# At 1:05 AM UTC, on day 26 of the month
schedule:
- cron: '50 10 4 * *'
- cron: '5 1 26 * *'
workflow_dispatch:

jobs:
keepalive:
Expand Down
17 changes: 17 additions & 0 deletions .github/workflows/merge-up.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: Merge-up

on:
# At 12:30 PM UTC, only on Wednesday
schedule:
- cron: '30 12 * * 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
2 changes: 1 addition & 1 deletion .github/workflows/update-js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
workflow_dispatch:
# Run on a schedule of once per quarter
schedule:
- cron: '0 0 1 */3 *'
- cron: '5 1 1 */3 *'

jobs:
update-js:
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10
18
63 changes: 0 additions & 63 deletions .upgrade.yml

This file was deleted.

2 changes: 1 addition & 1 deletion license.md → LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2017, SilverStripe Limited
Copyright (c) 2017, Silverstripe Limited
All rights reserved.

Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
Expand Down
6 changes: 0 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@
UserForms enables CMS users to create dynamic forms via a drag and drop interface
and without getting involved in any PHP code.

## Requirements

See the "require" section of [composer.json](https://github.com/silverstripe/silverstripe-userforms/blob/master/composer.json)

## Features

* Construct a form using all major form fields (text, email, dropdown, radio, checkbox..)
Expand All @@ -26,8 +22,6 @@ See the "require" section of [composer.json](https://github.com/silverstripe/sil
composer require silverstripe/userforms
```

You'll also need to run `dev/build`. You should see a new page type in the CMS 'User Defined Form'. This has a new 'Form' tab which has your form builder.

## Spam protection

This module does not include spam protection out of the box. Without it, it's likely that your submissions could contain a considerable amount of spam. For public facing forms it is encouraged you review and install the following module plus one of the recommended 'verification system' modules outlined in the README.
Expand Down
31 changes: 0 additions & 31 deletions _config/legacy.yml

This file was deleted.

6 changes: 6 additions & 0 deletions babel.config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"presets": [
"@babel/preset-env",
"@babel/preset-react"
]
}
5 changes: 1 addition & 4 deletions client/dist/js/jquery-validation/additional-methods.min.js

Large diffs are not rendered by default.

5 changes: 1 addition & 4 deletions client/dist/js/jquery-validation/jquery.validate.min.js

Large diffs are not rendered by default.

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

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

Loading
Loading