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

3645 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ulf Gebhardt
d024d7df91
fixed importing of urls - remove url prefix 2019-06-14 14:03:21 +02:00
Robert Schäfer
fa5b16ddd5
Merge pull request #798 from Human-Connection/dependabot/npm_and_yarn/webapp/tiptap-extensions-1.22.2 
Bump tiptap-extensions from 1.22.1 to 1.22.2 in /webapp
 2019-06-12 10:28:14 +02:00
Robert Schäfer
45fc604c25
Merge pull request #797 from Human-Connection/dependabot/npm_and_yarn/backend/graphql-shield-5.3.8 
Bump graphql-shield from 5.3.7 to 5.3.8 in /backend
 2019-06-12 10:27:45 +02:00
Robert Schäfer
c2bcc9f595
Merge pull request #754 from Human-Connection/402-userprofil-tab-click-function 
402 userprofil tab click function
 2019-06-12 10:24:41 +02:00
dependabot-preview[bot]
1c614cc009
Bump tiptap-extensions from 1.22.1 to 1.22.2 in /webapp 
Bumps [tiptap-extensions](https://github.com/scrumpy/tiptap) from 1.22.1 to 1.22.2.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap-extensions@1.22.1...tiptap-extensions@1.22.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-12 05:00:32 +00:00
dependabot-preview[bot]
78607dfd0e
Bump graphql-shield from 5.3.7 to 5.3.8 in /backend 
Bumps [graphql-shield](https://github.com/maticzav/graphql-shield) from 5.3.7 to 5.3.8.
- [Release notes](https://github.com/maticzav/graphql-shield/releases)
- [Commits](https://github.com/maticzav/graphql-shield/compare/v5.3.7...v5.3.8)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-12 04:56:09 +00:00
Robert Schäfer
90107cfb18
Merge pull request #789 from Human-Connection/dependabot/npm_and_yarn/backend/prettier-1.18.2 
Bump prettier from 1.17.1 to 1.18.2 in /backend
 2019-06-11 23:44:00 +02:00
Robert Schäfer
54c7c204c2 Run yarn run lint --fix 2019-06-11 23:10:26 +02:00
Robert Schäfer
8beba9c8b2 Remove obsolete translations 
@ogerly I saw that you added tooltips to the menu bars. However, it is
not "Your posts" that you see there, it's the posts of the user whose
profile you are looking at.

As a fix, I removed the tooltips in an earlier merge commit, because I think
they don't improve user experience here.
 2019-06-11 23:01:26 +02:00
Robert Schäfer
5eaac8b077 Document loading spinner implementation with test 
Because it's slightly odd how I avoid a duplicate loading spinner, I
 thought this is a good target for a test.
 2019-06-11 18:48:01 +02:00
Robert Schäfer
d1364e4aed Merge remote-tracking branch 'origin/master' into 402-userprofil-tab-click-function 2019-06-11 17:41:17 +02:00
mattwr18
d010b62985
Merge pull request #796 from Human-Connection/dependabot/npm_and_yarn/backend/graphql-shield-5.3.7 
Bump graphql-shield from 5.3.6 to 5.3.7 in /backend
 2019-06-11 08:35:34 -03:00
dependabot-preview[bot]
db37d085f8
Bump graphql-shield from 5.3.6 to 5.3.7 in /backend 
Bumps [graphql-shield](https://github.com/maticzav/graphql-shield) from 5.3.6 to 5.3.7.
- [Release notes](https://github.com/maticzav/graphql-shield/releases)
- [Commits](https://github.com/maticzav/graphql-shield/compare/v5.3.6...v5.3.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-11 04:51:32 +00:00
dependabot-preview[bot]
f18ae14741
Bump prettier from 1.17.1 to 1.18.2 in /backend 
Bumps [prettier](https://github.com/prettier/prettier) from 1.17.1 to 1.18.2.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/prettier/compare/1.17.1...1.18.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-10 11:12:27 +00:00
mattwr18
14041ff396
Merge pull request #794 from Human-Connection/dependabot/npm_and_yarn/webapp/prettier-1.18.2 
Bump prettier from 1.18.0 to 1.18.2 in /webapp
 2019-06-10 08:12:00 -03:00
mattwr18
8c247e1b72
Merge pull request #793 from Human-Connection/dependabot/npm_and_yarn/webapp/tiptap-extensions-1.22.1 
Bump tiptap-extensions from 1.21.0 to 1.22.1 in /webapp
 2019-06-10 08:11:27 -03:00
mattwr18
8f149c9751
Merge pull request #792 from Human-Connection/dependabot/npm_and_yarn/webapp/cookie-universal-nuxt-2.0.16 
Bump cookie-universal-nuxt from 2.0.14 to 2.0.16 in /webapp
 2019-06-10 08:10:50 -03:00
mattwr18
0f78fdcfa5
Merge pull request #790 from Human-Connection/dependabot/npm_and_yarn/webapp/tippy.js-4.3.4 
Bump tippy.js from 4.3.3 to 4.3.4 in /webapp
 2019-06-10 08:10:05 -03:00
dependabot-preview[bot]
d85f63078f
Bump prettier from 1.18.0 to 1.18.2 in /webapp 
Bumps [prettier](https://github.com/prettier/prettier) from 1.18.0 to 1.18.2.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/prettier/compare/1.18.0...1.18.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-10 04:55:09 +00:00
dependabot-preview[bot]
46ccaf6b95
Bump tiptap-extensions from 1.21.0 to 1.22.1 in /webapp 
Bumps [tiptap-extensions](https://github.com/scrumpy/tiptap) from 1.21.0 to 1.22.1.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap-extensions@1.21.0...tiptap-extensions@1.22.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-10 04:54:10 +00:00
dependabot-preview[bot]
3461de56f8
Bump cookie-universal-nuxt from 2.0.14 to 2.0.16 in /webapp 
Bumps [cookie-universal-nuxt](https://github.com/microcipcip/cookie-universal) from 2.0.14 to 2.0.16.
- [Release notes](https://github.com/microcipcip/cookie-universal/releases)
- [Commits](https://github.com/microcipcip/cookie-universal/compare/v2.0.14...v2.0.16)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-10 04:53:37 +00:00
dependabot-preview[bot]
8226c900fd
Bump tippy.js from 4.3.3 to 4.3.4 in /webapp 
Bumps [tippy.js](https://github.com/atomiks/tippyjs) from 4.3.3 to 4.3.4.
- [Release notes](https://github.com/atomiks/tippyjs/releases)
- [Commits](https://github.com/atomiks/tippyjs/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-10 04:52:38 +00:00
mattwr18
0259eeee66
Merge pull request #771 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-cache-inmemory-1.6.2 
Bump apollo-cache-inmemory from 1.6.1 to 1.6.2 in /backend
 2019-06-08 11:48:23 -03:00
mattwr18
75fa7af5d8
Merge pull request #780 from Human-Connection/add_translations_to_user_profile 
Translate network tab on the left profile page
 2019-06-08 11:45:39 -03:00
Robert Schäfer
15b7043d00 Write a test for "load more" button 
The crucial test is still missing: Write a test to check that no more
than one loading spinner is visible all the time.

@Tirokk FYI I wrote a page component test and made sure that the test
will also fail if the implementation is broken.
 2019-06-08 01:50:08 +02:00
mattwr18
d32f577c8c
Update en.json 2019-06-07 19:08:40 -03:00
dependabot-preview[bot]
f0a4149b9e
Bump apollo-cache-inmemory from 1.6.1 to 1.6.2 in /backend 
Bumps [apollo-cache-inmemory](https://github.com/apollographql/apollo-client) from 1.6.1 to 1.6.2.
- [Release notes](https://github.com/apollographql/apollo-client/releases)
- [Changelog](https://github.com/apollographql/apollo-client/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-client/compare/apollo-cache-inmemory@1.6.1...apollo-cache-inmemory@1.6.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-07 22:07:23 +00:00
mattwr18
a0f9e90ce2
Merge pull request #783 from Human-Connection/remove_unnecessary_dependency_ms 
Replace dependency `ms` completely
 2019-06-07 19:06:11 -03:00
Robert Schäfer
ceaab92d19
Merge pull request #772 from Human-Connection/dependabot/npm_and_yarn/webapp/apollo-client-2.6.2 
Bump apollo-client from 2.6.1 to 2.6.2 in /webapp
 2019-06-08 00:05:12 +02:00
Robert Schäfer
9384f85ebf Use jest's expectation matchers if possible 
@Tirokk jest has a lot of assertion matchers that will give you better
error messages than the default ones:
https://jestjs.io/docs/en/expect.html#tohavelengthnumber
 2019-06-07 16:53:30 +02:00
Robert Schäfer
314b257b45 Replace dependency ms completely 
I have seen this PR here: https://github.com/Human-Connection/Human-Connection/pull/774 and I thought: Never saw that one before, where is it used and what is the purpose? I could find this line only and thought this is not a justification for having the package installed.
 2019-06-07 15:49:18 +02:00
dependabot-preview[bot]
9bccf2b849
Bump apollo-client from 2.6.1 to 2.6.2 in /webapp 
Bumps [apollo-client](https://github.com/apollographql/apollo-client) from 2.6.1 to 2.6.2.
- [Release notes](https://github.com/apollographql/apollo-client/releases)
- [Changelog](https://github.com/apollographql/apollo-client/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-client/compare/apollo-client@2.6.1...apollo-client@2.6.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-07 12:39:39 +00:00
Robert Schäfer
02dca83358
Merge pull request #768 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-client-2.6.2 
Bump apollo-client from 2.6.1 to 2.6.2 in /backend
 2019-06-07 14:37:21 +02:00
Robert Schäfer
26e7858f70
Merge pull request #773 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-testing-2.6.2 
Bump apollo-server-testing from 2.6.1 to 2.6.2 in /backend
 2019-06-07 14:36:48 +02:00
Robert Schäfer
94ea9c9530 Fix lint 2019-06-07 13:48:59 +02:00
dependabot-preview[bot]
7d50c8f9fd
Bump apollo-client from 2.6.1 to 2.6.2 in /backend 
Bumps [apollo-client](https://github.com/apollographql/apollo-client) from 2.6.1 to 2.6.2.
- [Release notes](https://github.com/apollographql/apollo-client/releases)
- [Changelog](https://github.com/apollographql/apollo-client/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-client/compare/apollo-client@2.6.1...apollo-client@2.6.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-07 11:20:30 +00:00
dependabot-preview[bot]
850121015f
Bump apollo-server-testing from 2.6.1 to 2.6.2 in /backend 
Bumps [apollo-server-testing](https://github.com/apollographql/apollo-server) from 2.6.1 to 2.6.2.
- [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.1...apollo-server-testing@2.6.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-07 11:20:28 +00:00
Robert Schäfer
54ef104f62
Merge pull request #766 from Human-Connection/dependabot/npm_and_yarn/webapp/prettier-1.18.0 
Bump prettier from 1.17.1 to 1.18.0 in /webapp
 2019-06-07 13:20:10 +02:00
Robert Schäfer
72b2fd48a7
Merge pull request #770 from Human-Connection/dependabot/npm_and_yarn/webapp/date-fns-2.0.0-alpha.31 
Bump date-fns from 2.0.0-alpha.29 to 2.0.0-alpha.31 in /webapp
 2019-06-07 13:19:41 +02:00
Robert Schäfer
5503df0895
Merge pull request #776 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-2.6.2 
Bump apollo-server from 2.6.1 to 2.6.2 in /backend
 2019-06-07 13:18:28 +02:00
Robert Schäfer
518a5eb617
Merge pull request #775 from Human-Connection/dependabot/npm_and_yarn/backend/date-fns-2.0.0-alpha.31 
Bump date-fns from 2.0.0-alpha.29 to 2.0.0-alpha.31 in /backend
 2019-06-07 13:17:52 +02:00
Robert Schäfer
7ab6ce4ed2 Fix typo in translation keys 2019-06-07 13:10:04 +02:00
Robert Schäfer
a06733fbfd Translate network tab on the left profile page 2019-06-07 13:01:47 +02:00
dependabot-preview[bot]
34a9799fac
Bump apollo-server from 2.6.1 to 2.6.2 in /backend 
Bumps [apollo-server](https://github.com/apollographql/apollo-server) from 2.6.1 to 2.6.2.
- [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.1...apollo-server@2.6.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-07 05:00:10 +00:00
dependabot-preview[bot]
b5b3293af0
Bump date-fns from 2.0.0-alpha.29 to 2.0.0-alpha.31 in /backend 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.0.0-alpha.29 to 2.0.0-alpha.31.
- [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.0-alpha.29...v2.0.0-alpha.31)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-07 04:59:36 +00:00
dependabot-preview[bot]
4194c6f3c1
Bump date-fns from 2.0.0-alpha.29 to 2.0.0-alpha.31 in /webapp 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.0.0-alpha.29 to 2.0.0-alpha.31.
- [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.0-alpha.29...v2.0.0-alpha.31)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-07 04:57:42 +00:00
dependabot-preview[bot]
1627655c64
Bump prettier from 1.17.1 to 1.18.0 in /webapp 
Bumps [prettier](https://github.com/prettier/prettier) from 1.17.1 to 1.18.0.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/prettier/compare/1.17.1...1.18.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-07 04:56:04 +00:00
Robert Schäfer
a978591843 Fix bug introduced in 6f0447515 
@ulfgebhardt For the `deleted` and `disabled` flags I would be glad if we could
take only one value, that is `true`, in case the post is considered disabled or
deleted respectively.

There might be more bugs like this now. Please keep in mind that these
counts are also used as total limits for pagination and you break the
pagination if you change the cypher statement.
 2019-06-07 01:39:09 +02:00
Robert Schäfer
574b42a2a7 "commentedCount" is different from "commentsCount" 
One is how many comments you wrote, one is how many **posts** are there
with at least one comment of you.

E.g. you can comment twice on the same post. You will have a
`commentedCount` increase of 1 but a `commentsCount` of 2.

FYI @ogerly @Tirokk
 2019-06-07 01:39:09 +02:00
Robert Schäfer
d3a70321b8 Show a loading spinner for better UX 2019-06-07 01:39:09 +02:00