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

4721 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
roschaefer
58a7e1ce2d Simplifycomponent, improve texts 
@ogerly there is a difference between read and confirm: You can read but
don't have to confirm the terms and conditions. Therefore it's quite
important that the user also confirms the terms and conditions.
 2019-08-14 16:38:35 +02:00
ogerly
397b41377a delete console.log 2019-08-14 14:31:47 +02:00
ogerly
8307c4f48f Merge branch 'A-1208-Registration-without-user-condition-confirmation' of https://github.com/Human-Connection/Human-Connection into A-1208-Registration-without-user-condition-confirmation 2019-08-14 14:29:12 +02:00
ogerly
a5f448036c Suggestions implemented II 2019-08-14 14:27:44 +02:00
Robert Schäfer
34e3f7efd7
Delete package-lock.json 
This file is generated by `npm` but we use `yarn`. It is not recommended to use multiple package managers.
 2019-08-14 14:24:43 +02:00
ogerly
b3ab6e1b43 Suggestions implemented II 2019-08-14 14:12:55 +02:00
ogerly
bd27876d9c check test 2 2019-08-13 08:36:09 +02:00
ogerly
d545e84ce9 edit spec green 2019-08-09 07:27:38 +02:00
ogerly
f2dcb54d05 edit spec 2019-08-09 07:23:47 +02:00
ogerly
d1830f5bed add ceckbox, confirmed terms of use 2019-08-08 17:46:04 +02:00
Alexander Friedland
f7b7091d23
Merge pull request #1220 from Human-Connection/roschaefer-patch-1 
Fix expired discord link
 2019-08-08 13:56:59 +02:00
Robert Schäfer
276b4a3a29
Merge pull request #1210 from Human-Connection/dependabot/npm_and_yarn/webapp/tiptap-extensions-1.26.1 
Bump tiptap-extensions from 1.26.0 to 1.26.1 in /webapp
 2019-08-08 11:20:34 +02:00
Robert Schäfer
566651fea9
Merge pull request #1217 from Human-Connection/fix-vue-console-errors-sweetalert-icons 
Stub sweetalert-icon in tests which use
 2019-08-08 11:16:29 +02:00
Robert Schäfer
e1ba51a3ec
Merge pull request #1218 from Human-Connection/fix-mentions-in-seeds 
Add data-mention-id to seeds mentions
 2019-08-08 10:54:18 +02:00
Robert Schäfer
d762cdc2dc
Merge pull request #1213 from Human-Connection/dependabot/npm_and_yarn/webapp/nuxtjs/style-resources-1.0.0 
Bump @nuxtjs/style-resources from 0.1.2 to 1.0.0 in /webapp
 2019-08-08 10:53:34 +02:00
Robert Schäfer
c4a77fbea4 Update badge link too 2019-08-08 10:51:06 +02:00
Robert Schäfer
51639f3af4
Fix expired discord link 2019-08-08 10:43:54 +02:00
Robert Schäfer
700717011d
Merge pull request #1211 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-plugin-jest-22.15.0 
Bump eslint-plugin-jest from 22.14.1 to 22.15.0 in /backend
 2019-08-08 10:27:03 +02:00
Matt Rider
b6975bde89 Add data-mention-id to seeds mentions 2019-08-08 10:07:57 +02:00
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
dependabot-preview[bot]
34a4db78f6
Bump eslint-plugin-jest from 22.14.1 to 22.15.0 in /backend 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.14.1 to 22.15.0.
- [Release notes](https://github.com/jest-community/eslint-plugin-jest/releases)
- [Changelog](https://github.com/jest-community/eslint-plugin-jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jest-community/eslint-plugin-jest/compare/v22.14.1...v22.15.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-08 04:26:59 +00:00
dependabot-preview[bot]
49c8fdb74e
Bump tiptap-extensions from 1.26.0 to 1.26.1 in /webapp 
Bumps [tiptap-extensions](https://github.com/scrumpy/tiptap) from 1.26.0 to 1.26.1.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap-extensions@1.26.0...tiptap-extensions@1.26.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-08 04:26:48 +00:00
Matt Rider
faa4148858 Stub sweetalert-icon in tests which use 2019-08-07 15:20:36 +02: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
Robert Schäfer
d80a1adf83
Merge pull request #1195 from Human-Connection/dependabot/npm_and_yarn/backend/date-fns-2.0.0-beta.4 
Bump date-fns from 2.0.0-beta.3 to 2.0.0-beta.4 in /backend
 2019-08-06 15:40:30 +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
3f3c85a694
Merge pull request #1196 from Human-Connection/dependabot/npm_and_yarn/webapp/nuxtjs/dotenv-1.4.0 
Bump @nuxtjs/dotenv from 1.3.0 to 1.4.0 in /webapp
 2019-08-06 12:50:59 +02:00
Robert Schäfer
1032a399bb
Merge pull request #1193 from Human-Connection/dependabot/npm_and_yarn/backend/neode-0.3.1 
Bump neode from 0.3.0 to 0.3.1 in /backend
 2019-08-06 12:50:34 +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
dependabot-preview[bot]
5a15e371d1
Bump neode from 0.3.0 to 0.3.1 in /backend 
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 05:52:14 +00:00
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]
8080e38d1b
Bump date-fns from 2.0.0-beta.3 to 2.0.0-beta.4 in /backend 
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:35 +00: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
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
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