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
4,702 Commits 5 Branches 2 Tags
Commit Graph

1073 Commits

Author SHA1 Message Date
dependabot-preview[bot]
49fa0844f9
Bump @nuxtjs/style-resources from 0.1.2 to 1.0.0 in /webapp 
Bumps [@nuxtjs/style-resources](https://github.com/nuxt-community/style-resources-module) from 0.1.2 to 1.0.0.
- [Release notes](https://github.com/nuxt-community/style-resources-module/releases)
- [Changelog](https://github.com/nuxt-community/style-resources-module/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nuxt-community/style-resources-module/compare/v0.1.2...v1.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-08 04:29:26 +00:00
Robert Schäfer
1a21884081 Merge remote-tracking branch 'fatherJS/polish-locales' 2019-08-06 22:01:25 +02:00
Robert Schäfer
b2771a2708
Merge pull request #1171 from Human-Connection/deprecation-warning 
Fix depreciation warnings
 2019-08-06 16:39:29 +02:00
Alexander Friedland
9b74fd2480
Merge pull request #1174 from Human-Connection/A-1001-Page-for-Data-Privacy 
Add static page for data privacy
 2019-08-06 15:56:45 +02:00
Robert Schäfer
9b6d4deef5
Merge pull request #1194 from Human-Connection/dependabot/npm_and_yarn/webapp/date-fns-2.0.0-beta.4 
Bump date-fns from 2.0.0-beta.3 to 2.0.0-beta.4 in /webapp
 2019-08-06 15:40:46 +02:00
Piotr Kowalski
f64a8cd96f polish locales 
pl.json file corrected
 2019-08-06 15:37:04 +02:00
Robert Schäfer
1574fc0f56
Merge pull request #791 from Human-Connection/dependabot/npm_and_yarn/webapp/vue-sweetalert-icons-3.2.1 
Bump vue-sweetalert-icons from 3.2.0 to 3.2.1 in /webapp
 2019-08-06 14:37:36 +02:00
Robert Schäfer
27163b8d79 Install vue-sweetalert-icon globally 
Updating the package to `v4.0.0` still gives me this warning:
```
 WARN  Compiled with 1 warnings
 WARN  in ./components/PasswordReset/ChangePassword.vue?vue&type=script&lang=js&
"export 'SweetalertIcon' was not found in 'vue-sweetalert-icons'
```

According to this thread https://github.com/JorgenVatle/vue-sweetalert-icons/issues/3
I copy+pasted the example configuration:
https://github.com/JorgenVatle/vue-sweetalert-icons-preview/blob/master/nuxt.config.js
https://github.com/JorgenVatle/vue-sweetalert-icons-preview/blob/master/plugins/vue-sweetalert-icons.js

And now the compile warnings are gone. I'm going to ask the maintainer if the
local import is not possible with `v4.0.0` anymore.
 2019-08-06 11:03:12 +02:00
dependabot-preview[bot]
b43f1cdc92 Bump vue-sweetalert-icons from 3.2.0 to 3.2.1 in /webapp 
Bumps [vue-sweetalert-icons](https://github.com/JorgenVatle/vue-sweetalert-icons) from 3.2.0 to 3.2.1.
- [Release notes](https://github.com/JorgenVatle/vue-sweetalert-icons/releases)
- [Commits](https://github.com/JorgenVatle/vue-sweetalert-icons/compare/v3.2.0...v3.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-06 11:01:03 +02:00
Matt Rider
f7152703bc Upgrade node-fetch, use pageTransition 2019-08-06 08:23:32 +02:00
dependabot-preview[bot]
a87616b2b1
Bump @nuxtjs/dotenv from 1.3.0 to 1.4.0 in /webapp 
Bumps [@nuxtjs/dotenv](https://github.com/nuxt-community/dotenv-module) from 1.3.0 to 1.4.0.
- [Release notes](https://github.com/nuxt-community/dotenv-module/releases)
- [Changelog](https://github.com/nuxt-community/dotenv-module/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nuxt-community/dotenv-module/compare/v1.3.0...v1.4.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-06 05:52:40 +00:00
Wolfgang Huß
e8d5bed901
Merge pull request #952 from Human-Connection/storybook 
Storybook
 2019-08-06 07:50:09 +02:00
dependabot-preview[bot]
3e3617bb92
Bump date-fns from 2.0.0-beta.3 to 2.0.0-beta.4 in /webapp 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.0.0-beta.3 to 2.0.0-beta.4.
- [Release notes](https://github.com/date-fns/date-fns/releases)
- [Changelog](https://github.com/date-fns/date-fns/blob/master/CHANGELOG.md)
- [Commits](https://github.com/date-fns/date-fns/compare/v2.0.0-beta.3...v2.0.0-beta.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-06 04:23:27 +00: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
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
71707dc940 Implement a German-only static data-privacy page 
Okay, so the data privacy section needs to be updated @datenbrei:
We have two sections mentioning the Vimeo and Youtube plugins. After we
have the Embeds in place, we have many many more embedded code of 3rd
parties. Can we simply remove the two sections?

Also regarding the translations: I would wait until we have functional
components and we can write translations enriched by markup. Until then
I think it's sufficient to have German-only data privacy page.
 2019-08-06 00:14:41 +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
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
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
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]
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
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
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
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
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
dependabot-preview[bot]
bcab40e914
Bump tippy.js from 4.3.4 to 4.3.5 in /webapp 
Bumps [tippy.js](https://github.com/atomiks/tippyjs) from 4.3.4 to 4.3.5.
- [Release notes](https://github.com/atomiks/tippyjs/releases)
- [Commits](https://github.com/atomiks/tippyjs/compare/v4.3.4...v4.3.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-02 04:22:11 +00:00
Robert Schäfer
76dacd6e56 Updating two packages at a time 
Look, both dependency problems are related to each other:
https://github.com/nuxt-community/apollo-module/releases/tag/v4.0.0-rc.6
 2019-08-02 00:30:25 +02:00
Robert Schäfer
18e6843774 Just remove obscure, possibly non-functional code 2019-08-02 00:28:39 +02:00
Robert Schäfer
3d224512b1 Warn about non-functional errorHandler hook 
See: https://github.com/nuxt-community/apollo-module/pull/218#issuecomment-506939244
 2019-08-02 00:19:28 +02:00
Robert Schäfer
15559dedfc Fix breaking change in errorHandler 2019-08-02 00:10:14 +02:00
dependabot-preview[bot]
246a2f690f Bump @nuxtjs/apollo from 4.0.0-rc4.2 to 4.0.0-rc5 in /webapp 
Bumps [@nuxtjs/apollo](https://github.com/nuxt-community/apollo-module) from 4.0.0-rc4.2 to 4.0.0-rc5.
- [Release notes](https://github.com/nuxt-community/apollo-module/releases)
- [Commits](https://github.com/nuxt-community/apollo-module/compare/v4.0.0-rc.4.2...v4.0.0-rc.5)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-08-01 23:57:57 +02:00
Robert Schäfer
8064e9a790
Merge pull request #1150 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-jest-22.14.1 
Bump eslint-plugin-jest from 22.14.0 to 22.14.1 in /webapp
 2019-08-01 12:46:32 +02:00
Robert Schäfer
b6a59460bd Merge remote-tracking branch 'origin/master' into storybook 2019-08-01 12:22:09 +02:00
Robert Schäfer
c9e6d182ec Followed @mattwr18's suggestions here: 
https://github.com/Human-Connection/Human-Connection/pull/952#pullrequestreview-269406016
 2019-08-01 12:20:33 +02:00