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

588 Commits

Author SHA1 Message Date
Robert Schäfer
d8621c6a31
Merge pull request #828 from Human-Connection/821-follow_up 
Follow up on #820
 2019-06-14 11:41:00 +02:00
Robert Schäfer
76e0d7ef06 Follow up on #820 
I forgot the most important part: Proxy teaser image urls.
 2019-06-14 09:59:46 +02:00
dependabot-preview[bot]
514694a3b2
Bump date-fns from 2.0.0-alpha.32 to 2.0.0-alpha.33 in /webapp 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.0.0-alpha.32 to 2.0.0-alpha.33.
- [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.32...v2.0.0-alpha.33)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-14 05:00:56 +00:00
mattwr18
82769634c6
Merge pull request #815 from Human-Connection/dependabot/npm_and_yarn/webapp/date-fns-2.0.0-alpha.32 
Bump date-fns from 2.0.0-alpha.31 to 2.0.0-alpha.32 in /webapp
 2019-06-13 21:17:03 -03:00
Robert Schäfer
b8c5db48a6 Implement prefix of image urls with a filter 
Fix #820

Ok, so after I would have to use the same method in three different
locations (`<ds-card>` expects an `image` attribute but cannot render
entire components) I decided to implement the prefix of image urls with
a filter rather than a component. The downside of this is that we have
to add the filter on a lot of component tests. The benefit is less
components and hopefully less complexity.
 2019-06-13 16:56:41 +02:00
dependabot-preview[bot]
e7b42736ca
Bump date-fns from 2.0.0-alpha.31 to 2.0.0-alpha.32 in /webapp 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.0.0-alpha.31 to 2.0.0-alpha.32.
- [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.31...v2.0.0-alpha.32)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-13 04:56:18 +00: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
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
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
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
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
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
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
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
94ea9c9530 Fix lint 2019-06-07 13:48:59 +02: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
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]
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
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
Robert Schäfer
de0bcd949a Fix test 2019-06-07 01:39:09 +02:00
Robert Schäfer
08778f3798 Remove unnecessary refetching 
First of all this removes a bug, but it also shows that apollo triggers
the rerendering of dependent components.

FYI @mattwr18
 2019-06-07 01:38:02 +02:00
Robert Schäfer
c9ef1bc5ce Implement switching of tabs and updating list 2019-06-07 01:38:02 +02:00
Robert Schäfer
4278c75d52 Refactor profile page, separate requests 2019-06-06 23:31:27 +02:00
senderfm
92241576b3 Implement active Tabs 2019-06-06 19:34:28 +02:00
mattwr18
bc8dd22a91
Merge pull request #762 from Human-Connection/refactor_filter_bubble 
Refactor filter bubble
 2019-06-06 14:18:00 -03:00
Matt Rider
f53d091691 Add error handling component tests 2019-06-06 13:50:10 -03:00
Matt Rider
cbd78a34dc Merge branch 'master' of github.com:Human-Connection/Human-Connection into refactor_filter_bubble 2019-06-06 13:36:24 -03:00
Matt Rider
55458abbff Merge branch 'master' of github.com:Human-Connection/Human-Connection into undo_location_reload 2019-06-06 12:36:08 -03:00
Robert Schäfer
ab719eca3e
Merge pull request #732 from Human-Connection/688-hover-effect-user-image-upload 
Hover effect user image upload
 2019-06-06 15:54:50 +02:00
Robert Schäfer
55cfb99a06
Merge pull request #742 from Human-Connection/dependabot/npm_and_yarn/webapp/tippy.js-4.3.3 
Bump tippy.js from 4.3.2 to 4.3.3 in /webapp
 2019-06-06 15:52:49 +02:00
Robert Schäfer
46288858ac
Merge pull request #756 from Human-Connection/dependabot/npm_and_yarn/webapp/@nuxtjs/axios-5.5.4 
Bump @nuxtjs/axios from 5.5.3 to 5.5.4 in /webapp
 2019-06-06 15:52:20 +02:00
Robert Schäfer
58f272876e Frontend uses neo4j-graphql-js's filters 2019-06-06 15:30:25 +02:00
Robert Schäfer
2171add6f3 Disable the location.reloads 
It might create better user experience, but for the small user group I
think the complexity is worse than the feature itself.
 2019-06-06 12:35:49 +02:00
dependabot-preview[bot]
e01e137a80
Bump date-fns from 2.0.0-alpha.27 to 2.0.0-alpha.29 in /webapp 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.0.0-alpha.27 to 2.0.0-alpha.29.
- [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.27...v2.0.0-alpha.29)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-06 04:54:04 +00:00
dependabot-preview[bot]
1039256e79
Bump @nuxtjs/axios from 5.5.3 to 5.5.4 in /webapp 
Bumps [@nuxtjs/axios](https://github.com/nuxt-community/axios-module) from 5.5.3 to 5.5.4.
- [Release notes](https://github.com/nuxt-community/axios-module/releases)
- [Changelog](https://github.com/nuxt-community/axios-module/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/nuxt-community/axios-module/compare/v5.5.3...v5.5.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-06 04:52:58 +00:00
Robert Schäfer
0d340ac190
Merge pull request #699 from Human-Connection/269-filter_by_followed_users 
269 filter by followed users
 2019-06-06 03:53:35 +02:00
dependabot-preview[bot]
3844abcec2
Bump tippy.js from 4.3.2 to 4.3.3 in /webapp 
Bumps [tippy.js](https://github.com/atomiks/tippyjs) from 4.3.2 to 4.3.3.
- [Release notes](https://github.com/atomiks/tippyjs/releases)
- [Commits](https://github.com/atomiks/tippyjs/compare/v4.3.2...v4.3.3)
 2019-06-06 01:38:30 +00:00
mattwr18
b713cd8859
Merge pull request #746 from Human-Connection/dependabot/npm_and_yarn/webapp/tiptap-extensions-1.21.0 
Bump tiptap-extensions from 1.20.2 to 1.21.0 in /webapp
 2019-06-05 22:36:08 -03:00