status-im
/
codimd
mirror of https://github.com/status-im/codimd.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
2,363 Commits 23 Branches 35 Tags 26 MiB
Commit Graph

107 Commits

Author SHA1 Message Date
BoHong Li 85fc41c350
Merge branch 'master' into develop 2019-08-17 00:07:49 +08:00
BoHong Li ff124ab6bf
refactor: fix line after merged develop 
Signed-off-by: BoHong Li <raccoon@hackmd.io>
 2019-08-04 23:59:03 +08:00
BoHong Li ee1538eed9
refactor: fix lint on lib/web/userRouter.js 
Signed-off-by: BoHong Li <raccoon@hackmd.io>
 2019-08-04 23:56:31 +08:00
BoHong Li 3049c64066
refactor: fix lint on lib/web/imageRouter/s3.js 
Signed-off-by: BoHong Li <raccoon@hackmd.io>
 2019-08-04 23:56:30 +08:00
BoHong Li c8ffd2ab19
refactor: fix lint on lib/web/imageRouter/minio.js 
Signed-off-by: BoHong Li <raccoon@hackmd.io>
 2019-08-04 23:56:30 +08:00
BoHong Li 0c9195b731
refactor: fix lint on lib/web/auth/twitter/index.js 
Signed-off-by: BoHong Li <raccoon@hackmd.io>
 2019-08-04 23:56:30 +08:00
BoHong Li bc71b7b31b
refactor: fix lint on lib/web/auth/saml/index.js 
Signed-off-by: BoHong Li <raccoon@hackmd.io>
 2019-08-04 23:56:29 +08:00
BoHong Li a9bcf055e7
refactor: fix lint on lib/web/auth/openid/index.js 
Signed-off-by: BoHong Li <raccoon@hackmd.io>
 2019-08-04 23:56:29 +08:00
BoHong Li d5f5bdaa57
refactor: fix lint on lib/web/auth/oauth2/index.js 
Signed-off-by: BoHong Li <raccoon@hackmd.io>
 2019-08-04 23:56:29 +08:00
BoHong Li 3be119ded1
refactor: fix lint on lib/web/auth/mattermost/index.js 
Signed-off-by: BoHong Li <raccoon@hackmd.io>
 2019-08-04 23:56:28 +08:00
BoHong Li d8cde49a9c
refactor: fix lint on lib/web/auth/ldap/index.js 
Signed-off-by: BoHong Li <raccoon@hackmd.io>
 2019-08-04 23:56:28 +08:00
BoHong Li df9eaf7fc4
refactor: fix lint on lib/web/auth/google/index.js 
Signed-off-by: BoHong Li <raccoon@hackmd.io>
 2019-08-04 23:56:28 +08:00
BoHong Li 41500310b0
refactor: fix lint on lib/web/auth/gitlab/index.js 
Signed-off-by: BoHong Li <raccoon@hackmd.io>
 2019-08-04 23:56:28 +08:00
BoHong Li 09f2a04bc0
refactor: fix lint on lib/web/auth/github/index.js 
Signed-off-by: BoHong Li <raccoon@hackmd.io>
 2019-08-04 23:56:27 +08:00
BoHong Li 446d38a842
refactor: fix lint on lib/web/auth/facebook/index.js 
Signed-off-by: BoHong Li <raccoon@hackmd.io>
 2019-08-04 23:56:27 +08:00
BoHong Li 7c8ade8258
refactor: fix lint on lib/web/auth/email/index.js 
Signed-off-by: BoHong Li <raccoon@hackmd.io>
 2019-08-04 23:56:27 +08:00
BoHong Li ff72618a9c
refactor: fix lint on lib/web/auth/dropbox/index.js 
Signed-off-by: BoHong Li <raccoon@hackmd.io>
 2019-08-04 23:56:26 +08:00
Chulki Lee 1d7895c869 Add plantuml support 
Signed-off-by: Chulki Lee <chulki.lee@gmail.com>
 2019-07-31 10:02:07 -07:00
Max Wu 62918134c0
Merge branch 'develop' into feature/lutim 2019-08-01 00:22:23 +08:00
Max Wu 0af9bfb015
Merge branch 'master' into feature/disableRequestedAuthnContext-config-option 2019-07-31 23:35:50 +08:00
Max Wu f1680ef7fa fix: code style 
Signed-off-by: Max Wu <jackymaxj@gmail.com>
 2019-07-28 20:04:41 +08:00
Toshinori Notake 4e91268e1f Make toobusy.maxLag configurable 
Signed-off-by: Toshinori Notake <toshi.notake.43568@gmail.com>
 2019-07-18 13:57:14 +09:00
GHOUL Nadir 779fa59dbb Adding an error code to the `{"status":"forbidden"}` response 
Signed-off-by: Ghoul Nadir <nadir.ghoul@outlook.com>
 2019-05-04 00:18:28 +02:00
toshi0123 eff6e04e2b
Fix avoiding crash if URL is invalid 
Signed-off-by: toshi0123 <7948737+toshi0123@users.noreply.github.com>
 2019-04-18 19:10:46 +09:00
Raccoon 48a68e015b
Merge pull request #1095 from Thor77/fix-1094 
Hide default ports from minio image upload urls
 2019-04-15 13:48:44 +08:00
Raccoon d127b8ef7f
Merge pull request #1142 from dg-i/configurable-s3-endpoint 
Make AWS S3 endpoint configurable
 2019-04-15 13:37:33 +08:00
BoHong Li 8c26107ab1
fix: lint 
Signed-off-by: BoHong Li <a60814billy@gmail.com>
 2019-04-15 13:36:44 +08:00
BoHong Li 6c137ae6ed
fix: mattermost has been deprecated, use mattermost-redux instead it. 
1. change mattermost color and gitlab color to official color
2. Add mattermost icon because Fork-awesome/font-awesome doesn’t provide mattermost icon

Signed-off-by: BoHong Li <a60814billy@gmail.com>
 2019-04-15 13:03:31 +08:00
BoHong Li a34e6a7245
refactor: fix lint warning on lib/auth 
Signed-off-by: BoHong Li <a60814billy@gmail.com>
 2019-04-12 18:01:35 +08:00
BoHong Li 8d9a6f38c7
refactor: fix lint warning on lib/web/imageRouter 
Signed-off-by: BoHong Li <a60814billy@gmail.com>
 2019-04-12 18:01:30 +08:00
BoHong Li 319bf6d8b8
refactor: fix lint warning on lib/web/historyRouter.js 
Signed-off-by: BoHong Li <a60814billy@gmail.com>
 2019-04-12 18:01:23 +08:00
BoHong Li 1e5b4a4382
refactor: fix lint warning on lib/web/noterouter.js 
Signed-off-by: BoHong Li <a60814billy@gmail.com>
 2019-04-12 18:01:18 +08:00
BoHong Li a52fd0b3f9
refactor: fix lint warning on lib/web/statusRouter.js 
Signed-off-by: BoHong Li <a60814billy@gmail.com>
 2019-04-12 18:01:10 +08:00
BoHong Li 550e6a831d
refactor: fix lint warning on lib/web/userRouter.js 
Signed-off-by: BoHong Li <a60814billy@gmail.com>
 2019-04-12 18:01:05 +08:00
BoHong Li 7fcfbae89f
feat: replace imgur with @hackmd/imgur 
Signed-off-by: BoHong Li <a60814billy@gmail.com>
 2019-04-12 18:00:21 +08:00
Sheogorath cda878d377
Add required change for Google+ API deprecation 
Since Google+ is shutting down soon, we need to get the profile data
from another URL. Since the library already supports it, all we need to
do is adding a single line of code.

Details:
https://github.com/hackmdio/codimd/issues/1160

Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
 2019-03-09 14:42:06 +01:00
Mathias Merscher 9613197f5d
make aws s3 endpoint configurable 
Signed-off-by: Mathias Merscher <Mathias.Merscher@dg-i.net>
 2019-02-11 17:45:24 +01:00
Dylan Dervaux 8557133fbe Add imageRouter handler for lutim 
Signed-off-by: Dylan Dervaux <dylanderv05@gmail.com>
 2019-02-01 12:35:44 +01:00
Sheogorath 0621d7a72d
Fix usage of new URL API 
Due to the deprecation of the old `url`-API provided by NodeJS we
replaced `url.resolve` with `url.URL.resolve`, which doesn't exist.

This patch fixes the local filesystem upload of CodiMD by using the new
API correctly. Creating an URL object and using its href.

Some more background:
https://nodejs.org/api/url.html#url_url_href
https://nodejs.org/api/url.html#url_url_resolve_from_to

Fixes https://github.com/hackmdio/codimd/issues/1102

Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
 2018-12-18 14:52:18 +01:00
Thor77 87ba625d46 Remove checks for protocol before removing port 
Signed-off-by: Thor77 <thor77@thor77.org>
 2018-12-12 12:47:07 +01:00
Emmanuel Ormancey d73063922c Added a configuration option for passport-saml: 
disableRequestedAuthnContext: true|false

By default only Password authmethod is accepted, this option allows any other method.

Issue and option described here:
https://github.com/bergie/passport-saml/issues/226

Signed-off-by: Emmanuel Ormancey <emmanuel.ormancey@cern.ch>
 2018-12-12 10:40:24 +01:00
Thor77 e928893cfe
Hide port from minio URL for protocol default port 
Signed-off-by: Thor77 <thor77@thor77.org>
 2018-12-11 23:00:24 +01:00
Christoph (Sheogorath) Kern b749d50e20
Merge pull request #1082 from cloudyu/pull 
Fix wrong config options

In `./lib/web/auth/` some config includes still used `config.serverurl` instead of the correct `config.serverURL`. This causes wrong URL in worst case.

This patch should fix those problems and migrate the wrong statements to camelcase.
 2018-11-28 13:27:38 +01:00
Daan Sprenkels 9fba268288 Prevent subdirectories in user export 
This commit also refactors the code a bit, and adds a '-' separator
between a filename and its duplicate index.

This commit fixes #1079.

Signed-off-by: Daan Sprenkels <hello@dsprenkels.com>
 2018-11-28 09:13:28 +01:00
CloudYu 35a9f72a06 Fix typo 
Signed-off-by: CloudYu <cloudyu322@gmail.com>
 2018-11-27 22:14:37 +08:00
Christoph (Sheogorath) Kern f1367ba270
Merge pull request #1058 from ccoenen/bug/oauth2internalerror 
InternalOAuthError is not part of passport, but of passport-oauth2 #1056
 2018-11-16 11:45:50 +01:00
Claudius Coenen 858a59529e switching to eslint for code checking 
most rules degraded to WARN, so we don't go insane. This will
change over time. The aim is to conform to a common style

Signed-off-by: Claudius Coenen <opensource@amenthes.de>
 2018-11-14 23:15:36 +01:00
Claudius Coenen 56c043424d InternalOAuthError is not part of passport, but of passport-oauth2 
This fixes part of #1056: an error while obtaining the profile
would have `502`-crashed the server.

Signed-off-by: Claudius Coenen <opensource@amenthes.de>
 2018-11-14 14:38:47 +01:00
Sheogorath bcc914a773
Add full version string 
Currently we only provide the version from `package.json`. This means
that during updates of instances, e.g. the demo instance, which runs
latest master instead of a stable release, changes are not reflected to
the webclient.

This patch adds a fullversion string that contains the current commit
and this way makes that clients are notified about changes.

Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
 2018-11-11 12:44:19 +01:00
Sheogorath 9f9c4089be
Add OpenID to CodiMD 
With OpenID every OpenID capable provider can provide authentication for
users of a CodiMD instance. This means we have federated
authentication.

Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
 2018-10-05 22:43:32 +02:00