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

1336 Commits

Author SHA1 Message Date
ogerly
ee03f0e902 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into C-1187-terms-and-conditions-confirmed-function 2019-08-28 14:21:46 +02:00
dependabot-preview[bot]
acd9dbf6b5
[Security] Bump mixin-deep from 1.3.1 to 1.3.2 in /webapp 
Bumps [mixin-deep](https://github.com/jonschlinkert/mixin-deep) from 1.3.1 to 1.3.2. **This update includes a security fix.**
- [Release notes](https://github.com/jonschlinkert/mixin-deep/releases)
- [Commits](https://github.com/jonschlinkert/mixin-deep/compare/1.3.1...1.3.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-27 18:17:05 +00:00
Robert Schäfer
0bf0ca0b8d
Merge pull request #1398 from Human-Connection/fix-deprecation-warnings 
Update to use <client-only> instead of <no-ssr>
 2019-08-27 16:00:09 +02:00
Robert Schäfer
8a729122c3
Merge pull request #1270 from Human-Connection/1062-notification-about-comment-on-post 
🍰 1062 notification about comment on post
 2019-08-27 15:59:46 +02:00
mattwr18
fbf2f05e00
Merge pull request #1381 from Human-Connection/dependabot/npm_and_yarn/webapp/date-fns-2.0.1 
Bump date-fns from 2.0.0 to 2.0.1 in /webapp
 2019-08-27 15:20:39 +02:00
Matt Rider
6976336ef0 Merge branch 'master' of github.com:Human-Connection/Human-Connection into fix-deprecation-warnings 2019-08-27 09:20:27 +02:00
Matt Rider
c8b5779f87 Upgrade nuxt 
- for some reason there were two versions of vue-client-only in the yarn.lock, one old version which was blocking it from passing the build, and a newer one based on the use of <client-only>, upgrading nuxt sorted out the yarn.lock
 2019-08-27 09:16:41 +02:00
mattwr18
fa7d76b316
Merge pull request #1404 from Human-Connection/dependabot/npm_and_yarn/webapp/nuxtjs/apollo-4.0.0-rc12 
Bump @nuxtjs/apollo from 4.0.0-rc11 to 4.0.0-rc12 in /webapp
 2019-08-27 09:10:37 +02:00
dependabot-preview[bot]
8b3dc2052a
Bump date-fns from 2.0.0 to 2.0.1 in /webapp 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.0.0 to 2.0.1.
- [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...v2.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-27 07:07:59 +00:00
mattwr18
3b08dbe939
Merge pull request #1386 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-loader-3.0.0 
Bump eslint-loader from 2.2.1 to 3.0.0 in /webapp
 2019-08-27 09:07:25 +02:00
mattwr18
27871d16f6
Merge pull request #1401 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-utils-1.4.2 
[Security] Bump eslint-utils from 1.3.1 to 1.4.2 in /webapp
 2019-08-27 08:34:29 +02:00
dependabot-preview[bot]
f852da7273
Bump @nuxtjs/apollo from 4.0.0-rc11 to 4.0.0-rc12 in /webapp 
Bumps [@nuxtjs/apollo](https://github.com/nuxt-community/apollo-module) from 4.0.0-rc11 to 4.0.0-rc12.
- [Release notes](https://github.com/nuxt-community/apollo-module/releases)
- [Commits](https://github.com/nuxt-community/apollo-module/compare/v4.0.0-rc.11...v4.0.0-rc.12)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-27 04:22:50 +00:00
mattwr18
4023849600
Merge pull request #1376 from Human-Connection/fix-infinite-loading 
Fix infinite-loading infinitely loading
 2019-08-26 21:44:19 +02:00
dependabot-preview[bot]
ab79f3c633
[Security] Bump eslint-utils from 1.3.1 to 1.4.2 in /webapp 
Bumps [eslint-utils](https://github.com/mysticatea/eslint-utils) from 1.3.1 to 1.4.2. **This update includes a security fix.**
- [Release notes](https://github.com/mysticatea/eslint-utils/releases)
- [Commits](https://github.com/mysticatea/eslint-utils/compare/v1.3.1...v1.4.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-26 18:21:42 +00:00
Matt Rider
2af4151918 Update to use <client-only> instead of <no-ssr> 2019-08-26 17:09:24 +02:00
roschaefer
8b31cefebe If this commit fixes the build, docs are broken 
The latest commit has some cypress tests failing when only a few posts
are visible on the index page. If this explicit default fixes the tests,
the documentation cannot be quite right in saying that it's the default.

FYI: @mattwr18
 2019-08-26 16:58:11 +02:00
Wolfgang Huß
7498d88a44 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1062-notification-about-comment-on-post 2019-08-26 15:44:32 +02:00
roschaefer
194665bf2e Remove explicit default, see if cypress tests fail 2019-08-26 13:56:32 +02:00
mattwr18
e89a74f1c6
Merge pull request #1383 from Human-Connection/dependabot/npm_and_yarn/webapp/babel-eslint-10.0.3 
Bump babel-eslint from 10.0.2 to 10.0.3 in /webapp
 2019-08-26 13:43:42 +02:00
roschaefer
c9b5f8e8d3 Fix infinite-loading infinitely loading 2019-08-26 13:39:01 +02:00
mattwr18
6e47011970
Merge pull request #1379 from Human-Connection/dependabot/npm_and_yarn/webapp/graphql-14.5.3 
Bump graphql from 14.5.0 to 14.5.3 in /webapp
 2019-08-26 13:36:46 +02:00
dependabot-preview[bot]
881277270d
Bump eslint-loader from 2.2.1 to 3.0.0 in /webapp 
Bumps [eslint-loader](https://github.com/webpack-contrib/eslint-loader) from 2.2.1 to 3.0.0.
- [Release notes](https://github.com/webpack-contrib/eslint-loader/releases)
- [Changelog](https://github.com/webpack-contrib/eslint-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/eslint-loader/compare/v2.2.1...v3.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-26 04:26:48 +00:00
dependabot-preview[bot]
7f94273e61
Bump babel-eslint from 10.0.2 to 10.0.3 in /webapp 
Bumps [babel-eslint](https://github.com/babel/babel-eslint) from 10.0.2 to 10.0.3.
- [Release notes](https://github.com/babel/babel-eslint/releases)
- [Commits](https://github.com/babel/babel-eslint/compare/v10.0.2...v10.0.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-26 04:25:44 +00:00
dependabot-preview[bot]
d4f43b6264
Bump graphql from 14.5.0 to 14.5.3 in /webapp 
Bumps [graphql](https://github.com/graphql/graphql-js) from 14.5.0 to 14.5.3.
- [Release notes](https://github.com/graphql/graphql-js/releases)
- [Commits](https://github.com/graphql/graphql-js/compare/v14.5.0...v14.5.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-26 04:24:00 +00:00
roschaefer
894a59ecc7 Fix flickering create-button 2019-08-23 20:05:08 +02:00
ogerly
63549c1101 Tests for create users with terms and conditions are ok 2019-08-23 19:37:23 +02:00
Wolfgang Huß
df4f0627b5 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1062-notification-about-comment-on-post 
# Conflicts:
#	backend/src/middleware/index.js
 2019-08-23 15:31:48 +02:00
Wolfgang Huß
a10e2e3a9b Make user profile follow(ed) lists exceeds 5 users and X more better translatable 
Slite adjustment of `more` to `more …`
 2019-08-23 14:37:52 +02:00
Wolfgang Huß
66612801ce Change text of invite form 2019-08-23 13:35:22 +02:00
ogerly
877b0ea77e Terms and conditions are handed over cleanly during registration 2019-08-23 13:17:54 +02:00
ogerly
53532025d6 Fix translation add backend test case todo 2019-08-23 11:36:41 +02:00
ogerly
f34cef22f2 Graphical changes 2019-08-23 11:02:24 +02:00
ogerly
54750e39b8 Missing translations added + code checked with Lint 2019-08-23 11:02:24 +02:00
ogerly
c00f281e6c Translations and style adapted 2019-08-23 11:02:24 +02:00
roschaefer
036e2605b7 Implement accept terms and conditions flow 2019-08-23 11:02:24 +02:00
ogerly
592a682bd7 Temporary commit 2019-08-23 11:02:24 +02:00
ogerly
36ce6361ec Alle Daten übernommen die für serverseitig rendern nötig sind 2019-08-23 11:02:24 +02:00
Robert Schäfer
fb8468dc8b
Merge pull request #1358 from Human-Connection/dependabot/npm_and_yarn/webapp/graphql-14.5.0 
Bump graphql from 14.4.2 to 14.5.0 in /webapp
 2019-08-23 10:52:36 +02:00
mattwr18
239e4f92d7
Merge pull request #1366 from Human-Connection/update_vue_izitoast 
Update vue-izitoast after they released v1.2.0!
 2019-08-23 10:46:49 +02:00
mattwr18
6e0f77fc5a
Merge pull request #1338 from Human-Connection/1335-filter_bubble_indicator 
Implement visual feedback if filter is active
 2019-08-23 08:38:42 +02:00
roschaefer
3123041726 Update vue-izitoast after they released v1.2.0! 
See https://github.com/arthurvasconcelos/vue-izitoast/pull/20#issuecomment-524131102
 2019-08-23 08:35:04 +02:00
dependabot-preview[bot]
6550bd33ff
Bump graphql from 14.4.2 to 14.5.0 in /webapp 
Bumps [graphql](https://github.com/graphql/graphql-js) from 14.4.2 to 14.5.0.
- [Release notes](https://github.com/graphql/graphql-js/releases)
- [Commits](https://github.com/graphql/graphql-js/compare/v14.4.2...v14.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-23 06:33:35 +00:00
mattwr18
d5cbc4a07a
Merge pull request #1350 from Human-Connection/fix_contributions_count 
Fix post count always showing 0
 2019-08-23 08:27:43 +02:00
roschaefer
37c12f6681 Fix post count always showing 0 2019-08-23 00:36:47 +02:00
roschaefer
62c8d34079 Fix expiration dates of JWT and cookie 
This won't fix the bug that can happen in `nuxtServerInit`. However,
according to the docs, we accepted JWT which was valid for 1000 days and
our cookie was valid for 3 days - completely weird.

See:
https://github.com/auth0/node-jsonwebtoken
https://github.com/nuxt-community/apollo-module
 2019-08-22 22:29:50 +02:00
Wolfgang Huß
8e893b2c5d Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1062-notification-about-comment-on-post 2019-08-22 15:28:49 +02:00
Wolfgang Huß
793485c0fc Write frontend tests 2019-08-22 15:20:40 +02:00
Robert Schäfer
b37caf1bed
Merge pull request #1343 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-jest-22.15.2 
Bump eslint-plugin-jest from 22.15.1 to 22.15.2 in /webapp
 2019-08-22 12:11:47 +02:00
Wolfgang Huß
04fe6b0a8c Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1062-notification-about-comment-on-post 
# Conflicts:
#	backend/src/middleware/handleNotifications/handleNotificationsMiddleware.spec.js

Refactored there tests a little
 2019-08-22 11:02:10 +02:00
dependabot-preview[bot]
f76b907268
Bump eslint-plugin-jest from 22.15.1 to 22.15.2 in /webapp 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.15.1 to 22.15.2.
- [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.15.1...v22.15.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-22 08:31:24 +00:00