Wolfgang Huß
e8d5bed901
Merge pull request #952 from Human-Connection/storybook
...
Storybook
2019-08-06 07:50:09 +02:00
mattwr18
2afc62645c
Merge pull request #1192 from Human-Connection/dependabot/npm_and_yarn/webapp/vuex-i18n-1.13.1
...
Bump vuex-i18n from 1.13.0 to 1.13.1 in /webapp
2019-08-06 07:05:47 +02:00
mattwr18
dcb723ae3c
Merge pull request #1191 from Human-Connection/dependabot/npm_and_yarn/neode-0.3.1
...
Bump neode from 0.3.0 to 0.3.1
2019-08-06 07:05:18 +02:00
dependabot-preview[bot]
4e8b59466b
Bump vuex-i18n from 1.13.0 to 1.13.1 in /webapp
...
Bumps [vuex-i18n](https://github.com/dkfbasel/vuex-i18n ) from 1.13.0 to 1.13.1.
- [Release notes](https://github.com/dkfbasel/vuex-i18n/releases )
- [Commits](https://github.com/dkfbasel/vuex-i18n/compare/v1.13.0...v1.13.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-06 04:22:49 +00:00
dependabot-preview[bot]
48eb0eb31b
Bump neode from 0.3.0 to 0.3.1
...
Bumps [neode](https://github.com/adam-cowley/neode ) from 0.3.0 to 0.3.1.
- [Release notes](https://github.com/adam-cowley/neode/releases )
- [Commits](https://github.com/adam-cowley/neode/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-06 04:21:38 +00:00
Robert Schäfer
c091030c76
Merge pull request #1185 from Human-Connection/A-1002-Page-for-Terms-and-Conditions
...
Fix terms and conditions template, english and german
2019-08-06 01:19:28 +02:00
Robert Schäfer
a67cfa88be
Refactor terms-and-conditions
...
* DRY template
* avoid numeric translations keys - if you can, use telling translations
keys
* fix links! @ogerly so many hrefs pointing to http://localhost:3000/ ...
how is that possible?
2019-08-06 00:50:58 +02:00
ogerly
550bf2cf69
language file adapted
2019-08-06 00:37:17 +02:00
ogerly
8757402564
add v-html on element, fixed lint
2019-08-06 00:37:17 +02:00
ogerly
8f67c60f73
Fix terms and conditions template, english and german
2019-08-06 00:30:18 +02:00
Robert Schäfer
3595010358
Merge pull request #1175 from Human-Connection/Replace-layout-blank-with-layout-default
...
edit layout default for guests
2019-08-06 00:10:10 +02:00
ogerly
1d130f32c2
Make static pages in footer publicly accessible
2019-08-05 23:25:01 +02:00
Robert Schäfer
18c066d17d
The home button brings us to /login already
...
@ogerly by the way: Prefer `v-else` instaed of double `if-clauses` -
less errors.
2019-08-05 23:22:13 +02:00
Robert Schäfer
a6f5fe8ea3
Rename privacy->data-privacy
2019-08-05 23:19:20 +02:00
ogerly
330b2fb590
edit layout default for gasts
2019-08-05 23:19:20 +02:00
Robert Schäfer
6eaec5f31f
Merge pull request #1190 from Human-Connection/1005-Page-for-Code-of-Conduct
...
add page code-of-conduct, english and german
2019-08-05 23:16:38 +02:00
Robert Schäfer
4b2a1d93f5
Refactor code-of-conduct
...
* Add link in footer
* DRY template
* Structure translations into sections with a telling name
* Fix typos and links
2019-08-05 22:56:36 +02:00
Robert Schäfer
56100010ec
DRY template, restructure translations
2019-08-05 22:56:36 +02:00
ogerly
80d80f9c61
change add v-html, fixed lint
2019-08-05 22:56:36 +02:00
ogerly
29dc306187
add page code-of-conduct, english and german
2019-08-05 22:56:36 +02:00
Robert Schäfer
dc132c28be
Merge pull request #1184 from Human-Connection/A-1004-Page-to-display-Changelog
...
changes and history template, english, german
2019-08-05 22:00:14 +02:00
Robert Schäfer
49acea9767
Improve changelog and translations
...
* remove unnecessary markup
* remove manual translations of dates (we have a helper for that)
* fix typos and English translations
2019-08-05 20:45:40 +02:00
Robert Schäfer
52e0361087
Fixing pasteRules for Embeds
...
Apparently the default pasteRules of tiptap interfere with the
pasteRules of a Link (in our case an Embed node). Consider this example:
https://de.wikipedia.org/wiki/Yin_und_Yang
Depending on some random conditions, tiptap might parse the `_und_` to be
italic because it's wrapped with underscores (markdown syntax). The
result is:
https://de.wikipedia.org/wiki/Yin # link
_und_ # italic
Yang # plain text
So let's remove the default pasteRules of `Bold`, `Strike` and `Italic`
marks respectively to prefer our Embeds. Who is copy+pasting from one
tiptap editor to another tiptap editor anyways?
2019-08-05 17:26:50 +02:00
Robert Schäfer
8093fece00
Update URL regex taking e.g. "?" into account
2019-08-05 13:25:50 +02:00
Robert Schäfer
20ef7e0c83
Merge pull request #1182 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-lang-5.6.5
...
Bump metascraper-lang from 5.6.3 to 5.6.5 in /backend
2019-08-05 13:16:08 +02:00
Robert Schäfer
1aeb93f9fb
Merge remote-tracking branch 'origin/master' into storybook
2019-08-05 12:47:46 +02:00
mattwr18
51e7c25569
Merge pull request #1181 from Human-Connection/dependabot/npm_and_yarn/webapp/vue/cli-shared-utils-3.10.0
...
Bump @vue/cli-shared-utils from 3.9.0 to 3.10.0 in /webapp
2019-08-05 09:45:13 +02:00
dependabot-preview[bot]
213a138f99
Bump metascraper-lang from 5.6.3 to 5.6.5 in /backend
...
Bumps [metascraper-lang](https://github.com/microlinkhq/metascraper ) from 5.6.3 to 5.6.5.
- [Release notes](https://github.com/microlinkhq/metascraper/releases )
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md )
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.6.3...v5.6.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-05 07:45:13 +00:00
mattwr18
1ad8d7aa93
Merge pull request #1180 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-author-5.6.5
...
Bump metascraper-author from 5.6.3 to 5.6.5 in /backend
2019-08-05 09:44:18 +02:00
mattwr18
0b864d6f10
Merge pull request #1179 from Human-Connection/dependabot/npm_and_yarn/webapp/nuxtjs/apollo-4.0.0-rc10
...
Bump @nuxtjs/apollo from 4.0.0-rc9 to 4.0.0-rc10 in /webapp
2019-08-05 09:43:52 +02:00
mattwr18
05036c2e23
Merge pull request #1178 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-title-5.6.5
...
Bump metascraper-title from 5.6.3 to 5.6.5 in /backend
2019-08-05 09:43:20 +02:00
mattwr18
c6c7996881
Merge pull request #1177 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-image-5.6.5
...
Bump metascraper-image from 5.6.3 to 5.6.5 in /backend
2019-08-05 09:42:55 +02:00
ogerly
aba21a9c70
changes and history template, english, german
2019-08-05 09:26:51 +02:00
dependabot-preview[bot]
f5608284ad
Bump @vue/cli-shared-utils from 3.9.0 to 3.10.0 in /webapp
...
Bumps [@vue/cli-shared-utils](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-shared-utils ) from 3.9.0 to 3.10.0.
- [Release notes](https://github.com/vuejs/vue-cli/releases )
- [Changelog](https://github.com/vuejs/vue-cli/blob/dev/CHANGELOG.md )
- [Commits](https://github.com/vuejs/vue-cli/commits/v3.10.0/packages/@vue/cli-shared-utils )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-05 04:28:12 +00:00
dependabot-preview[bot]
562e6dbce7
Bump metascraper-author from 5.6.3 to 5.6.5 in /backend
...
Bumps [metascraper-author](https://github.com/microlinkhq/metascraper ) from 5.6.3 to 5.6.5.
- [Release notes](https://github.com/microlinkhq/metascraper/releases )
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md )
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.6.3...v5.6.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-05 04:27:43 +00:00
dependabot-preview[bot]
d1cd26e05a
Bump @nuxtjs/apollo from 4.0.0-rc9 to 4.0.0-rc10 in /webapp
...
Bumps [@nuxtjs/apollo](https://github.com/nuxt-community/apollo-module ) from 4.0.0-rc9 to 4.0.0-rc10.
- [Release notes](https://github.com/nuxt-community/apollo-module/releases )
- [Commits](https://github.com/nuxt-community/apollo-module/compare/v4.0.0-rc.9...v4.0.0-rc.10 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-05 04:27:23 +00:00
dependabot-preview[bot]
8f4bdf3b48
Bump metascraper-title from 5.6.3 to 5.6.5 in /backend
...
Bumps [metascraper-title](https://github.com/microlinkhq/metascraper ) from 5.6.3 to 5.6.5.
- [Release notes](https://github.com/microlinkhq/metascraper/releases )
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md )
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.6.3...v5.6.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-05 04:27:02 +00:00
dependabot-preview[bot]
5a52343247
Bump metascraper-image from 5.6.3 to 5.6.5 in /backend
...
Bumps [metascraper-image](https://github.com/microlinkhq/metascraper ) from 5.6.3 to 5.6.5.
- [Release notes](https://github.com/microlinkhq/metascraper/releases )
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md )
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.6.3...v5.6.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-05 04:26:20 +00:00
Robert Schäfer
362027f5a8
Merge pull request #1152 from Human-Connection/dependabot/npm_and_yarn/backend/neode-0.3.0
...
Bump neode from 0.2.16 to 0.3.0 in /backend
2019-08-03 01:26:37 +02:00
Robert Schäfer
26958f6641
Explicitly disallow User.name == null in model
2019-08-03 00:43:18 +02:00
Robert Schäfer
210cd49230
Merge pull request #1170 from Human-Connection/fix-order-of-travis-comand
...
seed first and then reset
2019-08-02 23:43:52 +02:00
dependabot-preview[bot]
ab567663e9
Bump neode from 0.2.16 to 0.3.0 in /backend
...
Bumps [neode](https://github.com/adam-cowley/neode ) from 0.2.16 to 0.3.0.
- [Release notes](https://github.com/adam-cowley/neode/releases )
- [Commits](https://github.com/adam-cowley/neode/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-02 23:24:27 +02:00
Robert Schäfer
b797ce4b15
Follow @Tirokk 's suggestions:
...
* Add target="_blank" (on embeds only!)
* When pasting a link, the cursor position is moved after the paste
* Can't reproduce a link slipping into the embed in front of it
@Tirokk it is an unpleasant side efffect that mentions + hastags appear
differently on Edit+View. That's because they don't get parsed from
HTML, it's a one way, they are write only. So, when viewing content,
hashtags and mentions appear as plain links. I don't think I can do
anything about it.
Regarding some links not being embedded: Only those links that have an
oembed provider in this file:
f44d0f1f96/backend/src/schema/resolvers/embeds/providers.jsonhttp://backreaction.blogspot.com ` and `https://de.wikipedia.org/wiki/Yin_und_Yang `
have no embed provider and won't be embedded.
We would have to add oembed providers to this list if we wanted to embed those
links, too.
2019-08-02 23:18:10 +02:00
Robert Schäfer
effd220791
Merge pull request #1159 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-video-5.6.5
...
Bump metascraper-video from 5.6.3 to 5.6.5 in /backend
2019-08-02 21:34:39 +02:00
dependabot-preview[bot]
5a46bd3a78
Bump metascraper-video from 5.6.3 to 5.6.5 in /backend
...
Bumps [metascraper-video](https://github.com/microlinkhq/metascraper ) from 5.6.3 to 5.6.5.
- [Release notes](https://github.com/microlinkhq/metascraper/releases )
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md )
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.6.3...v5.6.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-02 14:34:40 +00:00
Robert Schäfer
a6ffe4e486
Merge pull request #1147 from Human-Connection/dependabot/npm_and_yarn/webapp/tiptap-1.24.0
...
Bump tiptap from 1.21.0 to 1.24.0 in /webapp
2019-08-02 16:32:08 +02:00
ogerly
a2993e4a52
seed first and then reset
2019-08-02 16:22:51 +02:00
Robert Schäfer
ffe6dc7736
Add MutationObserver to fix tests
...
Our build server failed because of frontend tests. However, all our
fullstack tests are passing... So maybe an issue in our test setup, not
reproducible in a real browser?
This commit:
ee4f132b0f (diff-0806c5f3fdae5e139222967601c7faca)
2019-08-02 14:32:06 +02:00
Robert Schäfer
a6aa974179
Merge remote-tracking branch 'origin/master' into storybook
2019-08-02 14:28:49 +02:00
Robert Schäfer
f1b28c83a0
Meld commits from master
2019-08-02 14:26:06 +02:00
