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

5888 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexander Friedland
41767cc27e
Merge branch 'master' into C-1187-terms-and-conditions-confirmed-function 2019-09-03 09:51:12 +02:00
ogerly
1b9303ceaf Jest tests for the Terms and Conditions in frontend and backend 2019-09-03 09:46:18 +02:00
Alina Beck
0fd0cdbe34 separate post title and content with hyphens 2019-09-02 16:46:41 +01:00
mattwr18
be80c1c598
Merge pull request #1451 from Human-Connection/1396-limit-suggestions-list 
Limit suggestions list to 15, add component tests
 2019-09-02 17:16:47 +02:00
Matt Rider
accb8ae505 Follow @alina-beck's suggestions 
- set items to the full list of hashtags or users to avoid unnecessarily reassigning the items variable based on suggestionType
- refactor tests to trigger onFilter, which calls filterSuggestionList, then check that it returns a maximum of 15 items both for queries and empty queries
- fix description with incorrect type(users, instead of hashtags)
- return 15 items, not 14
 2019-09-02 15:43:18 +02:00
Matt Rider
62e7aee4a3 Revert changes from commit #ca88d1a 
- we need to remove the whitespaces first, then check if there are still illegitimate characters in the hashtag before removing them
- this is to maintain the maximum number of hashtags imported from the legacy database as possible
 2019-09-02 15:07:22 +02:00
Matt Rider
d1309d2b8f Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1395-hashtags-imported-with-not-allowed-chars 2019-09-02 12:51:11 +02:00
Matt Rider
cf10b650ae Limit suggestions list to 15, add component tests 2019-09-02 10:42:37 +02:00
dependabot-preview[bot]
79455169fa
Bump apollo-server-testing from 2.9.1 to 2.9.3 in /backend 
Bumps [apollo-server-testing](https://github.com/apollographql/apollo-server) from 2.9.1 to 2.9.3.
- [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.9.1...apollo-server-testing@2.9.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-02 06:10:29 +00:00
mattwr18
3e5a624147
Merge pull request #1445 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-2.9.3 
Bump apollo-server from 2.9.1 to 2.9.3 in /backend
 2019-09-02 08:08:15 +02:00
mattwr18
527e1679d1
Merge pull request #1443 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-6.3.0 
Bump eslint from 6.2.2 to 6.3.0 in /backend
 2019-09-02 08:07:10 +02:00
dependabot-preview[bot]
9c23e2d371
Bump metascraper-youtube from 5.6.6 to 5.6.7 in /backend 
Bumps [metascraper-youtube](https://github.com/microlinkhq/metascraper-youtube) from 5.6.6 to 5.6.7.
- [Release notes](https://github.com/microlinkhq/metascraper-youtube/releases)
- [Commits](https://github.com/microlinkhq/metascraper-youtube/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-02 04:23:45 +00:00
dependabot-preview[bot]
a2495bb96e
Bump metascraper-soundcloud from 5.6.6 to 5.6.7 in /backend 
Bumps [metascraper-soundcloud](https://github.com/microlinkhq/metascraper-soundcloud) from 5.6.6 to 5.6.7.
- [Release notes](https://github.com/microlinkhq/metascraper-soundcloud/releases)
- [Commits](https://github.com/microlinkhq/metascraper-soundcloud/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-02 04:23:13 +00:00
dependabot-preview[bot]
d64ee198bd
Bump apollo-server from 2.9.1 to 2.9.3 in /backend 
Bumps [apollo-server](https://github.com/apollographql/apollo-server) from 2.9.1 to 2.9.3.
- [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.9.1...apollo-server@2.9.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-02 04:22:58 +00:00
dependabot-preview[bot]
4367a06315
Bump eslint from 6.2.2 to 6.3.0 in /backend 
Bumps [eslint](https://github.com/eslint/eslint) from 6.2.2 to 6.3.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v6.2.2...v6.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-02 04:22:15 +00:00
mattwr18
d8a241a66a
Merge pull request #1439 from Human-Connection/put_neo4j_memory_configs_in_configmap 
Move Neo4j configuration in configmap
 2019-08-31 10:06:57 +02:00
Robert Schäfer
a784bca62f
Merge pull request #1433 from Human-Connection/dependabot/npm_and_yarn/backend/neo4j-driver-1.7.6 
Bump neo4j-driver from 1.7.5 to 1.7.6 in /backend
 2019-08-30 22:12:07 +02:00
Robert Schäfer
0641320ac1
Merge pull request #1430 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-plugin-node-9.2.0 
Bump eslint-plugin-node from 9.1.0 to 9.2.0 in /backend
 2019-08-30 22:11:54 +02:00
roschaefer
4ea47eafab Move Neo4j configuration in configmap 
I think it's beneficial to have these settings in a central location.
That way, we're not running into the danger of overwriting the
`nitro-deployment` by accident with a `kubectl apply -f ...`.
 2019-08-30 22:11:12 +02:00
mattwr18
63520a43cd
Merge pull request #1426 from Human-Connection/1414-refactor_notifications 
1414 Bugfix: Delete notifications if connected post, comment or user is deleted
 2019-08-30 19:31:46 +02:00
roschaefer
98194ef54a Follow @mattwr18's suggestions 2019-08-30 16:00:32 +02:00
Matt Rider
fd9a355910 Fix incorrect id in seeds notification 
- Jenny Rostok was being notified that someone had mentioned them in p2, when actually it was Peter Lustig who had been mentioned.
 2019-08-30 16:00:32 +02:00
roschaefer
30a95e5713 Fix lint 2019-08-30 16:00:32 +02:00
roschaefer
cbcba8f08d Follow @Tirokk's suggestion 2019-08-30 16:00:32 +02:00
roschaefer
c29ee5e3d3 Update notifications in place 2019-08-30 16:00:32 +02:00
roschaefer
994ab43950 Change the behaviour how notifications get created 
I think it makes more sense to update an existing notification in place.
Ie. if there was already a notification, just mark it as unread so it
ends up in the recipient's notification list again.
 2019-08-30 16:00:32 +02:00
roschaefer
66b12090a7 Fix cypress tests 2019-08-30 16:00:32 +02:00
roschaefer
f635b0cbd5 Fix frontend tests 2019-08-30 16:00:32 +02:00
roschaefer
c585b23d7a Fix notification queries in webapp 2019-08-30 16:00:32 +02:00
roschaefer
bf6e7a8131 Implement fallback resolvers for Post and Comment 2019-08-30 16:00:32 +02:00
roschaefer
9b2c707aa3 DRY notifications resolver 2019-08-30 16:00:32 +02:00
roschaefer
733c2d5ce1 All backend tests pass 2019-08-30 16:00:32 +02:00
roschaefer
3f121c7c4d Refine notification behaviour: 
If you mark a post or comment as read even though you already marked the
corresponding notification as read, then you receive `null`.
 2019-08-30 16:00:32 +02:00
roschaefer
2846a6a8d3 Spec for notifications passing 2019-08-30 16:00:32 +02:00
roschaefer
cf8ead10f3 Start to refactor backend tests 2019-08-30 16:00:32 +02:00
roschaefer
4b96454b90 Notifications resolver capable of orderBy + filter 2019-08-30 16:00:32 +02:00
roschaefer
643d175ef6 Implement notifications resolver 2019-08-30 16:00:32 +02:00
dependabot-preview[bot]
d78349879d
Bump neo4j-driver from 1.7.5 to 1.7.6 in /backend 
Bumps [neo4j-driver](https://github.com/neo4j/neo4j-javascript-driver) from 1.7.5 to 1.7.6.
- [Release notes](https://github.com/neo4j/neo4j-javascript-driver/releases)
- [Commits](https://github.com/neo4j/neo4j-javascript-driver/compare/1.7.5...1.7.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-30 13:49:20 +00:00
dependabot-preview[bot]
cbfaf292d7
Bump eslint-plugin-node from 9.1.0 to 9.2.0 in /backend 
Bumps [eslint-plugin-node](https://github.com/mysticatea/eslint-plugin-node) from 9.1.0 to 9.2.0.
- [Release notes](https://github.com/mysticatea/eslint-plugin-node/releases)
- [Commits](https://github.com/mysticatea/eslint-plugin-node/compare/v9.1.0...v9.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-30 13:48:50 +00:00
Robert Schäfer
f207d66fbe
Merge pull request #1428 from Human-Connection/dependabot/npm_and_yarn/backend/graphql-14.5.4 
Bump graphql from 14.5.3 to 14.5.4 in /backend
 2019-08-30 15:47:40 +02:00
Robert Schäfer
7f2aefb3b7
Merge pull request #1429 from Human-Connection/dependabot/npm_and_yarn/neo4j-driver-1.7.6 
Bump neo4j-driver from 1.7.5 to 1.7.6
 2019-08-30 15:47:21 +02:00
Robert Schäfer
080288d0bc
Merge pull request #1431 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-node-9.2.0 
Bump eslint-plugin-node from 9.1.0 to 9.2.0 in /webapp
 2019-08-30 15:47:00 +02:00
Matt Rider
ca88d1a369 Remove redundant code, simplify import 
- follow @Tirokk's suggestion
- good catch!!
 2019-08-30 15:21:29 +02:00
Alexander Friedland
a8e1583481
_err remove 2019-08-30 14:15:38 +02:00
Robert Schäfer
0a5052ba96
Merge pull request #1397 from Human-Connection/performance-improvement 
Check there are ids in the badIds array
 2019-08-30 14:08:13 +02:00
mattwr18
f275799856
Merge pull request #1351 from Human-Connection/1333-fix_checks_for_deleted_and_disabled 
Fix database import, pagination and counters on user profile page
 2019-08-30 13:51:41 +02:00
dependabot-preview[bot]
ba65848070
Bump eslint-plugin-node from 9.1.0 to 9.2.0 in /webapp 
Bumps [eslint-plugin-node](https://github.com/mysticatea/eslint-plugin-node) from 9.1.0 to 9.2.0.
- [Release notes](https://github.com/mysticatea/eslint-plugin-node/releases)
- [Commits](https://github.com/mysticatea/eslint-plugin-node/compare/v9.1.0...v9.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-30 11:40:29 +00:00
dependabot-preview[bot]
5332041e50
Bump graphql from 14.5.3 to 14.5.4 in /backend 
Bumps [graphql](https://github.com/graphql/graphql-js) from 14.5.3 to 14.5.4.
- [Release notes](https://github.com/graphql/graphql-js/releases)
- [Commits](https://github.com/graphql/graphql-js/compare/v14.5.3...v14.5.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-30 11:39:02 +00:00
Robert Schäfer
565e8b4d93
Merge pull request #1432 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-plugin-jest-22.16.0 
Bump eslint-plugin-jest from 22.15.2 to 22.16.0 in /backend
 2019-08-30 13:38:52 +02:00
Robert Schäfer
c620bec10f
Merge pull request #1434 from Human-Connection/dependabot/npm_and_yarn/webapp/sass-loader-8.0.0 
Bump sass-loader from 7.3.1 to 8.0.0 in /webapp
 2019-08-30 13:38:28 +02:00