Skip to content

Commit

Permalink
Merge branch 'develop' into release
Browse files Browse the repository at this point in the history 
Bump ferdium version to 6.7.6
  • Loading branch information
@vraravam
vraravam committed Aug 5, 2024
2 parents 5514cab + de5e1a6 commit 5bed770
Show file tree
Hide file tree
Showing 11 changed files with 259 additions and 274 deletions.
46 changes: 13 additions & 33 deletions .all-contributorsrc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,27 +37,27 @@
]
},
{
"login": "kytwb",
"name": "Amine Mouafik",
"avatar_url": "https://avatars0.githubusercontent.com/u/412895?v=4",
"profile": "https://twitter.com/kytwb",
"login": "vraravam",
"name": "Vijay Raghavan Aravamudhan",
"avatar_url": "https://avatars.githubusercontent.com/u/69629?v=4",
"profile": "https://github.com/vraravam",
"contributions": [
"blog",
"bug",
"code",
"content",
"design",
"doc",
"ideas",
"bug",
"content",
"infra",
"userTesting",
"question",
"projectManagement",
"review",
"maintenance",
"mentoring",
"platform",
"fundingFinding",
"blog",
"translation"
"projectManagement",
"question",
"review",
"translation",
"userTesting"
]
},
{
Expand Down Expand Up @@ -842,26 +842,6 @@
"bug"
]
},
{
"login": "vraravam",
"name": "Vijay Raghavan Aravamudhan",
"avatar_url": "https://avatars.githubusercontent.com/u/69629?v=4",
"profile": "https://github.com/vraravam",
"contributions": [
"maintenance",
"doc",
"code",
"mentoring",
"review",
"infra",
"ideas",
"bug",
"content",
"userTesting",
"projectManagement",
"translation"
]
},
{
"login": "alopix",
"name": "Dustin",
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20.14.0
20.15.1
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ Currently, these are the combinations of system dependencies that work for MacOS
# Note: 'jq' is not a required system dependency; its only here to show the combined output of versions needed
$ jq --null-input '[inputs.engines] | add' < ./package.json < ./recipes/package.json
{
"node": "20.14.0",
"pnpm": "9.1.4"
"node": "20.15.1",
"pnpm": "9.5.0"
}
```

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Note: Before running this file, you should have already cloned the git repo + submodules on the host machine. This is used when actively developing on your local machine, but you want to build for a different architecture

FROM docker.io/library/node:20.14.0-buster AS builder
FROM docker.io/library/node:20.15.1-buster AS builder

ENV PATH="/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin:/usr/local/lib:/usr/include:/usr/share"

Expand Down
3 changes: 1 addition & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
<tbody>
<tr>
<td align="center" valign="top" width="14.28%"><a href='https://vantezzen.io' title='Bennett: code, design, doc, ideas, translation, example, bug, content, infra, userTesting, question, projectManagement, review, translation'><img src='https://avatars2.githubusercontent.com/u/10333196?v=4' alt='vantezzen' style='width:100px;'/></a></td>
<td align="center" valign="top" width="14.28%"><a href='https://twitter.com/kytwb' title='Amine Mouafik: code, design, doc, ideas, bug, content, infra, userTesting, question, projectManagement, review, maintenance, platform, fundingFinding, blog, translation'><img src='https://avatars0.githubusercontent.com/u/412895?v=4' alt='kytwb' style='width:100px;'/></a></td>
<td align="center" valign="top" width="14.28%"><a href='https://github.com/vraravam' title='Vijay Raghavan Aravamudhan: blog, bug, code, content, design, doc, ideas, infra, maintenance, mentoring, platform, projectManagement, question, review, translation, userTesting'><img src='https://avatars.githubusercontent.com/u/69629?v=4' alt='vraravam' style='width:100px;'/></a></td>
<td align="center" valign="top" width="14.28%"><a href='http://www.adlk.io' title='Stefan Malzner: code, content, design, doc, ideas, infra, projectManagement, test, translation'><img src='https://avatars1.githubusercontent.com/u/3265004?v=4' alt='adlk' style='width:100px;'/></a></td>
<td align="center" valign="top" width="14.28%"><a href='https://github.com/Makazzz' title='Makazzz: bug, code, translation, content, doc, platform, translation'><img src='https://avatars2.githubusercontent.com/u/49844464?v=4' alt='Makazzz' style='width:100px;'/></a></td>
<td align="center" valign="top" width="14.28%"><a href='http://seriesgt.com' title='ZeroCool: code, ideas'><img src='https://avatars3.githubusercontent.com/u/5977640?v=4' alt='ZeroCool940711' style='width:100px;'/></a></td>
Expand Down Expand Up @@ -198,7 +198,6 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
<td align="center" valign="top" width="14.28%"><a href='https://github.com/stnkl' title='Stephan Rumswinkel: code, bug'><img src='https://avatars.githubusercontent.com/u/17520641?v=4' alt='stnkl' style='width:100px;'/></a></td>
</tr>
<tr>
<td align="center" valign="top" width="14.28%"><a href='https://github.com/vraravam' title='Vijay Raghavan Aravamudhan: maintenance, doc, code, mentoring, review, infra, ideas, bug, content, userTesting, projectManagement, translation'><img src='https://avatars.githubusercontent.com/u/69629?v=4' alt='vraravam' style='width:100px;'/></a></td>
<td align="center" valign="top" width="14.28%"><a href='https://dustin.meecolabs.eu/' title='Dustin: design'><img src='https://avatars.githubusercontent.com/u/124467?v=4' alt='alopix' style='width:100px;'/></a></td>
<td align="center" valign="top" width="14.28%"><a href='https://github.com/jakobsudau' title='Jakob Felix Julius Sudau: design'><img src='https://avatars.githubusercontent.com/u/721715?v=4' alt='jakobsudau' style='width:100px;'/></a></td>
<td align="center" valign="top" width="14.28%"><a href='https://prasans.info' title='Prasanna: code'><img src='https://avatars.githubusercontent.com/u/380340?v=4' alt='prasann' style='width:100px;'/></a></td>
Expand Down
32 changes: 16 additions & 16 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"productName": "Ferdium",
"desktopName": "ferdium.desktop",
"appId": "org.ferdium.ferdium-app",
"version": "6.7.5",
"version": "6.7.6",
"description": "Messaging app for WhatsApp, Slack, Telegram, Hangouts and many many more.",
"author": "Ferdium Contributors <[email protected]> (https://ferdium.org/)",
"license": "Apache-2.0",
Expand All @@ -13,15 +13,15 @@
"repository": "https://github.com/ferdium/ferdium-app.git",
"private": true,
"engines": {
"node": "20.14.0",
"pnpm": "9.1.4"
"node": "20.15.1",
"pnpm": "9.5.0"
},
"engine-strict": true,
"volta": {
"node": "20.14.0",
"pnpm": "9.1.4"
"node": "20.15.1",
"pnpm": "9.5.0"
},
"packageManager": "pnpm@9.1.4",
"packageManager": "pnpm@9.5.0",
"scripts": {
"prepare": "is-ci || husky",
"start": "electron ./build",
Expand Down Expand Up @@ -65,8 +65,8 @@
"@emotion/styled": "11.11.5",
"@mdi/js": "7.4.47",
"@mdi/react": "1.6.1",
"@mui/icons-material": "5.15.20",
"@mui/material": "5.15.20",
"@mui/icons-material": "5.16.1",
"@mui/material": "5.16.1",
"@octokit/core": "5.1.0",
"@sentry/electron": "4.14.0",
"@superwf/mobx-react-router": "7.4.0",
Expand All @@ -75,7 +75,7 @@
"classnames": "2.5.1",
"color": "4.2.3",
"csstype": "3.1.3",
"darkreader": "4.9.86",
"darkreader": "4.9.87",
"dbus-next": "0.10.2",
"debug": "4.3.5",
"electron-dl": "3.5.2",
Expand All @@ -95,7 +95,7 @@
"macos-version": "5.2.1",
"markdown-to-jsx": "7.4.7",
"minimist": "1.2.8",
"mobx": "6.12.4",
"mobx": "6.13.0",
"mobx-localstorage": "1.2.0",
"mobx-react": "7.6.0",
"mobx-react-form": "6.9.4",
Expand All @@ -116,9 +116,9 @@
"react-jss": "10.10.0",
"react-loader-spinner": "5.4.5",
"react-modal": "3.16.1",
"react-router-dom": "6.23.1",
"react-router-dom": "6.24.1",
"react-sortable-hoc": "2.0.0",
"react-tooltip": "5.27.0",
"react-tooltip": "5.27.1",
"react-topbar-progress-indicator": "4.1.1",
"react-transition-group": "4.4.5",
"route-parser": "0.0.5",
Expand All @@ -143,10 +143,10 @@
"@types/color": "3.0.6",
"@types/fs-extra": "11.0.4",
"@types/jest": "29.5.12",
"@types/lodash": "4.17.5",
"@types/lodash": "4.17.6",
"@types/minimist": "1.2.5",
"@types/ms": "0.7.34",
"@types/node": "20.14.8",
"@types/node": "20.14.10",
"@types/prop-types": "15.7.12",
"@types/react": "18.3.3",
"@types/react-color": "3.0.12",
Expand All @@ -163,7 +163,7 @@
"chalk": "5.3.0",
"concurrently": "8.2.2",
"cross-env": "7.0.3",
"electron": "31.1.0",
"electron": "31.3.1",
"electron-builder": "24.13.3",
"esbuild": "0.16.17",
"esbuild-plugin-copy": "2.1.1",
Expand All @@ -185,7 +185,7 @@
"husky": "9.0.11",
"is-ci": "3.0.1",
"jest": "29.7.0",
"prettier": "3.3.2",
"prettier": "3.3.3",
"preval-build-info": "1.0.3",
"rimraf": "5.0.7",
"simple-git": "3.25.0",
Expand Down
Loading

0 comments on commit 5bed770

Please sign in to comment.