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

3947 Commits

Author SHA1 Message Date
Matt Rider
1e54b8a887 Merge branch 'master' of github.com:Human-Connection/Human-Connection into dependabot/npm_and_yarn/backend/apollo-server-2.6.9 2019-07-12 07:33:36 -03:00
mattwr18
bd77c8e450
Merge pull request #1029 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-testing-2.6.9 
Bump apollo-server-testing from 2.6.8 to 2.6.9 in /backend
 2019-07-12 07:30:46 -03:00
dependabot-preview[bot]
2b5223204f
Bump apollo-server from 2.6.8 to 2.6.9 in /backend 
Bumps [apollo-server](https://github.com/apollographql/apollo-server) from 2.6.8 to 2.6.9.
- [Release notes](https://github.com/apollographql/apollo-server/releases)
- [Changelog](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-server/compare/apollo-server@2.6.8...apollo-server@2.6.9)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-12 04:31:36 +00:00
dependabot-preview[bot]
48086ab7f8
Bump apollo-server-testing from 2.6.8 to 2.6.9 in /backend 
Bumps [apollo-server-testing](https://github.com/apollographql/apollo-server) from 2.6.8 to 2.6.9.
- [Release notes](https://github.com/apollographql/apollo-server/releases)
- [Changelog](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-server/compare/apollo-server-testing@2.6.8...apollo-server-testing@2.6.9)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-12 04:30:02 +00:00
dependabot-preview[bot]
f518da5336
Bump wait-on from 3.2.0 to 3.3.0 in /backend 
Bumps [wait-on](https://github.com/jeffbski/wait-on) from 3.2.0 to 3.3.0.
- [Release notes](https://github.com/jeffbski/wait-on/releases)
- [Commits](https://github.com/jeffbski/wait-on/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-12 04:29:04 +00:00
Robert Schäfer
fe235ab603
Merge pull request #1027 from Human-Connection/dependabot/npm_and_yarn/backend/lodash-4.17.14 
Bump lodash from 4.17.13 to 4.17.14 in /backend
 2019-07-11 12:30:24 +02:00
Robert Schäfer
e2eba389cc
Merge pull request #944 from Human-Connection/2019/kw27/data_import_emotions 
🍰 2019/kw27/data_import_emotions
 2019-07-11 12:27:48 +02:00
dependabot-preview[bot]
fb26c7aac8
Bump lodash from 4.17.13 to 4.17.14 in /backend 
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.13 to 4.17.14.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.13...4.17.14)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-11 06:27:18 +00:00
dependabot-preview[bot]
b2c3382a42
[Security] Bump lodash.mergewith from 4.6.1 to 4.6.2 in /backend 
Bumps [lodash.mergewith](https://github.com/lodash/lodash) from 4.6.1 to 4.6.2. **This update includes security fixes.**
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-11 00:09:04 +00:00
Robert Schäfer
448f350c2e Implement paginating user view for admins 2019-07-10 21:45:37 +02:00
Alina Beck
4c84a02f59 add social media backend test 2019-07-10 15:57:02 +02:00
Alina Beck
8847f071fd update social media links in database 2019-07-10 15:16:28 +02:00
Robert Schäfer
fdd8095e48 Remove always out-of-date schema.gql dump 2019-07-10 14:41:29 +02:00
Robert Schäfer
95a06a8344 Refactor all badges resolvers to use neode 
FYI: @Tirokk I think we'll never remove or add new badges through
graphql. Instead, we will seed them manually with direct access to the
database. Therefore I removed the respective mutations and also your
tests regarding permissions.
 2019-07-10 14:36:42 +02:00
senderfm
116ff124ed merge remote branch 2019-07-10 14:11:40 +02:00
senderfm
f7ec19f960 merge master 2019-07-10 13:58:11 +02:00
Ulf Gebhardt
0c181758cb
emotion modeled as enum 2019-07-10 12:50:28 +02:00
Robert Schäfer
8c18b9c59b Allow to list all badges 2019-07-10 12:36:19 +02:00
Matt Rider
0113751003 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 967-filter-post-by-category 2019-07-10 07:09:58 -03:00
Robert Schäfer
808f703a4f
Merge pull request #1009 from Human-Connection/dependabot/npm_and_yarn/backend/babel/preset-env-7.5.4 
Bump @babel/preset-env from 7.5.2 to 7.5.4 in /backend
 2019-07-10 11:05:21 +02:00
Robert Schäfer
0d3f48e258
Merge pull request #1014 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-2.6.8 
Bump apollo-server from 2.6.6 to 2.6.8 in /backend
 2019-07-10 09:34:58 +02:00
dependabot-preview[bot]
ede3d7bc72
Bump @babel/preset-env from 7.5.2 to 7.5.4 in /backend 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.5.2 to 7.5.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.5.2...v7.5.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-10 06:50:33 +00:00
Robert Schäfer
9096af75b0
Merge pull request #1012 from Human-Connection/dependabot/npm_and_yarn/backend/babel/core-7.5.4 
Bump @babel/core from 7.5.0 to 7.5.4 in /backend
 2019-07-10 08:49:19 +02:00
dependabot-preview[bot]
7f68fd6c9b
Bump apollo-server from 2.6.6 to 2.6.8 in /backend 
Bumps [apollo-server](https://github.com/apollographql/apollo-server) from 2.6.6 to 2.6.8.
- [Release notes](https://github.com/apollographql/apollo-server/releases)
- [Changelog](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-server/compare/apollo-server@2.6.6...apollo-server@2.6.8)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-10 06:44:08 +00:00
Robert Schäfer
a2021d857e
Merge pull request #1011 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-testing-2.6.8 
Bump apollo-server-testing from 2.6.7 to 2.6.8 in /backend
 2019-07-10 08:41:53 +02:00
dependabot-preview[bot]
e0d8e4a008
Bump lodash from 4.17.11 to 4.17.13 in /backend 
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.11 to 4.17.13.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.11...4.17.13)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-10 04:26:43 +00:00
dependabot-preview[bot]
a6de369277
Bump @babel/core from 7.5.0 to 7.5.4 in /backend 
Bumps [@babel/core](https://github.com/babel/babel) from 7.5.0 to 7.5.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.5.0...v7.5.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-10 04:25:20 +00:00
dependabot-preview[bot]
a0d9c6dbaa
Bump apollo-server-testing from 2.6.7 to 2.6.8 in /backend 
Bumps [apollo-server-testing](https://github.com/apollographql/apollo-server) from 2.6.7 to 2.6.8.
- [Release notes](https://github.com/apollographql/apollo-server/releases)
- [Changelog](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-server/compare/apollo-server-testing@2.6.7...apollo-server-testing@2.6.8)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-10 04:24:40 +00:00
Matt Rider
0d4617399b Fix/add tests 2019-07-09 18:29:31 -03:00
Alexander Friedland
a4a875c2e1
Merge pull request #993 from Human-Connection/user_role_not_nullable 
User role not nullable
 2019-07-09 20:50:03 +02:00
Matt Rider
fdde050f17 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 967-filter-post-by-category 2019-07-09 13:29:23 -03:00
Wolfgang Huß
458229eb77
Merge pull request #848 from Human-Connection/779-tags-of-contribution-in-text 
Tags in the Text of a Contribution like Mentions
 2019-07-09 16:47:17 +02:00
Robert Schäfer
a5f655058e
Merge pull request #989 from Human-Connection/fix_env_var_name 
Neo4j uses a different name for its env vars
 2019-07-09 15:21:22 +02:00
Robert Schäfer
34f923ad97 Merge remote-tracking branch 'origin/master' into 779-tags-of-contribution-in-text 2019-07-09 14:40:59 +02:00
Matt Rider
014de3b97b Destructure category from result 2019-07-09 07:58:15 -03:00
dependabot-preview[bot]
f5522d0e40
Bump graphql-shield from 6.0.2 to 6.0.3 in /backend 
Bumps [graphql-shield](https://github.com/maticzav/graphql-shield) from 6.0.2 to 6.0.3.
- [Release notes](https://github.com/maticzav/graphql-shield/releases)
- [Commits](https://github.com/maticzav/graphql-shield/compare/v6.0.2...v6.0.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-09 04:26:39 +00:00
mattwr18
54463f2a37
Merge pull request #988 from Human-Connection/dependabot/npm_and_yarn/backend/babel/core-7.5.0 
Bump @babel/core from 7.4.5 to 7.5.0 in /backend
 2019-07-08 21:44:16 -03:00
Robert Schäfer
8303febc80 Merge remote-tracking branch 'origin/master' into 779-tags-of-contribution-in-text 2019-07-08 23:51:56 +02:00
dependabot-preview[bot]
96be771f3d
Bump @babel/preset-env from 7.4.5 to 7.5.2 in /backend 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.4.5 to 7.5.2.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.4.5...v7.5.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-08 21:50:40 +00:00
dependabot-preview[bot]
5063f9a447
Bump @babel/core from 7.4.5 to 7.5.0 in /backend 
Bumps [@babel/core](https://github.com/babel/babel) from 7.4.5 to 7.5.0.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.4.5...v7.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-08 21:49:22 +00:00
Robert Schäfer
22b4e07c75
Merge pull request #987 from Human-Connection/dependabot/docker/backend/node-12.6-alpine 
Bump node from 12.5-alpine to 12.6-alpine in /backend
 2019-07-08 23:48:22 +02:00
Robert Schäfer
1602f2468c
Merge pull request #984 from Human-Connection/dependabot/npm_and_yarn/backend/babel/preset-env-7.5.0 
Bump @babel/preset-env from 7.4.5 to 7.5.0 in /backend
 2019-07-08 23:47:14 +02:00
Robert Schäfer
ca8a34e3f2
Merge pull request #982 from Human-Connection/dependabot/npm_and_yarn/backend/babel/node-7.5.0 
Bump @babel/node from 7.4.5 to 7.5.0 in /backend
 2019-07-08 23:46:33 +02:00
Robert Schäfer
01ee2f1475
Merge pull request #981 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-plugin-jest-22.7.2 
Bump eslint-plugin-jest from 22.7.1 to 22.7.2 in /backend
 2019-07-08 23:46:13 +02:00
Robert Schäfer
f3ac218c73 Silly cypress cannot deal with fs npm module 
... a server-side npm package and does not work for the browser.
 2019-07-08 23:43:44 +02:00
Robert Schäfer
a3de375fef neodes withDir seems incompatible with cypress 2019-07-08 22:07:30 +02:00
Robert Schäfer
e4173a24aa Fix backend tests 2019-07-08 19:50:19 +02:00
Wolfgang Huß
e69f292bd8 Hashtags restricted in the chars, in Editor Suggestions and Backend 
Refactor Seeding with Tag ids as Tag names.
In Frontend: Done as a suggestion with all the forbidden chars removed.
In Backend by Regex only the fitting links.
Rewrite backend test to make sure Hashtag „id“ is the name of the Hashtag.
Test for „https://www.example.org/#anchor“

Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-07-08 19:25:57 +02:00
Wolfgang Huß
8d648deda4 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 779-tags-of-contribution-in-text 2019-07-08 18:48:00 +02:00
Robert Schäfer
e77bf31470 User role must be set 2019-07-08 16:51:17 +02:00