diff --git a/.gitignore b/.gitignore
index 5560f987..ef52ccd0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,4 +13,9 @@ node_modules
import_test
teedy-importer-linux
teedy-importer-macos
-teedy-importer-win.exe
\ No newline at end of file
+teedy-importer-win.exe
+docs/*
+!docs/.gitkeep
+
+#macos
+.DS_Store
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 00000000..8315aa50
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,18 @@
+version: '3'
+services:
+# Teedy Application
+ teedy-server:
+ image: sismics/docs:v1.10
+ restart: unless-stopped
+ ports:
+ # Map internal port to host
+ - 8080:8080
+ environment:
+ # Base url to be used
+ DOCS_BASE_URL: "https://docs.example.com"
+ # Set the admin email
+ DOCS_ADMIN_EMAIL_INIT: "admin@example.com"
+ # Set the admin password (in this example: "superSecure")
+ DOCS_ADMIN_PASSWORD_INIT: "$$2a$$05$$PcMNUbJvsk7QHFSfEIDaIOjk1VI9/E7IPjTKx.jkjPxkx2EOKSoPS"
+ volumes:
+ - ./docs/data:/data
diff --git a/docs-web/src/main/webapp/src/locale/en.json b/docs-web/src/main/webapp/src/locale/en.json
index 78c8a3e3..32495206 100644
--- a/docs-web/src/main/webapp/src/locale/en.json
+++ b/docs-web/src/main/webapp/src/locale/en.json
@@ -25,7 +25,7 @@
"message": "Please enter a new password",
"submit": "Change my password",
"error_title": "Error changing your password",
- "error_message": "Your password recovery request is expired, please ask a new one on the login page"
+ "error_message": "Your password recovery request is expired, please ask for a new one on the login page"
},
"index": {
"toggle_navigation": "Toggle navigation",
@@ -360,7 +360,7 @@
"message_2": "Those applications automatically generate a validation code that changes after a certain period of time.
You will be required to enter this validation code each time you login on {{ appName }}.",
"secret_key": "Your secret key is: {{ secret }}",
"secret_key_warning": "Configure your TOTP app on your phone with this secret key now, you will not be able to access it later.",
- "totp_enabled_message": "Two-factor authentication is enabled on your account.
Each time you login on {{ appName }}, you will be asked a validation code from your configured phone app.
If you lose your phone, you will not be able to login into your account but active sessions will allow you to regenerate a secrey key.",
+ "totp_enabled_message": "Two-factor authentication is enabled on your account.
Each time you login on {{ appName }}, you will be asked for a validation code from your configured phone app.
If you lose your phone, you will not be able to login into your account but active sessions will allow you to regenerate a secrey key.",
"disable_totp": {
"disable_totp": "Disable two-factor authentication",
"message": "Your account will not be protected by the two-factor authentication anymore.",
@@ -509,7 +509,7 @@
"error_general": "An error occurred while trying to import your file, please make sure it is a valid EML file"
},
"app_share": {
- "main": "Ask a shared document link to access it",
+ "main": "Ask for a shared document link to access it",
"403": {
"title": "Not authorized",
"message": "The document you are trying to view is not shared anymore"
diff --git a/docs/.gitkeep b/docs/.gitkeep
new file mode 100644
index 00000000..e69de29b