ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,408 Commits 117 Branches 1,511 Tags
Commit Graph

4261 Commits

Author SHA1 Message Date
dependabot-preview[bot]
02ad873427
Bump @babel/cli from 7.5.5 to 7.6.0 in /backend 
Bumps [@babel/cli](https://github.com/babel/babel) from 7.5.5 to 7.6.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.5.5...v7.6.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-10 06:34:07 +00:00
dependabot-preview[bot]
00b45b8016
Bump @babel/node from 7.5.5 to 7.6.1 in /backend 
Bumps [@babel/node](https://github.com/babel/babel) from 7.5.5 to 7.6.1.
- [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.5...v7.6.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-10 06:34:07 +00:00
dependabot-preview[bot]
53baad9f4d
Bump neode from 0.3.2 to 0.3.3 in /backend 
Bumps [neode](https://github.com/adam-cowley/neode) from 0.3.2 to 0.3.3.
- [Release notes](https://github.com/adam-cowley/neode/releases)
- [Commits](https://github.com/adam-cowley/neode/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-10 06:32:06 +00:00
mattwr18
aeaa637ff0
Merge pull request #1530 from Human-Connection/dependabot/npm_and_yarn/backend/babel/core-7.6.0 
Bump @babel/core from 7.5.5 to 7.6.0 in /backend
 2019-09-10 08:32:04 +02:00
dependabot-preview[bot]
d0ff75cca6
Bump apollo-link-http from 1.5.15 to 1.5.16 in /backend 
Bumps [apollo-link-http](https://github.com/apollographql/apollo-link) from 1.5.15 to 1.5.16.
- [Release notes](https://github.com/apollographql/apollo-link/releases)
- [Changelog](https://github.com/apollographql/apollo-link/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-link/compare/apollo-link-http@1.5.15...apollo-link-http@1.5.16)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-10 06:31:39 +00:00
mattwr18
250976698b
Merge pull request #1524 from Human-Connection/dependabot/npm_and_yarn/backend/graphql-shield-6.1.0 
Bump graphql-shield from 6.0.6 to 6.1.0 in /backend
 2019-09-10 08:30:54 +02:00
mattwr18
6c36f61218
Merge pull request #1520 from Human-Connection/dependabot/npm_and_yarn/backend/babel/register-7.6.0 
Bump @babel/register from 7.5.5 to 7.6.0 in /backend
 2019-09-10 08:30:21 +02:00
mattwr18
7292c15cd0
Merge pull request #1519 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-link-context-1.0.19 
Bump apollo-link-context from 1.0.18 to 1.0.19 in /backend
 2019-09-10 08:29:47 +02:00
mattwr18
d9f8cf02ca
Merge pull request #1518 from Human-Connection/dependabot/npm_and_yarn/backend/date-fns-2.1.0 
Bump date-fns from 2.0.1 to 2.1.0 in /backend
 2019-09-10 08:29:31 +02:00
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
dependabot-preview[bot]
0f2546aded
Bump @babel/core from 7.5.5 to 7.6.0 in /backend 
Bumps [@babel/core](https://github.com/babel/babel) from 7.5.5 to 7.6.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.5.5...v7.6.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-09 04:24:32 +00:00
dependabot-preview[bot]
f2f19fb902
Bump graphql-shield from 6.0.6 to 6.1.0 in /backend 
Bumps [graphql-shield](https://github.com/maticzav/graphql-shield) from 6.0.6 to 6.1.0.
- [Release notes](https://github.com/maticzav/graphql-shield/releases)
- [Commits](https://github.com/maticzav/graphql-shield/compare/v6.0.6...v6.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-09 04:22:58 +00:00
dependabot-preview[bot]
5de80d09fa
Bump @babel/register from 7.5.5 to 7.6.0 in /backend 
Bumps [@babel/register](https://github.com/babel/babel) from 7.5.5 to 7.6.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.5.5...v7.6.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-09 04:21:31 +00:00
dependabot-preview[bot]
26c869ef95
Bump apollo-link-context from 1.0.18 to 1.0.19 in /backend 
Bumps [apollo-link-context](https://github.com/apollographql/apollo-link) from 1.0.18 to 1.0.19.
- [Release notes](https://github.com/apollographql/apollo-link/releases)
- [Changelog](https://github.com/apollographql/apollo-link/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-link/compare/apollo-link-context@1.0.18...apollo-link-context@1.0.19)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-09 04:21:11 +00:00
dependabot-preview[bot]
35be26f8b2
Bump date-fns from 2.0.1 to 2.1.0 in /backend 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.0.1 to 2.1.0.
- [Release notes](https://github.com/date-fns/date-fns/releases)
- [Changelog](https://github.com/date-fns/date-fns/blob/master/CHANGELOG.md)
- [Commits](https://github.com/date-fns/date-fns/compare/v2.0.1...v2.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-09 04:20:33 +00: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
roschaefer
06f07c1a75 Fix missing from in templates 2019-09-06 23:31:28 +02:00
roschaefer
e751571981 Refactored email resolvers 
* If the email middleware does not send mails, it will give a warning
similar to sentry middleware
* Eliminated GrapphQLClient in one more test
* Rename code => nonce
 2019-09-06 19:31: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