aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--README.md5
-rw-r--r--src/components/ui/WebviewLoader/index.js4
-rw-r--r--src/containers/settings/EditServiceScreen.js2
-rw-r--r--src/i18n/locales/defaultMessages.json4
-rw-r--r--src/i18n/messages/src/components/ui/WebviewLoader/index.json2
-rw-r--r--src/i18n/messages/src/containers/settings/EditServiceScreen.json2
m---------src/internal-server0
7 files changed, 11 insertions, 8 deletions
diff --git a/README.md b/README.md
index c2a4f4aeb..1f50307ba 100644
--- a/README.md
+++ b/README.md
@@ -104,6 +104,7 @@ If you use an AUR Helper e.g. yay, simply install it via `yay -S ferdi-bin`.
104- [x] Add CTRL+← and CTRL+→ shortcuts and menu options to go back and forward in the service browsing history([#39](https://github.com/getferdi/ferdi/issues/39)) 104- [x] Add CTRL+← and CTRL+→ shortcuts and menu options to go back and forward in the service browsing history([#39](https://github.com/getferdi/ferdi/issues/39))
105- [x] Add option to show a browser-like navigation bar on all services 105- [x] Add option to show a browser-like navigation bar on all services
106- [x] Add option to change accent color 106- [x] Add option to change accent color
107- [x] Add local [recipe repository](https://github.com/getferdi/recipes) that removes the need of downloading recipes from a remote server
107- [x] Add portable version for Windows 108- [x] Add portable version for Windows
108- [x] Add Process Manager to find services using a lot of resources 109- [x] Add Process Manager to find services using a lot of resources
109- [x] Add "npm run prepare-code" command for development to lint and beautify code 110- [x] Add "npm run prepare-code" command for development to lint and beautify code
@@ -193,7 +194,9 @@ Deliverables will be available in the `out` folder.
193### Release 194### Release
194 195
195```bash 196```bash
196$ git checkout develop && git pull && git checkout master 197$ git checkout develop && git pull
198$ git submodule update --remote --force
199$ git checkout master
197$ git merge --no-ff develop 200$ git merge --no-ff develop
198$ git tag v5.3.4-beta.4 201$ git tag v5.3.4-beta.4
199$ git push --tags 202$ git push --tags
diff --git a/src/components/ui/WebviewLoader/index.js b/src/components/ui/WebviewLoader/index.js
index 923f10327..c58d69374 100644
--- a/src/components/ui/WebviewLoader/index.js
+++ b/src/components/ui/WebviewLoader/index.js
@@ -10,7 +10,7 @@ import styles from './styles';
10const messages = defineMessages({ 10const messages = defineMessages({
11 loading: { 11 loading: {
12 id: 'service.webviewLoader.loading', 12 id: 'service.webviewLoader.loading',
13 defaultMessage: '!!!Loading', 13 defaultMessage: '!!!Loading {service}',
14 }, 14 },
15}); 15});
16 16
@@ -30,7 +30,7 @@ export default @injectSheet(styles) @observer class WebviewLoader extends Compon
30 return ( 30 return (
31 <FullscreenLoader 31 <FullscreenLoader
32 className={classes.component} 32 className={classes.component}
33 title={`${intl.formatMessage(messages.loading)} ${name}`} 33 title={`${intl.formatMessage(messages.loading, { service: name })}`}
34 /> 34 />
35 ); 35 );
36 } 36 }
diff --git a/src/containers/settings/EditServiceScreen.js b/src/containers/settings/EditServiceScreen.js
index d18d7fb9b..99c40b086 100644
--- a/src/containers/settings/EditServiceScreen.js
+++ b/src/containers/settings/EditServiceScreen.js
@@ -51,7 +51,7 @@ const messages = defineMessages({
51 }, 51 },
52 customUrl: { 52 customUrl: {
53 id: 'settings.service.form.customUrl', 53 id: 'settings.service.form.customUrl',
54 defaultMessage: '!!!Custom server', 54 defaultMessage: '!!!Service URL',
55 }, 55 },
56 indirectMessages: { 56 indirectMessages: {
57 id: 'settings.service.form.indirectMessages', 57 id: 'settings.service.form.indirectMessages',
diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json
index 429930278..fe324cd67 100644
--- a/src/i18n/locales/defaultMessages.json
+++ b/src/i18n/locales/defaultMessages.json
@@ -3809,7 +3809,7 @@
3809 { 3809 {
3810 "descriptors": [ 3810 "descriptors": [
3811 { 3811 {
3812 "defaultMessage": "!!!Loading", 3812 "defaultMessage": "!!!Loading {service}",
3813 "end": { 3813 "end": {
3814 "column": 3, 3814 "column": 3,
3815 "line": 14 3815 "line": 14
@@ -3936,7 +3936,7 @@
3936 } 3936 }
3937 }, 3937 },
3938 { 3938 {
3939 "defaultMessage": "!!!Custom server", 3939 "defaultMessage": "!!!Service URL",
3940 "end": { 3940 "end": {
3941 "column": 3, 3941 "column": 3,
3942 "line": 55 3942 "line": 55
diff --git a/src/i18n/messages/src/components/ui/WebviewLoader/index.json b/src/i18n/messages/src/components/ui/WebviewLoader/index.json
index ef3e4b593..9caabef25 100644
--- a/src/i18n/messages/src/components/ui/WebviewLoader/index.json
+++ b/src/i18n/messages/src/components/ui/WebviewLoader/index.json
@@ -1,7 +1,7 @@
1[ 1[
2 { 2 {
3 "id": "service.webviewLoader.loading", 3 "id": "service.webviewLoader.loading",
4 "defaultMessage": "!!!Loading", 4 "defaultMessage": "!!!Loading {service}",
5 "file": "src/components/ui/WebviewLoader/index.js", 5 "file": "src/components/ui/WebviewLoader/index.js",
6 "start": { 6 "start": {
7 "line": 11, 7 "line": 11,
diff --git a/src/i18n/messages/src/containers/settings/EditServiceScreen.json b/src/i18n/messages/src/containers/settings/EditServiceScreen.json
index 42ca42125..9b46a1e6f 100644
--- a/src/i18n/messages/src/containers/settings/EditServiceScreen.json
+++ b/src/i18n/messages/src/containers/settings/EditServiceScreen.json
@@ -79,7 +79,7 @@
79 }, 79 },
80 { 80 {
81 "id": "settings.service.form.customUrl", 81 "id": "settings.service.form.customUrl",
82 "defaultMessage": "!!!Custom server", 82 "defaultMessage": "!!!Service URL",
83 "file": "src/containers/settings/EditServiceScreen.js", 83 "file": "src/containers/settings/EditServiceScreen.js",
84 "start": { 84 "start": {
85 "line": 52, 85 "line": 52,
diff --git a/src/internal-server b/src/internal-server
Subproject cca6cd984caf729722153e58f44c01319c4bd63 Subproject 48cb16fefe46ab66b1884f18e04c1f701a8e0c0