Skip to content

Commit 21f328a

Browse files
SaerisSaeris
committed
Merge branch 'master' into prototype-common-sync
2 parents 882514e + 4a8fc8d commit 21f328a

File tree

257 files changed

+5178
-4331
lines changed

Some content is hidden

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

257 files changed

+5178
-4331
lines changed

‎.all-contributorsrc

Lines changed: 56 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1359,6 +1359,15 @@
13591359
"code"
13601360
]
13611361
},
1362+
{
1363+
"login": "HTMLGhozt",
1364+
"name": "Thomas Dillard",
1365+
"avatar_url": "https://avatars1.githubusercontent.com/u/12449668?v=4",
1366+
"profile": "http://ThomasDillard.com",
1367+
"contributions": [
1368+
"code"
1369+
]
1370+
},
13621371
{
13631372
"login": "chinmay17",
13641373
"name": "Chinmay Chaudhary",
@@ -1377,6 +1386,15 @@
13771386
"code"
13781387
]
13791388
},
1389+
{
1390+
"login": "NabeelahY",
1391+
"name": "Nabeelah",
1392+
"avatar_url": "https://avatars1.githubusercontent.com/u/35764602?v=4",
1393+
"profile": "https://github.com/NabeelahY",
1394+
"contributions": [
1395+
"code"
1396+
]
1397+
},
13801398
{
13811399
"login": "vanya829",
13821400
"name": "vanya829",
@@ -1386,6 +1404,15 @@
13861404
"code"
13871405
]
13881406
},
1407+
{
1408+
"login": "tanem",
1409+
"name": "Tane Morgan",
1410+
"avatar_url": "https://avatars3.githubusercontent.com/u/464864?v=4",
1411+
"profile": "https://github.com/tanem",
1412+
"contributions": [
1413+
"code"
1414+
]
1415+
},
13891416
{
13901417
"login": "hetpatel33",
13911418
"name": "Het Patel",
@@ -1395,6 +1422,15 @@
13951422
"code"
13961423
]
13971424
},
1425+
{
1426+
"login": "ivandevp",
1427+
"name": "Ivan Medina",
1428+
"avatar_url": "https://avatars3.githubusercontent.com/u/9284690?v=4",
1429+
"profile": "https://twitter.com/ivandevp",
1430+
"contributions": [
1431+
"code"
1432+
]
1433+
},
13981434
{
13991435
"login": "Gobinath-Manokaran",
14001436
"name": "Gobinath-Manokaran",
@@ -1449,8 +1485,27 @@
14491485
"contributions": [
14501486
"code"
14511487
]
1488+
},
1489+
{
1490+
"login": "sajadhsm",
1491+
"name": "Sajad Hashemian",
1492+
"avatar_url": "https://avatars3.githubusercontent.com/u/20022818?v=4",
1493+
"profile": "https://github.com/sajadhsm",
1494+
"contributions": [
1495+
"code"
1496+
]
1497+
},
1498+
{
1499+
"login": "carloslfu",
1500+
"name": "Carlos Galarza",
1501+
"avatar_url": "https://avatars3.githubusercontent.com/u/5993168?v=4",
1502+
"profile": "https://carloslfu.github.io",
1503+
"contributions": [
1504+
"doc"
1505+
]
14521506
}
14531507
],
14541508
"contributorsPerLine": 7,
1455-
"commitConvention": "none"
1509+
"commitConvention": "none",
1510+
"skipCi": true
14561511
}

‎.graphqlconfig.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ projects:
33
schemaPath: packages/app/src/app/graphql/schema.graphql
44
extensions:
55
endpoints:
6-
default: 'https://codesandbox.io/api/graphql'
6+
prod: 'https://codesandbox.io/api/graphql'
77
staging: 'https://codesandbox.stream/api/graphql'
88
dev: 'http://localhost:4000/api/graphql'

‎.prettierrc

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

‎.prettierrc.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
module.exports = {
2+
endOfLine: 'lf',
3+
proseWrap: 'always',
4+
singleQuote: true,
5+
trailingComma: 'es5',
6+
};

‎CODE_OF_CONDUCT.md

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
In the interest of fostering an open and welcoming environment, we as
66
contributors and maintainers pledge to making participation in our project and
77
our community a harassment-free experience for everyone, regardless of age, body
8-
size, disability, ethnicity, sex characteristics, gender identity and expression,
9-
level of experience, education, socio-economic status, nationality, personal
10-
appearance, race, religion, or sexual identity and orientation.
8+
size, disability, ethnicity, sex characteristics, gender identity and
9+
expression, level of experience, education, socio-economic status, nationality,
10+
personal appearance, race, religion, or sexual identity and orientation.
1111

1212
## Our Standards
1313

@@ -37,11 +37,11 @@ Project maintainers are responsible for clarifying the standards of acceptable
3737
behavior and are expected to take appropriate and fair corrective action in
3838
response to any instances of unacceptable behavior.
3939

40-
Project maintainers have the right and responsibility to remove, edit, or
41-
reject comments, commits, code, wiki edits, issues, and other contributions
42-
that are not aligned to this Code of Conduct, or to ban temporarily or
43-
permanently any contributor for other behaviors that they deem inappropriate,
44-
threatening, offensive, or harmful.
40+
Project maintainers have the right and responsibility to remove, edit, or reject
41+
comments, commits, code, wiki edits, issues, and other contributions that are
42+
not aligned to this Code of Conduct, or to ban temporarily or permanently any
43+
contributor for other behaviors that they deem inappropriate, threatening,
44+
offensive, or harmful.
4545

4646
## Scope
4747

@@ -55,20 +55,21 @@ further defined and clarified by project maintainers.
5555
## Enforcement
5656

5757
Instances of abusive, harassing, or otherwise unacceptable behavior may be
58-
reported by contacting the project team at hello@codesandbox.io. All
59-
complaints will be reviewed and investigated and will result in a response that
60-
is deemed necessary and appropriate to the circumstances. The project team is
61-
obligated to maintain confidentiality with regard to the reporter of an incident.
62-
Further details of specific enforcement policies may be posted separately.
58+
reported by contacting the project team at hello@codesandbox.io. All complaints
59+
will be reviewed and investigated and will result in a response that is deemed
60+
necessary and appropriate to the circumstances. The project team is obligated to
61+
maintain confidentiality with regard to the reporter of an incident. Further
62+
details of specific enforcement policies may be posted separately.
6363

6464
Project maintainers who do not follow or enforce the Code of Conduct in good
6565
faith may face temporary or permanent repercussions as determined by other
6666
members of the project's leadership.
6767

6868
## Attribution
6969

70-
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
71-
available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
70+
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
71+
version 1.4, available at
72+
https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
7273

7374
[homepage]: https://www.contributor-covenant.org
7475

0 commit comments

Comments
 (0)