Skip to content

Commit 986d50b

Browse files
BilbBilb
authored
Merge pull request #93 from session-foundation/unstable
Session 1.15.0
2 parents b6dad72 + d80fe91 commit 986d50b

File tree

584 files changed

+29439
-12748
lines changed

Some content is hidden

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

584 files changed

+29439
-12748
lines changed

‎.eslintrc.js‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,5 +153,56 @@ module.exports = {
153153
files: ['ts/node/**/*.ts', 'ts/test/**/*.ts'],
154154
rules: { 'no-console': 'off', 'import/no-extraneous-dependencies': 'off' },
155155
},
156+
{
157+
files: ['ts/localization/*.ts', 'ts/localization/**/*.ts'], // anything in ts/localization has to only reference the files in that folder (this makes it reusable)
158+
rules: {
159+
'no-restricted-imports': [
160+
'error',
161+
{
162+
patterns: [
163+
'a*',
164+
'b*',
165+
'c*',
166+
'd*',
167+
'e*',
168+
'f*',
169+
'g*',
170+
'h*',
171+
'i*',
172+
'j*',
173+
'k*',
174+
'l*',
175+
'm*',
176+
'n*',
177+
'o*',
178+
'p*',
179+
'q*',
180+
'r*',
181+
's*',
182+
't*',
183+
'u*',
184+
'v*',
185+
'w*',
186+
'x*',
187+
'y*',
188+
'z*',
189+
'0*',
190+
'1*',
191+
'2*',
192+
'3*',
193+
'4*',
194+
'5*',
195+
'6*',
196+
'7*',
197+
'8*',
198+
'9*',
199+
'!./*',
200+
], // Disallow everything except ts/localization, this is the worst,
201+
// but regexes are broken on our eslint8, and upgrading it means
202+
// we need to bump node, which needs to bump electron.... and having '*' makes the other rules droped..
203+
},
204+
],
205+
},
206+
},
156207
],
157208
};

‎.github/ISSUE_TEMPLATE/bug_report.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ body:
66
- type: checkboxes
77
attributes:
88
label: Code of conduct
9-
description: I have read and agree to adhere to the [Code of Conduct](https://github.com/oxen-io/session-desktop/blob/master/CODE_OF_CONDUCT.md).
9+
description: I have read and agree to adhere to the [Code of Conduct](https://github.com/session-foundation/session-desktop/blob/master/CODE_OF_CONDUCT.md).
1010
options:
11-
- label: I have read and agree to adhere to the [Code of Conduct](https://github.com/oxen-io/session-desktop/blob/master/CODE_OF_CONDUCT.md)
11+
- label: I have read and agree to adhere to the [Code of Conduct](https://github.com/session-foundation/session-desktop/blob/master/CODE_OF_CONDUCT.md)
1212
required: true
1313

1414
- type: checkboxes

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ Remember, you can preview this before saving it.
99

1010
### First time contributor checklist:
1111

12-
- [ ] I have read the [README](https://github.com/oxen-io/session-desktop/blob/master/README.md) and [Contributor Guidelines](https://github.com/oxen-io/session-desktop/blob/master/CONTRIBUTING.md)
12+
- [ ] I have read the [README](https://github.com/session-foundation/session-desktop/blob/master/README.md) and [Contributor Guidelines](https://github.com/session-foundation/session-desktop/blob/master/CONTRIBUTING.md)
1313

1414
### Contributor checklist:
1515

1616
- [ ] My commits are in nice logical chunks with [good commit messages](http://chris.beams.io/posts/git-commit/)
17-
- [ ] My changes are [rebased](https://blog.axosoft.com/golden-rule-of-rebasing-in-git/) on the latest [`clearnet`](https://github.com/oxen-io/session-desktop/tree/clearnet) branch
18-
- [ ] A `yarn ready` run passes successfully ([more about tests here](https://github.com/oxen-io/session-desktop/blob/master/CONTRIBUTING.md#tests))
17+
- [ ] My changes are [rebased](https://blog.axosoft.com/golden-rule-of-rebasing-in-git/) on the latest [`unstable`](https://github.com/session-foundation/session-desktop/tree/unstable) branch
18+
- [ ] A `yarn ready` run passes successfully ([more about tests here](https://github.com/session-foundation/session-desktop/blob/master/CONTRIBUTING.md#tests))
1919
- [ ] My changes are ready to be shipped to users
2020

2121
### Description

‎.github/workflows/build-binaries.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,11 @@ on:
88
push:
99
branches:
1010
- master
11-
- clearnet
1211
- unstable
1312
- 'release/**'
1413
- 'ci/**'
1514
pull_request:
1615
branches:
17-
- clearnet
1816
- unstable
1917
- 'release/**'
2018
- 'ci/**'
@@ -29,7 +27,7 @@ env:
2927

3028
jobs:
3129
build_linux:
32-
runs-on: ubuntu-20.04
30+
runs-on: ubuntu-22.04
3331
strategy:
3432
fail-fast: false
3533
matrix:

‎.gitignore‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,5 +54,4 @@ stylesheets/dist/
5454
ts/webworker/workers/node/**/*.node
5555
ts/localization/locales.ts
5656

57-
.yarn/**/*.mjs
58-
.yarn/**/*.cjs
57+
.yarn/

‎.mocharc.yml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
jobs: 1
2+
package: './package.json'
3+
parallel: false
4+
exit: true
5+
recursive: true
6+
require: 'jsdom-global/register'
7+
sort: false
8+
spec:
9+
- './ts/test/**/*_test.js' # the positional arguments!
10+
timeout: 1000
11+
watch: false

‎.tool-versions‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
python 3.12.2

‎.yarnrc.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
nodeLinker: node-modules
2+
patchFolder: patches

0 commit comments

Comments
 (0)