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

5366 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mattwr18
4ca84ee04a
Merge pull request #1334 from Human-Connection/C-1187-terms-and-conditions-confirmed-function 
Check if user has agreed to the current terms and conditions
 2019-09-04 20:55:09 +02:00
Wolfgang Huß
7bdc6b52d2 Fixed Cypress tests 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
Co-Authored-By: ogerly <fridolin@tutanota.com>
 2019-09-04 20:19:45 +02:00
Robert Schäfer
b19601122b
Merge pull request #1475 from Human-Connection/fix-more-info-posts 
Fix related posts section in 'More Info'
 2019-09-04 19:41:26 +02:00
mattwr18
b04649e1ee Remove duplicate code 
- there was the same methods in user.js and user_management.js except
that the login was not filtering out deleted users, so it was failing
one test. Reverted changes back to the user.js from the master branch...
added back our changes.

Co-authored-by: Tirokk <wolle.huss@pjannto.com>
Co-authored-by: ogerly <fridolin@tutanota.com>
 2019-09-04 19:31:43 +02:00
mattwr18
c92ba35db6 Remove trailing curly brace, update test 
Co-authored-by: Tirokk <wolle.huss@pjannto.com>
Co-authored-by: ogerly <fridolin@tutanota.com>
 2019-09-04 18:41:48 +02:00
mattwr18
2bf8247ddd Merge branch 'master' of github.com:Human-Connection/Human-Connection into C-1187-terms-and-conditions-confirmed-function 2019-09-04 18:24:02 +02:00
Alina Beck
d1beed50d7 use masonry grid for related posts 2019-09-04 16:51:08 +01:00
mattwr18
d81bbec00a
Merge pull request #1399 from Human-Connection/1395-hashtags-imported-with-not-allowed-chars 
🍰 Correct the import of tags from the Alpha and refactor editor hashtags
 2019-09-04 17:05:12 +02:00
mattwr18
32388549a0 Revert use of variables in cql file 
- breaks the import functionality
 2019-09-04 16:24:48 +02:00
mattwr18
6b9bb4dfbb Merge branch '1395-hashtags-imported-with-not-allowed-chars' of github.com:Human-Connection/Human-Connection into 1395-hashtags-imported-with-not-allowed-chars 2019-09-04 16:19:01 +02:00
Wolfgang Huß
5d69a6fa76 Implemented "wait-on": "~3.3.0" again 
Don't know why this was removed!?
 2019-09-04 15:56:28 +02:00
Wolfgang Huß
0df086e07f Rename variables 2019-09-04 15:38:28 +02:00
mattwr18
538b2b77de Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1395-hashtags-imported-with-not-allowed-chars 2019-09-04 14:21:12 +02:00
Robert Schäfer
a7042c5fbc
Merge pull request #1461 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-config-prettier-6.2.0 
Bump eslint-config-prettier from 6.1.0 to 6.2.0 in /webapp
 2019-09-04 14:12:05 +02:00
Robert Schäfer
1c9d741136
Merge pull request #1458 from Human-Connection/dependabot/npm_and_yarn/webapp/nodemon-1.19.2 
Bump nodemon from 1.19.1 to 1.19.2 in /webapp
 2019-09-04 14:11:42 +02:00
Robert Schäfer
acd1c9604b
Merge pull request #1459 from Human-Connection/dependabot/npm_and_yarn/backend/nodemon-1.19.2 
Bump nodemon from 1.19.1 to 1.19.2 in /backend
 2019-09-04 14:11:25 +02:00
Robert Schäfer
1b0f01fab5
Merge pull request #1460 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-config-prettier-6.2.0 
Bump eslint-config-prettier from 6.1.0 to 6.2.0 in /backend
 2019-09-04 14:11:10 +02:00
Wolfgang Huß
0a86cb6c4d Merge branch '1395-hashtags-imported-with-not-allowed-chars' of https://github.com/Human-Connection/Human-Connection into 1395-hashtags-imported-with-not-allowed-chars 2019-09-04 14:01:28 +02:00
Wolfgang Huß
bf511940ad Merge branch '1395-hashtags-imported-with-not-allowed-chars' of https://github.com/Human-Connection/Human-Connection into 1395-hashtags-imported-with-not-allowed-chars 2019-09-04 13:59:04 +02:00
Wolfgang Huß
0037fc90de Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1395-hashtags-imported-with-not-allowed-chars 2019-09-04 13:52:47 +02:00
Wolfgang Huß
fd457e3c3c Refactor backend test to test some unicode letters are excepted 2019-09-04 13:51:23 +02:00
dependabot-preview[bot]
58d2a8e996
Bump nodemon from 1.19.1 to 1.19.2 in /webapp 
Bumps [nodemon](https://github.com/remy/nodemon) from 1.19.1 to 1.19.2.
- [Release notes](https://github.com/remy/nodemon/releases)
- [Commits](https://github.com/remy/nodemon/compare/v1.19.1...v1.19.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-04 09:54:56 +00:00
dependabot-preview[bot]
a175bb0f71
Bump nodemon from 1.19.1 to 1.19.2 in /backend 
Bumps [nodemon](https://github.com/remy/nodemon) from 1.19.1 to 1.19.2.
- [Release notes](https://github.com/remy/nodemon/releases)
- [Commits](https://github.com/remy/nodemon/compare/v1.19.1...v1.19.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-04 09:54:17 +00:00
dependabot-preview[bot]
4decb2c60a
Bump eslint-config-prettier from 6.1.0 to 6.2.0 in /webapp 
Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) from 6.1.0 to 6.2.0.
- [Release notes](https://github.com/prettier/eslint-config-prettier/releases)
- [Changelog](https://github.com/prettier/eslint-config-prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/eslint-config-prettier/compare/v6.1.0...v6.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-04 09:53:48 +00:00
dependabot-preview[bot]
628f66f290
Bump eslint-config-prettier from 6.1.0 to 6.2.0 in /backend 
Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) from 6.1.0 to 6.2.0.
- [Release notes](https://github.com/prettier/eslint-config-prettier/releases)
- [Changelog](https://github.com/prettier/eslint-config-prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/eslint-config-prettier/compare/v6.1.0...v6.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-04 09:53:37 +00:00
mattwr18
497cd8da0d
Merge pull request #1464 from Human-Connection/fix_token_expired_in_spec 
Encode the bearer token instead of hard-coding it
 2019-09-04 11:47:00 +02:00
roschaefer
ebf14cbe5c Encode the bearer token instead of hard-coding it 
That should fix our build server.
 2019-09-04 11:19:18 +02:00
mattwr18
25bd96eedf Remove package-lock.json 
- we are using yarn as a package manager
 2019-09-04 10:58:33 +02:00
mattwr18
b3964a1439 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1395-hashtags-imported-with-not-allowed-chars 2019-09-04 10:46:44 +02:00
mattwr18
b7b2e6837d Remove unused notifications relationship from User.gql 2019-09-04 10:28:56 +02:00
ogerly
948982682d fails, fails, fails 2019-09-04 10:09:20 +02:00
mattwr18
fdee7efa03 Fix lint 2019-09-04 08:12:11 +02:00
ogerly
643b931167 Merge branch 'C-1187-terms-and-conditions-confirmed-function' of https://github.com/Human-Connection/Human-Connection into C-1187-terms-and-conditions-confirmed-function 2019-09-04 07:04:17 +02:00
ogerly
c64ff67a55 Fixed constant for terms and conditions created in folder for constant 2019-09-04 07:03:56 +02:00
Alexander Friedland
e618ff005d
Merge branch 'master' into C-1187-terms-and-conditions-confirmed-function 2019-09-04 06:42:40 +02:00
Robert Schäfer
e6e4a6d695
Merge pull request #1444 from Human-Connection/dependabot/npm_and_yarn/webapp/cross-env-5.2.1 
Bump cross-env from 5.2.0 to 5.2.1 in /webapp
 2019-09-04 01:24:48 +02:00
Robert Schäfer
a4dc497585
Merge pull request #1448 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-testing-2.9.3 
Bump apollo-server-testing from 2.9.1 to 2.9.3 in /backend
 2019-09-04 01:24:31 +02:00
Robert Schäfer
e96008c48a
Merge pull request #1450 from Human-Connection/dependabot/npm_and_yarn/backend/cross-env-5.2.1 
Bump cross-env from 5.2.0 to 5.2.1 in /backend
 2019-09-04 01:23:58 +02:00
Robert Schäfer
f52e338a35
Merge pull request #1442 from Human-Connection/dependabot/npm_and_yarn/cross-env-5.2.1 
Bump cross-env from 5.2.0 to 5.2.1
 2019-09-04 01:23:41 +02:00
dependabot-preview[bot]
7bb52343f1
Bump cross-env from 5.2.0 to 5.2.1 in /webapp 
Bumps [cross-env](https://github.com/kentcdodds/cross-env) from 5.2.0 to 5.2.1.
- [Release notes](https://github.com/kentcdodds/cross-env/releases)
- [Changelog](https://github.com/kentcdodds/cross-env/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kentcdodds/cross-env/compare/v5.2.0...v5.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-03 22:02:27 +00:00
dependabot-preview[bot]
125a1c8f63
Bump cross-env from 5.2.0 to 5.2.1 in /backend 
Bumps [cross-env](https://github.com/kentcdodds/cross-env) from 5.2.0 to 5.2.1.
- [Release notes](https://github.com/kentcdodds/cross-env/releases)
- [Changelog](https://github.com/kentcdodds/cross-env/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kentcdodds/cross-env/compare/v5.2.0...v5.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-03 22:01:57 +00:00
dependabot-preview[bot]
c53cad9bc3
Bump cross-env from 5.2.0 to 5.2.1 
Bumps [cross-env](https://github.com/kentcdodds/cross-env) from 5.2.0 to 5.2.1.
- [Release notes](https://github.com/kentcdodds/cross-env/releases)
- [Changelog](https://github.com/kentcdodds/cross-env/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kentcdodds/cross-env/compare/v5.2.0...v5.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-03 22:01:46 +00:00
mattwr18
290bdf5ff4
Merge pull request #1440 from Human-Connection/1414-soft_delete 
1414 Implement soft delete
 2019-09-03 23:59:52 +02:00
roschaefer
af8475f28e Avoid unavailable posts in relatedContributions 2019-09-03 23:19:55 +02:00
roschaefer
5f14b4c45f Fix lint 2019-09-03 23:19:55 +02:00
roschaefer
2a544376a3 Delete post.image 
In contrast to the other errors, it's better to send `null` for an
image. That way, the browser won't even try to load that url.
 2019-09-03 23:19:55 +02:00
mattwr18
9bb0884f89 Follow @alina-beck's PR suggestions 
- save regex to descriptive variables
 2019-09-03 22:10:02 +02:00
roschaefer
99dd6ea20a Centralize fragments, fix @mattwr18's bugs 
Most of those bugs weren't even introduced in this PR, e.g. the missing
`this.$i18n` for the comments mutations.
 2019-09-03 21:28:29 +02:00
roschaefer
64268a1f3c Add locations to seeds, fix shoutedByCurrentUser 2019-09-03 21:28:29 +02:00
roschaefer
00454c874c Remove read-only attributes from posts mutations 
For the comments, the fix is not that easy: They are still using
`neo4j-graphql-js` in the resolvers. And that library needs the input
params for the query builder.

See: https://github.com/Human-Connection/Human-Connection/issues/1454
 2019-09-03 21:28:29 +02:00