Skip to content

Commit

Permalink
Merge pull request #5: groups v2 to unstable
Browse files Browse the repository at this point in the history
Feat: groups v2 merge to unstable
  • Loading branch information
Bilb authored Jan 20, 2025
2 parents 252f982 + 4381883 commit 021c600
Show file tree
Hide file tree
Showing 537 changed files with 26,261 additions and 11,574 deletions.
51 changes: 51 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -153,5 +153,56 @@ module.exports = {
files: ['ts/node/**/*.ts', 'ts/test/**/*.ts'],
rules: { 'no-console': 'off', 'import/no-extraneous-dependencies': 'off' },
},
{
files: ['ts/localization/*.ts', 'ts/localization/**/*.ts'], // anything in ts/localization has to only reference the files in that folder (this makes it reusable)
rules: {
'no-restricted-imports': [
'error',
{
patterns: [
'a*',
'b*',
'c*',
'd*',
'e*',
'f*',
'g*',
'h*',
'i*',
'j*',
'k*',
'l*',
'm*',
'n*',
'o*',
'p*',
'q*',
'r*',
's*',
't*',
'u*',
'v*',
'w*',
'x*',
'y*',
'z*',
'0*',
'1*',
'2*',
'3*',
'4*',
'5*',
'6*',
'7*',
'8*',
'9*',
'!./*',
], // Disallow everything except ts/localization, this is the worst,
// but regexes are broken on our eslint8, and upgrading it means
// we need to bump node, which needs to bump electron.... and having '*' makes the other rules droped..
},
],
},
},
],
};
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -54,5 +54,4 @@ stylesheets/dist/
ts/webworker/workers/node/**/*.node
ts/localization/locales.ts

.yarn/**/*.mjs
.yarn/**/*.cjs
.yarn/
11 changes: 11 additions & 0 deletions .mocharc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
jobs: 1
package: './package.json'
parallel: false
exit: true
recursive: true
require: 'jsdom-global/register'
sort: false
spec:
- './ts/test/**/*_test.js' # the positional arguments!
timeout: 1000
watch: false
1 change: 1 addition & 0 deletions .tool-versions
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python 3.12.2
2 changes: 2 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
nodeLinker: node-modules
patchFolder: patches
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ gpg --import KeeJef.asc
Get the signed hash for this release, the SESSION_VERSION needs to be updated for the release you want to verify

```
export SESSION_VERSION=1.14.5
export SESSION_VERSION=1.15.0
wget https://github.com/session-foundation/session-desktop/releases/download/v$SESSION_VERSION/signatures.asc
```

Expand Down Expand Up @@ -67,3 +67,5 @@ Licensed under the GPLv3: https://www.gnu.org/licenses/gpl-3.0.html<br/>
## Attributions

The IP-to-country mapping data used in this project is provided by [MaxMind GeoLite2](https://dev.maxmind.com/geoip/geolite2-free-geolocation-data).

This project uses the [Lucide Icon Font](https://lucide.dev/), which is licensed under the [ISC License](./third_party_licenses/LucideLicense.txt).
9 changes: 1 addition & 8 deletions _locales/af/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
"adminRemovedUser": "<b>{name}</b> is as Admin verwyder",
"adminRemovedUserMultiple": "<b>{name}</b> en <b>{count} ander</b> is verwyder as Admin.",
"adminRemovedUserOther": "<b>{name}</b> en <b>{other_name}</b> is verwyder as Admin.",
"adminSendingPromotion": "Bevordering van admin word gestuur",
"adminSettings": "Admin-instellings",
"adminTwoPromotedToAdmin": "<b>{name}</b> en <b>{other_name}</b> is bevorder tot Admin.",
"andMore": "+{count}",
Expand Down Expand Up @@ -252,7 +251,7 @@
"create": "Skep",
"cut": "Sny",
"databaseErrorGeneric": "’n Databasisfout het voorgekom.<br/><br/>Voer jou toepassingslogboeke uit om te deel vir foutsporing. Indien dit onsuksesvol is, herinstalleer {app_name} en herstel jou rekening.<br/><br/>Waarskuwing: Dit sal lei tot die verlies van alle boodskappe, aanhegsels, en rekeningdata ouer as twee weke.",
"databaseErrorTimeout": "Ons het opgemerk {app_name} neem lank om te begin.<br/><br/>Jy kan aanhou wag, jou toestel logs uitvoer om te deel vir foutsporing, of probeer om Session te herbegin.",
"databaseErrorTimeout": "Ons het opgemerk {app_name} neem lank om te begin.<br/><br/>Jy kan aanhou wag, jou toestel logs uitvoer om te deel vir foutsporing, of probeer om {app_name} te herbegin.",
"databaseErrorUpdate": "Jou app databasis is onversoenbaar met hierdie weergawe van {app_name}. Herinstalleer die app en herstel jou rekening om 'n nuwe databasis te genereer en voort te gaan met die gebruik van {app_name}.<br/><br/>Waarskuwing: Dit sal lei tot die verlies van alle boodskappe en aanhegsels ouer as twee weke.",
"databaseOptimizing": "Optimalisering databasis",
"debugLog": "Ontfout Log",
Expand All @@ -274,18 +273,14 @@
"deleteAfterLegacyGroupsGroupUpdateErrorTitle": "Kon nie die groep bywerk nie",
"deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "Jy het nie toestemming om ander se boodskappe te verwyder nie",
"deleteMessage": "{count, plural, one [Skrap Boodskap] other [Skrap Boodskappe]}",
"deleteMessageConfirm": "Is jy seker jy wil hierdie boodskap skrap?",
"deleteMessageDeleted": "{count, plural, one [Boodskap verwyder] other [Boodskappe verwyder]}",
"deleteMessageDeletedGlobally": "Hierdie boodskap is verwyder",
"deleteMessageDeletedLocally": "Hierdie boodskap is op hierdie toestel verwyder",
"deleteMessageDescriptionDevice": "Is jy seker jy wil hierdie boodskap slegs van hierdie toestel skrap?",
"deleteMessageDescriptionEveryone": "Is jy seker jy wil hierdie boodskap vir almal skrap?",
"deleteMessageDeviceOnly": "Skrap net op hierdie toestel",
"deleteMessageDevicesAll": "Skrap op al my toestelle",
"deleteMessageEveryone": "Skrap vir Almal",
"deleteMessageFailed": "{count, plural, one [Kon nie boodskap uitvee nie] other [Kon nie boodskappe uitvee nie]}",
"deleteMessagesConfirm": "Is jy seker jy wil hierdie boodskappe skrap?",
"deleteMessagesDescriptionDevice": "Is jy seker jy wil hierdie boodskappe net van hierdie toestel verwyder?",
"deleteMessagesDescriptionEveryone": "Is jy seker jy wil hierdie boodskappe vir almal verwyder?",
"deleting": "Skrap...",
"developerToolsToggle": "Skakel Ontwikkelaarhulpmiddels aan/af",
Expand Down Expand Up @@ -389,7 +384,6 @@
"groupInviteFailedMultiple": "Kon nie {name} en {count} ander na {group_name} nooi nie",
"groupInviteFailedTwo": "Kon nie {name} en {other_name} na {group_name} nooi nie",
"groupInviteFailedUser": "Kon nie {name} na {group_name} nooi nie",
"groupInviteSending": "Uitnodiging word gestuur",
"groupInviteSent": "Nooi gestuur",
"groupInviteSuccessful": "Groepuitnodiging suksesvol",
"groupInviteVersion": "Gebruikers moet die nuutste weergawe hê om uitnodigings te ontvang",
Expand All @@ -411,7 +405,6 @@
"groupMemberNewMultiple": "<b>{name}</b> en <b>{count} ander</b> is genooi om by die groep aan te sluit.",
"groupMemberNewTwo": "<b>{name}</b> en <b>{other_name}</b> is genooi om by die groep aan te sluit.",
"groupMemberNewYouHistoryMultiple": "<b>Jy</b> en <b>{count} ander</b> is genooi om by die groep aan te sluit. Kletsgeskiedenis is gedeel.",
"groupMemberNewYouHistoryTwo": "<b>Jy</b> en <b>{name}</b> is genooi om by die groep aan te sluit. Kletsgeskiedenis is gedeel.",
"groupMemberYouLeft": "<b>You</b> het die groep verlaat",
"groupMembers": "Groep Lede",
"groupMembersNone": "Daar is geen ander lede in hierdie groep nie.",
Expand Down
Loading

0 comments on commit 021c600

Please sign in to comment.