hedgedoc - Hedgedoc with support for CindyScript

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge pull request #646 from SISheogorath/fix/CI	Christoph (Sheogorath) Kern	2017-12-04	1	-2/+3
\|\ \| \| \| \|	Fix build problem by updating yarn version
\| *	Fix build problem by updating yarn version	Sheogorath	2017-12-04	1	-2/+3
\|/
*	Merge pull request #639 from mosterdt/master	Christoph (Sheogorath) Kern	2017-12-03	3	-2/+6
\|\ \| \| \| \|	Fix small spelling mistake and add untranslated sentences to locale
\| *	close open tags	Thomas De Backer	2017-12-01	1	-2/+2
\| \|
\| *	Add untranslated sentences to locale	Thomas De Backer	2017-11-30	3	-2/+6
\|/
*	Merge pull request #631 from SISheogorath/update/yarn	Christoph (Sheogorath) Kern	2017-11-27	1	-70/+75
\|\ \| \| \| \|	Update yarn
\| *	Update yarn	Sheogorath	2017-11-27	1	-70/+75
\|/
*	Merge pull request #627 from SISheogorath/fix/XSS	Christoph (Sheogorath) Kern	2017-11-24	1	-1/+1
\|\ \| \| \| \|	Prevent XSS vulnerbility by srcdoc in iframe
\| *	Prevent XSS vul by srcdoc in iframe	Sheogorath	2017-11-24	1	-1/+1
\| \|
* \|	Merge pull request #601 from devonJS/auth-docs	Christoph (Sheogorath) Kern	2017-11-09	10	-2/+85
\|\ \ \| \|/ \|/\|	Added small guide for auth providers GitHub and Twitter
\| *	added auth docs and images for GitHub and Twitter	Devon Jue	2017-11-08	10	-2/+85
\|/
*	Merge pull request #615 from PeterDaveHello/patch-1	Sheogorath	2017-10-31	1	-5/+5
\|\ \| \| \| \|	[README] Add icons to browser version support list
\| *	[README] Add icons to browser version support list	Peter Dave Hello	2017-10-31	1	-5/+5
\|/
*	Merge pull request #614 from SISheogorath/fix/mattermostVar	Sheogorath	2017-10-31	1	-0/+1
\|\ \| \| \| \|	Fix mattermost breaking notes
\| *	Fix mattermost breaking notes	Sheogorath	2017-10-31	1	-0/+1
\|/
*	Merge pull request #604 from PeterDaveHello/refactor-TravisCI-config	Sheogorath	2017-10-31	1	-8/+33
\|\ \| \| \| \|	Refactor travis ci config
\| *	Add build, ShellCheck, doctoc & jsonlint test on Travis CI	Peter Dave Hello	2017-10-29	1	-0/+16
\| \|
\| *	Use matrix(jobs) in .travis.yml	Peter Dave Hello	2017-10-29	1	-8/+17
\| \|
* \|	Merge pull request #606 from DoubleMalt/feature/MattermostAuth	Sheogorath	2017-10-31	14	-13/+116
\|\ \ \| \| \| \| \| \|	Add Mattermost authentication strategy
\| * \|	Add mattermost authentication	Christoph Witzany	2017-10-31	14	-13/+116
\| \| \|
* \| \|	Merge pull request #613 from SISheogorath/fix/allowerrorHandling	Sheogorath	2017-10-31	1	-2/+2
\|\ \ \ \| \| \| \| \| \| \| \|	Fix allowpdfexport handling on error page
\| * \| \|	Fix allowpdfexport handling on error page	Sheogorath	2017-10-31	1	-2/+2
\| \|/ /
* \| \|	Merge pull request #605 from SISheogorath/feature/extentReadme	Sheogorath	2017-10-30	1	-3/+18
\|\ \ \ \| \|/ / \|/\| \|	Extend docker section in README
\| * \|	Extend docker section	Sheogorath	2017-10-30	1	-3/+18
\| \| \|
* \| \|	Merge pull request #612 from SISheogorath/fix/mermaidErr	Sheogorath	2017-10-30	1	-2/+7
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix mermaid error handling Fixes #610
\| * \| \|	Fix mermaid error handling	Sheogorath	2017-10-30	1	-2/+7
\|/ / /
* \| \|	Merge pull request #608 from SISheogorath/fix/mermaid	Sheogorath	2017-10-30	1	-12/+4
\|\ \ \ \| \| \| \| \| \| \| \|	Use mermaidAPI in mermaid scope
\| * \| \|	Use mermaidAPI in mermaid scope	Sheogorath	2017-10-30	1	-12/+4
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Introduced by https://github.com/knsv/mermaid/commit/a5b71455271aef1180eefa1054d751dea1885e3f#diff-67ae90c5144c55348a3cbdb078240454L532 Fixes #600 Parse only throws error: https://github.com/knsv/mermaid/commit/167368d508f1e5b1606b2b45f892cdd60d479448#diff-67ae90c5144c55348a3cbdb078240454
* \| \|	Merge pull request #607 from PeterDaveHello/upgrade-mermaid	Sheogorath	2017-10-29	5	-118/+241
\|\ \ \ \| \|/ / \|/\| \|	Upgrade mermaid to v7.1.0, fix #600
\| * \|	Update yarn.lock	Peter Dave Hello	2017-10-30	1	-114/+237
\| \| \|
\| * \|	Upgrade mermaid to v7.1.0, fix #600	Peter Dave Hello	2017-10-30	4	-4/+4
\| \|/
* \|	Merge pull request #462 from CrazyPython/patch-1	Sheogorath	2017-10-27	1	-22/+22
\|\ \ \| \|/ \|/\|	Fix grammar and use best English standards
\| *	Update en.json	James	2017-10-13	1	-1/+1
\| \|
\| *	Update en.json	James	2017-10-13	1	-1/+1
\| \|
\| *	Merge pull request #1 from SISheogorath/patch-2	James	2017-09-11	1	-5/+5
\| \|\ \| \| \| \| \| \|	Update en.json
\| \| *	Update en.json	Sheogorath	2017-09-11	1	-5/+5
\| \|/
\| *	Update en.json	James	2017-09-07	1	-4/+4
\| \|
\| *	Update en.json	James	2017-09-07	1	-1/+1
\| \|
\| *	Update en.json	CrazyPython	2017-05-25	1	-1/+1
\| \|
\| *	file -> note	CrazyPython	2017-05-25	1	-1/+1
\| \|
\| *	Update en.json	CrazyPython	2017-05-19	1	-2/+2
\| \|
\| *	Incorporate feedback	CrazyPython	2017-05-19	1	-2/+2
\| \|
\| *	This is a alert area -> this is an alert area	CrazyPython	2017-05-17	1	-1/+1
\| \|
\| *	"Todo List" -> "Checklist" and "Marked text" -> "Highlighted text"	CrazyPython	2017-05-16	1	-3/+3
\| \|
\| *	"Collaborate with URL" sounds like a command to an English native	CrazyPython	2017-05-16	1	-1/+1
\| \|
\| *	Fix grammar and use best English standards	CrazyPython	2017-05-16	1	-12/+12
\| \|
* \|	Merge pull request #599 from xxyy/fix/inline-styles	Sheogorath	2017-10-27	2	-6/+23
\|\ \ \| \| \| \| \| \|	Externalise some trivial inline styles from slide.ejs
\| * \|	Externalise trivial inline styles from slide.ejs	Literallie	2017-10-23	2	-6/+23
\| \| \| \| \| \| \| \| \| \| \| \|	Dynamic background images need some further work
* \| \|	Merge pull request #562 from SISheogorath/fix/LDAP	Sheogorath	2017-10-27	1	-2/+3
\|\ \ \ \| \| \| \| \| \| \| \|	Fix LDAP problem about missing uidNumber
\| * \| \|	Fix LDAP problem about missing uidNumber	Sheogorath	2017-10-12	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>