1523 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Christoph (Sheogorath) Kern	e5edd1a124	Merge pull request #713 from SISheogorath/update/socketio ... Update socket.io to version 2.0.4	2018-01-30 21:43:31 +01:00
Sheogorath	a01b4a843c	Update socket.io to version 2.0.4 ... Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>	2018-01-30 19:44:32 +01:00
Sheogorath	a40dcdd222	Prevent "wrong type"-issue ... The argument is may interpreted as number which causes the "pass" parameter of the user creation to fail. Probably the same applies to the mail address. But mail addresses are by definition not allowed to start by a number (iirc) which makes it less a problem. This is mainly a quick fix. Should be refactored a bit in future. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>	2018-01-29 22:41:12 +01:00
Sheogorath	e055f270b4	Update yarn.lock ... Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>	2018-01-29 22:37:02 +01:00
Christoph (Sheogorath) Kern	80950f806b	Merge pull request #707 from Nebukadneza/add_cmdline_usermanager ... Add simple user-management tool for emailsignin	2018-01-29 22:35:20 +01:00
Sheogorath	be02aed1c0	Update badges in README.md ... The docker badges have to be updated since we now provide official image like tags. So `latest-alpine` became `alpine`. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>	2018-01-29 22:01:31 +01:00
Dario Ernst	31f1db4100	Make travis run shellcheck only on shellscripts ... There are only a few scripts in bin/, but not all might be shell. At least for the moment, it seems reasonable to explicitely enumerate all shell-scripts in bin/ for shellcheck … Signed-off-by: Dario Ernst <dario@kanojo.de>	2018-01-29 19:49:04 +01:00
Dario Ernst	9e0359e079	Add simple user-management tool for emailsignin … ... Currently, administrators of closed instances need to manually fiddle in their databases for user-management. This commit adds a small commandline utility that allows to create and delete users. Signed-off-by: Dario Ernst <dario@kanojo.de>	2018-01-29 19:49:04 +01:00
Sheogorath	4c08afbbb5	Update yarn.lock ... Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>	2018-01-29 16:38:32 +01:00
Christoph (Sheogorath) Kern	adc781f7e3	Merge pull request #704 from SISheogorath/fix/ldapProviderName ... Fix ldap provider name in template	2018-01-29 15:59:27 +01:00
Christoph (Sheogorath) Kern	e18e05541c	Merge pull request #705 from SISheogorath/fix/camelcaseConfig ... Remove camel case from `imageuploadtype` in config	2018-01-29 15:53:14 +01:00
Christoph (Sheogorath) Kern	d8766bbc08	Merge pull request #710 from hackmdio/feature/upgradeRevealJS ... Upgrade reveal.js to 3.6.0 and useCDN option for CSS include	2018-01-29 15:19:23 +01:00
Wu Cheng-Han	3c473e60a6	Upgrade reveal.js to 3.6.0 and useCDN option for CSS include	2018-01-29 13:09:52 +08:00
Sheogorath	bd92010dd2	Remove camel case from imageuploadtype in config ... This removes the only camel cased option of the config options **we** added to the config.json. In auth provider's config parts are a lot of camel cased options provided. We shouldn't touch them to keep them as similar as possible to the examples. Fixes #315 Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>	2018-01-27 23:50:15 +01:00
Sheogorath	aca5490b3a	Add recommendation for 2GB RAM ... We noticed on multiple places that machines with less than 2GB of RAM fail their build and result in missing files and unexpected errors. Sadly we can't really solve this right now since it's a webpack related bug. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>	2018-01-26 18:30:01 +01:00
Sheogorath	e44751b3f1	Fix ldap provider name in template ... Before this fix it's impossible to set the provider name in the sign-model since `ldap` is a boolean there and this way not able to have an attribute like `ldap.providerName`. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>	2018-01-26 10:46:22 +01:00
Sheogorath	0138911274	Extend README changes for minio	2018-01-26 10:23:51 +01:00
Christoph (Sheogorath) Kern	6dae85f4aa	Merge pull request #698 from SISheogorath/docs/minio ... Adding some docs for new Minio Feature	2018-01-26 00:35:50 +01:00
Christoph (Sheogorath) Kern	e52d7db96c	Merge pull request #694 from SISheogorath/refactor/socialmedia ... Reorganize social media links and footer	2018-01-25 17:40:11 +01:00
Sheogorath	e5074df910	Update yarn.lock ... Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>	2018-01-24 19:50:09 +01:00
Sheogorath	16892cd827	Reorganize social media links and footer ... Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>	2018-01-24 14:09:36 +01:00
Christoph (Sheogorath) Kern	a49e603c38	Merge pull request #700 from hackmdio/fix-toggle-todo ... Fix task todo might not toggle	2018-01-24 09:39:17 +01:00
Max Wu	a9c88ce248	Fix task todo might not toggle ... which caused by not matching syntax with double dashes correctly	2018-01-24 00:10:52 +08:00
Christoph (Sheogorath) Kern	584f1c5249	Merge pull request #691 from SISheogorath/feature/upload ... Allow more detailed configuration of upload mime types	2018-01-23 12:10:33 +01:00
Christoph (Sheogorath) Kern	e0389bc4cf	Merge pull request #697 from SISheogorath/fix/minio ... Fix broken port config	2018-01-23 12:09:41 +01:00
Sheogorath	817bb9e639	Fix broken port config ... Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>	2018-01-23 12:00:11 +01:00
Sheogorath	587a6e2239	Add README and config.json.example content ... Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>	2018-01-23 11:59:07 +01:00
Sheogorath	a99467f006	Add minio guide ... Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>	2018-01-23 11:48:00 +01:00
Christoph (Sheogorath) Kern	eec2318bda	Merge pull request #506 from erasys/minio ... Add support for minio	2018-01-23 11:43:24 +01:00
Christoph (Sheogorath) Kern	7de6e3211f	Merge pull request #598 from xxyy/feature/csp ... Implement basic CSP support	2018-01-22 20:43:46 +01:00
Christoph (Sheogorath) Kern	fbfe3272f5	Merge pull request #695 from SISheogorath/translate/chinese ... Add some missing chinese translations	2018-01-22 17:51:56 +01:00
Sheogorath	36b0524b78	Add some chinese translations ... Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>	2018-01-22 14:22:43 +01:00
Christoph (Sheogorath) Kern	268c81a323	Merge pull request #673 from fooker/master ... Allow posting new note with content	2018-01-20 19:45:41 +01:00
Christoph (Sheogorath) Kern	5d9a2c3569	Merge pull request #688 from hackmdio/add-ce-text-on-index ... Add CE text on index title	2018-01-20 18:56:39 +01:00
Christoph (Sheogorath) Kern	b7e227e9d5	Merge pull request #690 from Nebukadneza/add_allow_anonymous_edits ... Add option to enable `freely` permission in closed instance	2018-01-20 18:56:09 +01:00
Christoph (Sheogorath) Kern	2eb30782d5	Merge pull request #687 from SISheogorath/refactor/contact ... Remove/update contact details	2018-01-20 18:51:22 +01:00
Christoph (Sheogorath) Kern	38a46c8373	Merge pull request #693 from SISheogorath/translate/german ... Extent german translation	2018-01-20 18:50:43 +01:00
Sheogorath	64d8c747f0	Extent german translation ... Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>	2018-01-20 18:23:19 +01:00
Sheogorath	dc10ec60fb	Remove/update contact details ... Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>	2018-01-20 17:40:00 +01:00
Sheogorath	a7935a595a	Allow more detailed configuration of upload mime types ... Fixes #637 Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>	2018-01-20 15:16:53 +01:00
Dario Ernst	6ae4b8bf13	Add option to enable freely permission in closed instance ... Before, closed disallowed guest edits completely, by removing the `freely` permission. This makes it possible to explicitely bring back guest-editing, but not guest-note-creation, to closed instances. Signed-off-by: Dario Ernst <dario@kanojo.de>	2018-01-20 15:14:56 +01:00
Max Wu	05cc3a73a2	Update body.ejs ... Add CE text on index title	2018-01-20 10:12:38 +08:00
Sheogorath	40d1d75704	Release 1.0.1-ce	2018-01-19 14:40:15 +01:00
Christoph (Sheogorath) Kern	da462e01f5	Merge pull request #680 from hackmdio/show-ce-on-title ... Update README.md	2018-01-19 14:35:08 +01:00
Christoph (Sheogorath) Kern	60005d3039	Merge pull request #686 from SISheogorath/feature/configVersion ... Load version from package.json	2018-01-19 14:34:54 +01:00
Christoph (Sheogorath) Kern	feb89f02e2	Merge pull request #684 from hackmdio/fixDropboxAppKey ... Fix not passing app key correctly in dropbox config ⚠️ Dropbox ClientSecret was leaked ⚠️ Fixes #683	2018-01-19 14:31:04 +01:00
Christoph (Sheogorath) Kern	d492070d3a	Merge pull request #685 from hackmdio/fixImageAlt ... Fix image alt not render properly Fixes #638	2018-01-19 14:26:06 +01:00
Sheogorath	a0fdfccb22	It's 2018! 🎉	2018-01-19 14:08:16 +01:00
Sheogorath	583aa4f462	Load version from package.json ... Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>	2018-01-19 13:54:19 +01:00
Wu Cheng-Han	3703b12584	Fix image alt not render properly	2018-01-19 00:53:49 +08:00