IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2025-12-13 07:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,888 Commits 5 Branches 2 Tags
Commit Graph

5888 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matt Rider
32796bfa0d Fix failing build 2019-08-05 19:08:53 +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
Matt Rider
1cd3ba907b Set vuex state to reset active button 
- when a user clicks on the logo or changes pages, the filter is reset, but the active button didn't update
- still a bug with the active categoryIds since it's not so easy to set the state of an array in vuex
- dry out code for toggleFilters
- fix bug where user clicks on filter by users followed, then filters for categories of those users, then clicks to remove category filter
 2019-08-05 14:39:45 +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
Wolfgang Huß
22b9bf77fa Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1017-send-out-notifications-on-create-omment 
# Conflicts:
#	backend/src/schema/resolvers/notifications.spec.js
 2019-08-05 10:15:20 +02:00
Matt Rider
295b7e7769 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 384-emotions-on-posts 2019-08-05 09:50:54 +02:00
Matt Rider
97ff2e9457 Make emotionsArray a const, fix lint 2019-08-05 09:50:25 +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
4b459c9974 Fix depreciation warnings 
I couldn't see any difference in using `transition`, `pageTransition` or
neither of those, so I decided to disable the configuration completely.
 2019-08-03 01:29:40 +02: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.json
...will be embedded. Your example `http://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
Matt Rider
d1d82a0051 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 384-emotions-on-posts 2019-08-02 16:55:54 +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
Matt Rider
751bbbf889 Make mobile responsive 2019-08-02 16:10:19 +02:00
Matt Rider
ec7a5865f7 Update tests, showFilterPostsDropdown only on route 2019-08-02 15:41:19 +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)
adds MutationObserver to their test setup. Adding it to our test suites
that touch the `editor` directly fixes our tests, too!

From what I can tell is that prosemirror is calling
`this.observer.takeRecords()`. Probably `tiptap` updated its
dependencies at some point and that's where `this.observer` was
introduced? Hard to tell. It really looks just like an issue only
present in test environments, so I think it's safe not to investigate
any further.
 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
dependabot-preview[bot]
0663aa5904 Bump tiptap from 1.21.0 to 1.24.0 in /webapp 
Bumps [tiptap](https://github.com/scrumpy/tiptap) from 1.21.0 to 1.24.0.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap@1.21.0...tiptap@1.24.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-02 13:43:08 +02:00
Matt Rider
afb9dbe241 Move filter by followers functionality to filter dropdown 2019-08-02 13:02:12 +02:00
Robert Schäfer
80833b847b
Merge pull request #1160 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-date-5.6.5 
Bump metascraper-date from 5.6.3 to 5.6.5 in /backend
 2019-08-02 12:58:20 +02:00
Robert Schäfer
a0717795d5
Merge pull request #1163 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-publisher-5.6.5 
Bump metascraper-publisher from 5.6.3 to 5.6.5 in /backend
 2019-08-02 12:58:11 +02:00
Matt Rider
3da986518e Write component tests, refactor 2019-08-02 10:52:36 +02:00
dependabot-preview[bot]
6c3a9878c7
Bump metascraper-date from 5.6.3 to 5.6.5 in /backend 
Bumps [metascraper-date](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 08:26:00 +00:00
dependabot-preview[bot]
87efc0ec56
Bump metascraper-publisher from 5.6.3 to 5.6.5 in /backend 
Bumps [metascraper-publisher](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 08:26:00 +00:00
Robert Schäfer
fe91582b3e
Merge pull request #1161 from Human-Connection/dependabot/npm_and_yarn/webapp/tippy.js-4.3.5 
Bump tippy.js from 4.3.4 to 4.3.5 in /webapp
 2019-08-02 10:25:05 +02:00
Robert Schäfer
6a84876251
Merge pull request #1158 from Human-Connection/dependabot/npm_and_yarn/cypress-file-upload-3.3.3 
Bump cypress-file-upload from 3.3.2 to 3.3.3
 2019-08-02 10:23:53 +02:00
Robert Schäfer
cc6583f1f9
Merge pull request #1162 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-description-5.6.5 
Bump metascraper-description from 5.6.3 to 5.6.5 in /backend
 2019-08-02 10:22:35 +02:00
Robert Schäfer
68491446c2
Merge pull request #1164 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-soundcloud-5.6.5 
Bump metascraper-soundcloud from 5.6.3 to 5.6.5 in /backend
 2019-08-02 10:22:07 +02:00
Robert Schäfer
25927f47d5
Merge pull request #1165 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-url-5.6.5 
Bump metascraper-url from 5.6.3 to 5.6.5 in /backend
 2019-08-02 10:21:50 +02:00
Robert Schäfer
3974025e79
Merge pull request #1166 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-audio-5.6.5 
Bump metascraper-audio from 5.6.3 to 5.6.5 in /backend
 2019-08-02 10:21:35 +02:00