From 6b93e413b6dfaee62a64300d996d7dff20a11622 Mon Sep 17 00:00:00 2001 From: Benjamin Gamard Date: Mon, 3 Jun 2019 11:45:38 +0200 Subject: [PATCH 1/5] #321: remove duplicate contributors --- .../src/main/java/com/sismics/docs/core/dao/ContributorDao.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs-core/src/main/java/com/sismics/docs/core/dao/ContributorDao.java b/docs-core/src/main/java/com/sismics/docs/core/dao/ContributorDao.java index 22e392a7..a0ae23b4 100644 --- a/docs-core/src/main/java/com/sismics/docs/core/dao/ContributorDao.java +++ b/docs-core/src/main/java/com/sismics/docs/core/dao/ContributorDao.java @@ -56,7 +56,7 @@ public class ContributorDao { @SuppressWarnings("unchecked") public List getByDocumentId(String documentId) { EntityManager em = ThreadLocalContext.get().getEntityManager(); - StringBuilder sb = new StringBuilder("select u.USE_USERNAME_C, u.USE_EMAIL_C from T_CONTRIBUTOR c "); + StringBuilder sb = new StringBuilder("select distinct u.USE_USERNAME_C, u.USE_EMAIL_C from T_CONTRIBUTOR c "); sb.append(" join T_USER u on u.USE_ID_C = c.CTR_IDUSER_C "); sb.append(" where c.CTR_IDDOC_C = :documentId "); Query q = em.createNativeQuery(sb.toString()); From 19422b5afa76f576e228a4a163d01e3e9286a43e Mon Sep 17 00:00:00 2001 From: Mario Voigt Date: Mon, 26 Aug 2019 14:19:19 +0200 Subject: [PATCH 2/5] Fixed some language issue (#352) --- docs-web/src/main/webapp/src/locale/de.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs-web/src/main/webapp/src/locale/de.json b/docs-web/src/main/webapp/src/locale/de.json index d03cc54e..a6ff9927 100644 --- a/docs-web/src/main/webapp/src/locale/de.json +++ b/docs-web/src/main/webapp/src/locale/de.json @@ -96,7 +96,7 @@ "shared_document_message": "Sie können dieses Dokument mit diesem Link freigeben. Beachten Sie, dass jeder, der diesen Link hat, das Dokument sehen kann.
", "not_found": "Dokument nicht gefunden", "forbidden": "Zugriff verweigert", - "download_files": "Datei herunterladen", + "download_files": "Dateien herunterladen", "export_pdf": "in PDF exportieren", "by_creator": "von", "comments": "Kommentar", From ff7b07f4645468bda1bcdb37b408ef87c0fa5c43 Mon Sep 17 00:00:00 2001 From: Benjamin Gamard Date: Sat, 12 Oct 2019 23:05:35 +0200 Subject: [PATCH 3/5] Create FUNDING.yml --- .github/FUNDING.yml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .github/FUNDING.yml diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 00000000..9b0a64ba --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1,3 @@ +# These are supported funding model platforms + +github: [jendib] From 737c85cf0001d2a9d0d98b4b8d45009114797a77 Mon Sep 17 00:00:00 2001 From: Benjamin Gamard Date: Sun, 13 Oct 2019 01:23:03 +0200 Subject: [PATCH 4/5] Update README.md --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index 6db95fd9..20a78fd7 100644 --- a/README.md +++ b/README.md @@ -8,11 +8,9 @@ Teedy is an open source, lightweight document management system for individuals and businesses. -**Discuss it on [Product Hunt](https://www.producthunt.com/posts/sismics-docs) 🦄** -

- ✨ Sismics Docs is now called Teedy! You can still find our cloud and support offer on teedy.io ✨ + ✨ Sponsor this project if you use and appreciate it!


From ec836a2f9d6d7aac009361aa1f7c1d754feb2b7f Mon Sep 17 00:00:00 2001 From: Benjamin Gamard Date: Sun, 13 Oct 2019 01:24:10 +0200 Subject: [PATCH 5/5] Update README.md --- README.md | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/README.md b/README.md index 20a78fd7..8777e3dd 100644 --- a/README.md +++ b/README.md @@ -122,17 +122,6 @@ All contributions are more than welcomed. Contributions may close an issue, fix The `master` branch is the default and base branch for the project. It is used for development and all Pull Requests should go there. - -Community ---------- - -Get updates on Teedy's development and chat with the project maintainers: - -- Follow [@teedyio on Twitter](https://twitter.com/teedyio) -- Read and subscribe to [The Official Teedy Blog](https://blog.teedy.io/) -- Check the [Official Website](https://teedy.io) -- Join us [on Facebook](https://www.facebook.com/teedyio) - License -------