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

5400 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
roschaefer
123c30b301 Fix "cannot read property id of null" in staging 2019-08-23 14:53:52 +02:00
Wolfgang Huß
be981c7b78 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 451-lokalise-unlocalised-texts-20190823 2019-08-23 14:52:44 +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
Robert Schäfer
b82743463e
Merge pull request #1368 from Human-Connection/1352-fix-update-post-resolver 
Fix UpdatePost resolver/validations
 2019-08-23 13:37:16 +02:00
Wolfgang Huß
66612801ce Change text of invite form 2019-08-23 13:35:22 +02:00
Robert Schäfer
9e3df325ab
Merge pull request #1370 from Human-Connection/test-es6-syntax 
Use ES6 syntax to avoid repetition
 2019-08-23 13:19:38 +02:00
ogerly
877b0ea77e Terms and conditions are handed over cleanly during registration 2019-08-23 13:17:54 +02:00
Matt Rider
79e6b56396 Use ES6 syntax to avoid repetition 2019-08-23 12:35:53 +02:00
Matt Rider
8555148e53 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1352-fix-update-post-resolver 2019-08-23 12:19:19 +02:00
Matt Rider
cd5e492569 Await relation be added 2019-08-23 12:18:53 +02:00
Robert Schäfer
f4f98a95c9
Merge pull request #1356 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-config-standard-14.0.1 
Bump eslint-config-standard from 14.0.0 to 14.0.1 in /backend
 2019-08-23 11:46:57 +02:00
ogerly
53532025d6 Fix translation add backend test case todo 2019-08-23 11:36:41 +02:00
Matt Rider
abbfc6d757 Remove commented out, unneeded code 2019-08-23 11:30:20 +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
0bb71cfbb3 Specs tests run through cleanly 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
2b634b8706 BUGFIX: 'email' attribute is the ID 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
Matt Rider
773779e5f1 Fix UpdatePost resolver/validations 2019-08-23 10:57:11 +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
728f3c22d3
Merge pull request #1354 from Human-Connection/dependabot/npm_and_yarn/cypress-cucumber-preprocessor-1.14.1 
Bump cypress-cucumber-preprocessor from 1.14.0 to 1.14.1
 2019-08-23 08:39:55 +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
28e2364af9
Merge pull request #1348 from Human-Connection/update_transitive_dependencies 
Update transitive dependencies
 2019-08-23 08:30:56 +02: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
mattwr18
8eeef1f68d
Merge pull request #1349 from Human-Connection/fix_expiration_dates 
Fix expiration dates of JWT and cookie
 2019-08-23 08:27:09 +02:00
dependabot-preview[bot]
417339b7cc
Bump eslint-config-standard from 14.0.0 to 14.0.1 in /backend 
Bumps [eslint-config-standard](https://github.com/standard/eslint-config-standard) from 14.0.0 to 14.0.1.
- [Release notes](https://github.com/standard/eslint-config-standard/releases)
- [Changelog](https://github.com/standard/eslint-config-standard/blob/master/CHANGELOG.md)
- [Commits](https://github.com/standard/eslint-config-standard/compare/v14.0.0...v14.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-23 04:34:42 +00:00
dependabot-preview[bot]
651eaa5ee6
Bump cypress-cucumber-preprocessor from 1.14.0 to 1.14.1 
Bumps [cypress-cucumber-preprocessor](https://github.com/TheBrainFamily/cypress-cucumber-preprocessor) from 1.14.0 to 1.14.1.
- [Release notes](https://github.com/TheBrainFamily/cypress-cucumber-preprocessor/releases)
- [Changelog](https://github.com/TheBrainFamily/cypress-cucumber-preprocessor/blob/master/CHANGELOG.md)
- [Commits](https://github.com/TheBrainFamily/cypress-cucumber-preprocessor/compare/v1.14.0...v1.14.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-23 04:32:25 +00:00
roschaefer
400b648ae9 Update transitive dependencies 
I see a security vulnerability warning on Github. I hope that updating
transitive dependencies will silence the security warning.

I did `rm yarn.lock` followed by `yarn install`.

EDIT: OK, I found out what's causing the security warning. With
```
yarn list lodash
├─ bitcore-lib@0.13.19
│  └─ lodash@3.10.1
└─ lodash@4.17.15
```
gives us the hint that the outdated lodash comes from `bitcore-lib`
which in turn is required by the extremely outdated `activitystrea.ms`
package. I tried to update it's dependencies in my fork without success.
If we ever touch the activity pub implementation we might have to
maintain this package ourselves.

FYI: @Mastercuber
 2019-08-23 01:55:31 +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
2386be5ef4
Merge pull request #1340 from Human-Connection/dependabot/npm_and_yarn/cypress-cucumber-preprocessor-1.14.0 
Bump cypress-cucumber-preprocessor from 1.13.1 to 1.14.0
 2019-08-22 12:12:07 +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
Robert Schäfer
5897adc42b
Merge pull request #1346 from Human-Connection/update-backend-yarn-lock 
Update backend/yarn.lock`
 2019-08-22 11:31:09 +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
mattwr18
628d5412fa
Merge pull request #1344 from Human-Connection/dependabot/docker/backend/node-12.9-alpine 
Bump node from 12.8-alpine to 12.9-alpine in /backend
 2019-08-22 10:30:36 +02:00
mattwr18
27e61e5c9d
Merge pull request #1345 from Human-Connection/dependabot/docker/webapp/node-12.9-alpine 
Bump node from 12.8-alpine to 12.9-alpine in /webapp
 2019-08-22 10:30:21 +02:00
mattwr18
c82c107d0e
Merge pull request #1342 from Human-Connection/dependabot/npm_and_yarn/webapp/vue/cli-shared-utils-3.11.0 
Bump @vue/cli-shared-utils from 3.10.0 to 3.11.0 in /webapp
 2019-08-22 10:29:27 +02:00
mattwr18
c4a6345122
Merge pull request #1341 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-plugin-jest-22.15.2 
Bump eslint-plugin-jest from 22.15.1 to 22.15.2 in /backend
 2019-08-22 10:28:43 +02:00
mattwr18
8877466e39
Merge pull request #1339 from Human-Connection/visual-feedback-if-no-results 
Visual feedback if filters lead to 0 results
 2019-08-22 10:21:10 +02:00
Matt Rider
9dc5dbf0e0 Update backend/yarn.lock` 2019-08-22 09:02:01 +02:00