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

1145 Commits

Author SHA1 Message Date
mattwr18
ba3e0ca941 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1488-filter-posts-by-emotion 2019-09-09 16:59:35 +02:00
mattwr18
3b056aacc1 Fix weird indentation issue with VS Code 2019-09-09 16:58:49 +02:00
mattwr18
86d80c689c Fix indentation issue on EMOTED 2019-09-09 16:51:24 +02:00
mattwr18
919dc1924f Fix indent issue 2019-09-09 16:46:51 +02:00
mattwr18
b89043166b Add backend tests for filtering posts by emotions 
- Co-authored-by: Mike Aono <aonomike@gmail.com>
 2019-09-09 16:35:11 +02:00
mattwr18
d3952e2ada Use debug npm package over console.log 
- @roschaefer `PR` review
- better because we can leave in the code base and show only when/if we
want to
 2019-09-09 14:32:01 +02:00
mattwr18
2aef2add3d Add temporarily console.log statements to debug failed API call 
- in production environment, the user locationName is updated, but it is
failing the `createOrUpdateLocations` function in backend/src/middleware/nodes/locations.js
For some reason, it seems like the API call is coming back with
something other than what we are looking for.
Need help debugging... we can remove this code after we figure out
what's wrong
 2019-09-09 12:53:47 +02:00
mattwr18
30ea892aa1 Allow filter by multiple emotions, test getters 
- Co-authored-by: vardyb <brent.vardy@challengelogic.net>
- Co-aurhored-by: mike aono <aonomike@gmail.com>
 2019-09-07 12:37:03 +02:00
mattwr18
07c58fc03e Add emotions buttons, get it filtering 2019-09-07 12:37:03 +02:00
Wolfgang Huß
80d1e03c03
Merge pull request #1510 from Human-Connection/1506-anonymize_deleted_user 
1506 Anonymize deleted user also for moderators
 2019-09-06 17:12:31 +02:00
Wolfgang Huß
53be6d41ee
Merge pull request #1507 from Human-Connection/refactor_registration_spec 
Refactor registration.spec.js
 2019-09-06 16:47:21 +02:00
roschaefer
4358d5bb8f Follow @Tirokk's suggestion 
https://github.com/Human-Connection/Human-Connection/pull/1507#pullrequestreview-284841447
 2019-09-06 16:03:46 +02:00
roschaefer
5b24a91d45 Implement better statistics resolver 2019-09-06 13:52:56 +02:00
roschaefer
160552734d Move softDeleteMiddleware into its own folder 2019-09-06 13:12:30 +02:00
roschaefer
f58c1c7cf0 Refactor registration.spec.js 
Only 7 specs left that still use GraphQLClient
 2019-09-06 11:37:40 +02:00
Robert Schäfer
a95c115212
Merge pull request #1498 from Human-Connection/dependabot/docker/backend/node-12.10.0-alpine 
Bump node from 12.9-alpine to 12.10.0-alpine in /backend
 2019-09-06 09:20:39 +02:00
dependabot-preview[bot]
8d4874effb
Bump node from 12.9-alpine to 12.10.0-alpine in /backend 
Bumps node from 12.9-alpine to 12.10.0-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-06 04:25:14 +00:00
dependabot-preview[bot]
c963dee8d9
Bump eslint-plugin-jest from 22.16.0 to 22.17.0 in /backend 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.16.0 to 22.17.0.
- [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.16.0...v22.17.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-06 04:22:27 +00:00
Robert Schäfer
c9e9f1bc4c
Merge pull request #1482 from Human-Connection/dependabot/npm_and_yarn/backend/helmet-3.21.0 
Bump helmet from 3.20.1 to 3.21.0 in /backend
 2019-09-05 11:14:42 +02:00
Robert Schäfer
8177fff5af
Merge pull request #1483 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-plugin-node-10.0.0 
Bump eslint-plugin-node from 9.2.0 to 10.0.0 in /backend
 2019-09-05 11:14:17 +02:00
mattwr18
4e065325d1
Merge pull request #1480 from Human-Connection/cleanup_unused_code 
Remove a lot of unused code, reduce graphql schema
 2019-09-05 08:03:39 +02:00
dependabot-preview[bot]
c69e1e836d
Bump eslint-plugin-node from 9.2.0 to 10.0.0 in /backend 
Bumps [eslint-plugin-node](https://github.com/mysticatea/eslint-plugin-node) from 9.2.0 to 10.0.0.
- [Release notes](https://github.com/mysticatea/eslint-plugin-node/releases)
- [Commits](https://github.com/mysticatea/eslint-plugin-node/compare/v9.2.0...v10.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-05 04:22:25 +00:00
dependabot-preview[bot]
63ea447ef9
Bump helmet from 3.20.1 to 3.21.0 in /backend 
Bumps [helmet](https://github.com/helmetjs/helmet) from 3.20.1 to 3.21.0.
- [Release notes](https://github.com/helmetjs/helmet/releases)
- [Changelog](https://github.com/helmetjs/helmet/blob/master/CHANGELOG.md)
- [Commits](https://github.com/helmetjs/helmet/compare/v3.20.1...v3.21.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-05 04:21:40 +00:00
roschaefer
66ed78e19b Remove a lot of unused code, reduce graphql schema 2019-09-05 03:20:32 +02:00
roschaefer
38ea74379a If TAC version is missing, return null 2019-09-05 01:24:51 +02:00
Robert Schäfer
127d98c475
Merge pull request #1446 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-soundcloud-5.6.7 
Bump metascraper-soundcloud from 5.6.6 to 5.6.7 in /backend
 2019-09-04 23:23:58 +02:00
Robert Schäfer
467c8b7549
Merge pull request #1447 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-youtube-5.6.7 
Bump metascraper-youtube from 5.6.6 to 5.6.7 in /backend
 2019-09-04 23:23:49 +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
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
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
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
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]
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]
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
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
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
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
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
roschaefer
af8475f28e Avoid unavailable posts in relatedContributions 2019-09-03 23:19:55 +02:00