Skip to content

Commit 682e4e5

Browse files
committed
Merge branch 'forgotPassword' of https://github.com/dblythy/parse-server into forgotPassword
2 parents 1c00821 + 5874552 commit 682e4e5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+1119
-736
lines changed

.dockerignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
node_modules
22
npm-debug.log
33
*.md
4-
PATENTS
5-
LICENSE
64
Dockerfile
75
.dockerignore
86
.gitignore

.flowconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@
88

99
[options]
1010
suppress_comment= \\(.\\|\n\\)*\\@flow-disable-next
11+
esproposal.optional_chaining=enable

.github/pull_request_template.md

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,21 @@
1-
### New Pull Request Checklist
2-
<!--
3-
Please check the following boxes [x] before submitting your issue.
4-
Click the "Preview" tab for better readability.
5-
Thanks for contributing to Parse Server!
6-
-->
1+
## Pull Request
72

8-
- [ ] I am not disclosing a [vulnerability](https://github.com/parse-community/parse-server/blob/master/SECURITY.md).
9-
- [ ] I am creating this PR in reference to an [issue](https://github.com/parse-community/parse-server/issues?q=is%3Aissue).
3+
- Report security issues [confidentially](https://github.com/parse-community/parse-server/security/policy).
4+
- Any contribution is under this [license](https://github.com/parse-community/parse-server/blob/alpha/LICENSE).
5+
- Link this pull request to an [issue](https://github.com/parse-community/parse-server/issues?q=is%3Aissue).
106

11-
### Issue Description
12-
<!-- Add a brief description of the issue this PR solves. -->
7+
## Issue
8+
<!-- Add the link to the issue that this PR closes. -->
139

1410
Closes: FILL_THIS_OUT
1511

16-
### Approach
17-
<!-- Add a description of the approach in this PR. -->
12+
## Approach
13+
<!-- Describe the changes in this PR. -->
1814

19-
### TODOs before merging
20-
<!--
21-
Add TODOs that need to be completed before merging this PR.
22-
Delete suggested TODOs that do not apply to this PR.
23-
-->
15+
## Tasks
16+
<!-- Delete tasks that don't apply. -->
2417

2518
- [ ] Add tests
26-
- [ ] Add changes to documentation (guides, repository pages, in-code descriptions)
19+
- [ ] Add changes to documentation (guides, repository pages, code comments)
2720
- [ ] Add [security check](https://github.com/parse-community/parse-server/blob/master/CONTRIBUTING.md#security-checks)
2821
- [ ] Add new Parse Error codes to Parse JS SDK <!-- no hard-coded error codes in Parse Server -->

.github/workflows/ci.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ on:
33
push:
44
branches: [ release*, alpha, beta ]
55
pull_request:
6-
branches: [ release*, alpha, beta ]
6+
branches:
7+
- '**'
78
env:
89
NODE_VERSION: 19.3.0
910
PARSE_SERVER_TEST_TIMEOUT: 20000
@@ -193,6 +194,9 @@ jobs:
193194
steps:
194195
- name: Fix usage of insecure GitHub protocol
195196
run: sudo git config --system url."https://github".insteadOf "git://github"
197+
- name: Fix git protocol for Node 14
198+
if: ${{ startsWith(matrix.NODE_VERSION, '14.') }}
199+
run: sudo git config --system url."https://github".insteadOf "ssh://git@github"
196200
- uses: actions/checkout@v2
197201
- name: Use Node.js ${{ matrix.NODE_VERSION }}
198202
uses: actions/setup-node@v2

2.3.0.md

Lines changed: 0 additions & 82 deletions
This file was deleted.

3.0.0.md

Lines changed: 0 additions & 226 deletions
This file was deleted.

0 commit comments

Comments
 (0)