Skip to content

Commit a330d7a

Browse files
authored
Merge pull request #30 from CodeDead/feature/upgrades
Feature/upgrades
2 parents 0985cae + 706528a commit a330d7a

File tree

16 files changed

+797
-515
lines changed

16 files changed

+797
-515
lines changed

.yarn/releases/yarn-2.3.3.cjs

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

.yarn/releases/yarn-2.4.0.cjs

Lines changed: 55 additions & 0 deletions
Large diffs are not rendered by default.

.yarnrc.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ nodeLinker: node-modules
22

33
plugins:
44
- path: .yarn/plugins/yarn-up-all-plugin.cjs
5-
spec: "https://github.com/e5mode/yarn-up-all/releases/download/1.0.2/index.js"
5+
spec: "https://github.com/e5mode/yarn-up-all/releases/download/1.0.3/index.js"
66

7-
yarnPath: .yarn/releases/yarn-2.3.3.cjs
7+
yarnPath: .yarn/releases/yarn-2.4.0.cjs

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
![DeadHash](https://codedead.com/wp-content/uploads/2020/06/DeadHash.png)
1+
![DeadHash](https://i.imgur.com/PWrqQ67.png)
22

33
# DeadHash
44

package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"build": {
1313
"appId": "com.codedead.deadhash",
1414
"productName": "DeadHash",
15-
"copyright": "Copyright © 2020 ${author}",
15+
"copyright": "Copyright © 2021 ${author}",
1616
"win": {
1717
"target": [
1818
"nsis",
@@ -35,16 +35,16 @@
3535
},
3636
"main": "public/electron.js",
3737
"dependencies": {
38-
"@material-ui/core": "^4.11.0",
39-
"@material-ui/icons": "^4.9.1",
40-
"cross-env": "^7.0.2",
38+
"@material-ui/core": "^4.11.3",
39+
"@material-ui/icons": "^4.11.2",
40+
"cross-env": "^7.0.3",
4141
"electron-is-dev": "^1.2.0",
4242
"react": "^17.0.1",
43-
"react-contexify": "^4.1.1",
43+
"react-contexify": "^5.0.0",
4444
"react-dom": "^17.0.1",
4545
"react-router": "^5.2.0",
4646
"react-router-dom": "^5.2.0",
47-
"react-scripts": "^4.0.0"
47+
"react-scripts": "^4.0.1"
4848
},
4949
"scripts": {
5050
"react-start": "react-scripts start",
@@ -70,13 +70,13 @@
7070
},
7171
"devDependencies": {
7272
"concurrently": "^5.3.0",
73-
"electron": "^10.1.5",
73+
"electron": "^11.2.1",
7474
"electron-builder": "^22.9.1",
7575
"eslint-config-airbnb": "^18.2.1",
7676
"eslint-plugin-import": "^2.22.1",
7777
"eslint-plugin-jsx-a11y": "^6.4.1",
78-
"eslint-plugin-react": "^7.21.5",
78+
"eslint-plugin-react": "^7.22.0",
7979
"eslint-plugin-react-hooks": "^4.2.0",
80-
"wait-on": "^5.2.0"
80+
"wait-on": "^5.2.1"
8181
}
8282
}

src/languages/de_DE/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const de_DE = () => ({
77
help: 'Hilfe',
88
language: 'Sprache',
99
aboutSubtitle: 'Erfahren Sie mehr über DeadHash',
10-
aboutMessage: 'DeadHash wurde von DeadLine erstellt.\n\nEinige Bilder wurden von icons8 bereitgestellt: https://icons8.com\nLizenz: GPLv3\nVersion: {x}\n\nCopyright © 2020 CodeDead',
10+
aboutMessage: 'DeadHash wurde von DeadLine erstellt.\n\nEinige Bilder wurden von icons8 bereitgestellt: https://icons8.com\nLizenz: GPLv3\nVersion: {x}\n\nCopyright © 2021 CodeDead',
1111
codedead: 'CodeDead',
1212
theme: 'Thema',
1313
general: 'Allgemeines',

src/languages/en_US/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const en_US = () => ({
77
help: 'Help',
88
language: 'Language',
99
aboutSubtitle: 'Learn more about DeadHash',
10-
aboutMessage: 'DeadHash was created by DeadLine.\n\nSome images were provided by icons8: https://icons8.com\nLicense: GPLv3\nVersion: {x}\n\nCopyright © 2020 CodeDead',
10+
aboutMessage: 'DeadHash was created by DeadLine.\n\nSome images were provided by icons8: https://icons8.com\nLicense: GPLv3\nVersion: {x}\n\nCopyright © 2021 CodeDead',
1111
codedead: 'CodeDead',
1212
theme: 'Theme',
1313
general: 'General',

src/languages/es_ES/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const es_ES = () => ({
77
help: 'Ayuda',
88
language: 'Idioma',
99
aboutSubtitle: 'Obtenga más información sobre DeadHash',
10-
aboutMessage: 'DeadHash fue creado por DeadLine.\n\nAlgunas imágenes fueron proporcionadas por icons8: https://icons8.com\nLicencia: GPLv3\nVersión: {x}\n\nCopyright © 2020 CodeDead',
10+
aboutMessage: 'DeadHash fue creado por DeadLine.\n\nAlgunas imágenes fueron proporcionadas por icons8: https://icons8.com\nLicencia: GPLv3\nVersión: {x}\n\nCopyright © 2021 CodeDead',
1111
codedead: 'CodeDead',
1212
theme: 'Tema',
1313
general: 'General',

src/languages/fr_FR/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const fr_FR = () => ({
77
help: 'Aide',
88
language: 'Langue',
99
aboutSubtitle: 'En savoir plus sur DeadHash',
10-
aboutMessage: 'DeadHash a été créé par DeadLine.\n\nCertaines images ont été fournies par icons8: https://icons8.com\nLicence: GPLv3\nVersion: {x}\n\nCopyright © 2020 CodeDead',
10+
aboutMessage: 'DeadHash a été créé par DeadLine.\n\nCertaines images ont été fournies par icons8: https://icons8.com\nLicence: GPLv3\nVersion: {x}\n\nCopyright © 2021 CodeDead',
1111
codedead: 'CodeDead',
1212
theme: 'Thème',
1313
general: 'Général',

src/languages/it_IT/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const it_IT = () => ({
77
help: 'Aiuto',
88
language: 'Linguaggio',
99
aboutSubtitle: 'Ulteriori informazioni su DeadHash',
10-
aboutMessage: 'DeadHash è stato creato da DeadLine.\n\nAlcune immagini sono state fornite da icons8: https://icons8.com\nLicenza: GPLv3\nVersione: {x}\n\nCopyright © 2020 CodeDead',
10+
aboutMessage: 'DeadHash è stato creato da DeadLine.\n\nAlcune immagini sono state fornite da icons8: https://icons8.com\nLicenza: GPLv3\nVersione: {x}\n\nCopyright © 2021 CodeDead',
1111
codedead: 'CodeDead',
1212
theme: 'Tema',
1313
general: 'Generale',

0 commit comments

Comments
 (0)