Skip to content

Commit

Permalink
Merge branch 'master' into next
Browse files Browse the repository at this point in the history
  • Loading branch information
potts99 committed Nov 29, 2023
2 parents 4f4728a + 6c320fa commit 24167a5
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,14 @@ services:
DB_PASSWORD: "1234"
DB_HOST: "peppermint_postgres"
SECRET: 'peppermint4life'
API_URL: "http://localhost:5003"
API_URL: "http://server-ip:5003"
volumes:
pgdata:
```

Once this is completed then you can go to your base_url which was added to the compose file and login.
Once this is completed then you can go to your server-ip:3000 which was added to the compose file and login.

The default login credentials are

Expand Down
8 changes: 4 additions & 4 deletions apps/client/locales/de/peppermint.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"hello_good": "Gut",
"hello_good": "Wunderschönen",
"hello_morning": "Morgen",
"hello_afternoon": "Nachmittag",
"sl_dashboard": "Armaturenbrett",
"sl_dashboard": "Dashboard",
"sl_tickets": "Tickets",
"sl_history": "Verlauf",
"sl_notebook": "Persönliches Notizbuch",
Expand Down Expand Up @@ -59,7 +59,7 @@
"description": "Beschreibung",
"comments": "Kommentare",
"leave_comment": "Kommentar hinterlassen",
"close_issue": "Problem schließen",
"close_issue": "Ticket schließen",
"comment": "Kommentar",
"save": "Speichern",
"labels": "Labels",
Expand All @@ -68,7 +68,7 @@
"hide_ticket": "Ticket ausblenden",
"show_ticket": "Global anzeigen",
"open_issue": "Problem öffnen",
"closed_issue": "Geschlossenes Problem",
"closed_issue": "Geschlossenes Ticket",
"recent_tickets": "Aktuelle Tickets",
"notebook_title": "Notizbuchtitel",
"admin_settings": "Admin-Einstellungen",
Expand Down
14 changes: 7 additions & 7 deletions apps/client/locales/se/peppermint.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"hello_good": "Bra",
"hello_morning": "Morgon",
"hello_afternoon": "Eftermiddag",
"hello_good": "Hejsan",
"hello_morning": "God morgon",
"hello_afternoon": "God eftermiddag",
"sl_dashboard": "Instrumentpanel",
"sl_tickets": "Biljetter",
"sl_history": "Historik",
"sl_notebook": "Personlig anteckningsbok",
"sl_notebook": "Anteckningsbok",
"sl_users": "Användare",
"sl_clients": "Kunder",
"sl_settings": "Inställningar",
Expand All @@ -19,9 +19,9 @@
"ticket_name_here": "Namn",
"ticket_email_here": "E-post",
"ticket_details": "Rubrik",
"ticket_select_client": "Välj en kund",
"ticket_select_eng": "Välj en ingenjör",
"ticket_extra_details": "Ange extra detaljer här.... markdown stöds",
"ticket_select_client": "Välj kund",
"ticket_select_eng": "Välj tekniker",
"ticket_extra_details": "Ange extra detaljer här... markdown stöds",
"cancel": "Avbryt",
"create": "Skapa",
"low": "Låg",
Expand Down

0 comments on commit 24167a5

Please sign in to comment.