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

5475 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mattwr18
153bd918bc
Merge pull request #1528 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-link-http-1.5.16 
Bump apollo-link-http from 1.5.15 to 1.5.16 in /backend
 2019-09-10 15:06:09 +02:00
mattwr18
7618318a8a
Merge pull request #1526 from Human-Connection/dependabot/npm_and_yarn/backend/babel/cli-7.6.0 
Bump @babel/cli from 7.5.5 to 7.6.0 in /backend
 2019-09-10 15:05:56 +02:00
mattwr18
c7b590d6b0
Merge pull request #1523 from Human-Connection/dependabot/npm_and_yarn/backend/babel/preset-env-7.6.0 
Bump @babel/preset-env from 7.5.5 to 7.6.0 in /backend
 2019-09-10 15:05:34 +02:00
mattwr18
c7b20306a0
Merge pull request #1522 from Human-Connection/dependabot/npm_and_yarn/backend/babel/node-7.6.1 
Bump @babel/node from 7.5.5 to 7.6.1 in /backend
 2019-09-10 15:05:20 +02:00
mattwr18
1fda99e198
Merge pull request #1540 from Human-Connection/remove_editor_store 
Remove obsolete code
 2019-09-10 15:04:46 +02:00
dependabot-preview[bot]
1ee2ebe8e7
Bump @babel/preset-env from 7.5.5 to 7.6.0 in /backend 
Bumps [@babel/preset-env](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:32 +00:00
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
mattwr18
b91fab7a3c
Merge pull request #1541 from Human-Connection/dependabot/npm_and_yarn/webapp/human-connection/styleguide-0.5.21 
Bump @human-connection/styleguide from 0.5.19 to 0.5.21 in /webapp
 2019-09-10 08:32:57 +02:00
mattwr18
1b677b6cb4
Merge pull request #1532 from Human-Connection/dependabot/npm_and_yarn/webapp/babel/preset-env-7.6.0 
Bump @babel/preset-env from 7.5.5 to 7.6.0 in /webapp
 2019-09-10 08:32:29 +02: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
mattwr18
e6716302a3
Merge pull request #1529 from Human-Connection/dependabot/npm_and_yarn/webapp/vue-jest-3.0.5 
Bump vue-jest from 3.0.4 to 3.0.5 in /webapp
 2019-09-10 08:31:45 +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
d44b515e92
Merge pull request #1527 from Human-Connection/dependabot/npm_and_yarn/webapp/date-fns-2.1.0 
Bump date-fns from 2.0.1 to 2.1.0 in /webapp
 2019-09-10 08:31:23 +02:00
mattwr18
da359e5e71
Merge pull request #1525 from Human-Connection/dependabot/npm_and_yarn/webapp/babel/core-7.6.0 
Bump @babel/core from 7.5.5 to 7.6.0 in /webapp
 2019-09-10 08:31:08 +02: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
61c091c022
Merge pull request #1521 from Human-Connection/dependabot/npm_and_yarn/neode-0.3.3 
Bump neode from 0.3.2 to 0.3.3
 2019-09-10 08:30:07 +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
dependabot-preview[bot]
5e05e78401
Bump @human-connection/styleguide from 0.5.19 to 0.5.21 in /webapp 
Bumps @human-connection/styleguide from 0.5.19 to 0.5.21.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-10 04:22:57 +00:00
roschaefer
a8222c5290 Remove obsolete code 
I believe this is obsolete code. Could someone double-check?

@mattwr18 I tried to see any difference to `master` and I couldn't. Did
I miss sth.?

For context: During my work on https://github.com/Human-Connection/Human-Connection/pull/1517
the webapp was complaining about missing mutations when I changed the
dropdown.
 2019-09-10 03:35:10 +02:00
Alexander Friedland
f327cc01dd
Merge pull request #1539 from Human-Connection/1462-Sorting_dropdown_should_be_aligned_with_post_cards 
[WIP] Sorting dropdown is aligned with post cards
 2019-09-09 19:18:12 +02:00
Wolfgang Huß
20b54b050f
Merge pull request #1514 from Human-Connection/fix_css_on_profile_page 
Avatar should be centered on profile page
 2019-09-09 19:16:56 +02:00
Wolfgang Huß
f1b52c7b81
Merge pull request #1536 from Human-Connection/fix-test-set-up 
Fix test by setting value of the mocked hashtag
 2019-09-09 17:17:44 +02:00
ogerly
e278fa4afc Padding remove 2019-09-09 16:45:11 +02:00
Wolfgang Huß
f72bccbebe Fix lint prettier 2019-09-09 16:43:54 +02:00
Robert Schäfer
cbcb6e6aea
Merge pull request #1534 from Human-Connection/add-console-log-for-erros-geolocation 
Add console log for erros geolocation
 2019-09-09 15:45:23 +02:00
aonomike
34ddd12948 Fix test by setting value of the mocked hashtag 
- The test wasnt testing anything as the hashtag value was defaulting to null
- Fixed by setting value of hashtag to a string and then testing if the clearSearch works
 2019-09-09 16:22:21 +03:00
roschaefer
28776d7a6a Avatar should be centered on profile page 
This is a fix of e04eedf0d07ff66dba3e881e9ef8bdf5a868619e
 2019-09-09 15:02:56 +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
e819ade8cb Add console.log statement on error to help debug 
- Geolocation is working in development, but not on staging or
production
 2019-09-09 09:54:38 +02:00
mattwr18
3d419c1f21
Merge pull request #1508 from Human-Connection/1505_remove_html_in_moderation_view 
Fix #1505 remove html
 2019-09-09 08:49:00 +02:00
dependabot-preview[bot]
23a14534b7
Bump @babel/preset-env from 7.5.5 to 7.6.0 in /webapp 
Bumps [@babel/preset-env](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:25:22 +00: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]
d090161e4f
Bump vue-jest from 3.0.4 to 3.0.5 in /webapp 
Bumps [vue-jest](https://github.com/vuejs/vue-jest) from 3.0.4 to 3.0.5.
- [Release notes](https://github.com/vuejs/vue-jest/releases)
- [Commits](https://github.com/vuejs/vue-jest/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-09 04:24:27 +00:00
dependabot-preview[bot]
537c5c7c7b
Bump date-fns from 2.0.1 to 2.1.0 in /webapp 
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:23:54 +00:00
dependabot-preview[bot]
b4c6963e8e
Bump @babel/core from 7.5.5 to 7.6.0 in /webapp 
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:23:06 +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]
cab3a645f8
Bump neode from 0.3.2 to 0.3.3 
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-09 04:21:40 +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
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
1bd57dfeb8 Fix console.errors in test 2019-09-06 16:42:16 +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
Wolfgang Huß
f0923ad864 Add hashtag for the comment id to the comments links of the list 2019-09-06 15:55:11 +02:00
Wolfgang Huß
40103e84e7 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1505_remove_html_in_moderation_view 2019-09-06 15:52:47 +02:00