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

3594 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mattwr18
d32f577c8c
Update en.json 2019-06-07 19:08:40 -03:00
Robert Schäfer
94ea9c9530 Fix lint 2019-06-07 13:48:59 +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
mattwr18
bc8dd22a91
Merge pull request #762 from Human-Connection/refactor_filter_bubble 
Refactor filter bubble
 2019-06-06 14:18:00 -03:00
mattwr18
0d4433a79f
Merge pull request #761 from Human-Connection/undo_location_reload 
Disable the location.reloads
 2019-06-06 14:17:50 -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
c4316a81de Refactor backend to use filterParams directly 
Revert this commit to implement a later performance improvement
 2019-06-06 15:43:43 +02:00
Robert Schäfer
58f272876e Frontend uses neo4j-graphql-js's filters 2019-06-06 15:30:25 +02:00
Robert Schäfer
a981f8cda2
Merge pull request #757 from Human-Connection/dependabot/npm_and_yarn/webapp/date-fns-2.0.0-alpha.29 
Bump date-fns from 2.0.0-alpha.27 to 2.0.0-alpha.29 in /webapp
 2019-06-06 12:39:20 +02:00
Robert Schäfer
ecca9cce61
Merge pull request #758 from Human-Connection/dependabot/npm_and_yarn/backend/date-fns-2.0.0-alpha.29 
Bump date-fns from 2.0.0-alpha.27 to 2.0.0-alpha.29 in /backend
 2019-06-06 12:39:01 +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]
1d4b77cc59
Bump date-fns from 2.0.0-alpha.27 to 2.0.0-alpha.29 in /backend 
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:58:41 +00: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
mattwr18
2615f5dcfe
Merge pull request #741 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-cache-inmemory-1.6.1 
Bump apollo-cache-inmemory from 1.6.0 to 1.6.1 in /backend
 2019-06-05 22:35:41 -03:00
Robert Schäfer
3942f03ea1 Fix cypress test 2019-06-05 23:32:28 +02:00
Robert Schäfer
6bbaa78fa9 Fix frontend after rebasing the backend 2019-06-05 22:34:34 +02:00
Robert Schäfer
16dc7328e7 Finish filter by followed users only 2019-06-05 22:34:34 +02:00
Robert Schäfer
b7eb299acb Style up filter bubble menu 2019-06-05 22:34:34 +02:00
Robert Schäfer
f300f4bf41 Toggle a button for "friends" or "all" 
I decided not to have a radio button, becase we have only two states
anyway.
 2019-06-05 22:34:34 +02:00
Robert Schäfer
ad48264a64 Provide translations for filter menu 2019-06-05 22:34:34 +02:00
Robert Schäfer
f3b088f862 Move the filter menu into the index page 
A filter makes sense only on the news feed page in my opinion. As a
comparison: The way how full text search is implemented makes sense in
the menu bar, which is always visible. Why? The search results are shown
in a popover. Therefore those are different from the news feed. The news
feed however is only visible on the index page. Therefore I believe, it
makes sense to put the filter menu there and only there.
 2019-06-05 22:34:34 +02:00
Robert Schäfer
f8c0335712 Scaffold filter menu 2019-06-05 22:34:34 +02:00
Robert Schäfer
cc4db62a14
Merge pull request #730 from Human-Connection/269-filter_by_followed_users-backend_part 
269 filter by followed users backend part
 2019-06-05 22:31:37 +02:00
Robert Schäfer
93107bc0f8 Fix lint 2019-06-05 18:39:11 +02:00
Robert Schäfer
16ef304d70 Follow suggestions by @mattwr18 2019-06-05 18:37:19 +02:00
Robert Schäfer
d59c43330b Rename value of enum type to following 
As discussed in our daily standup with @mattwr18
 2019-06-05 18:34:02 +02:00
Robert Schäfer
0d8a748094 Apparently I was wrong: types don't get merged 2019-06-05 17:28:31 +02:00
Robert Schäfer
ed0c9b775b Implement+test filterBubble middleware 
@Tirokk @ulfgebhardt @ogerly @mattwr18

This is interesting because I found out that `neo4j-graphql-js` allows
to customize graphql queries. If you define it, then it will merge the
other inputs and stuff on top of it. Fair enough!
 2019-06-05 17:28:31 +02:00
Robert Schäfer
8e9b0318da Fix missing check if user is unauthenticated 2019-06-05 17:28:31 +02:00
Robert Schäfer
b9b103b424 Implement+test replaceParams helper method 2019-06-05 17:28:31 +02:00
Robert Schäfer
610af0de7a
Merge pull request #739 from Human-Connection/206_setup_neo4j_db_constraints_on_startup 
206 setup neo4j db constraints on startup
 2019-06-05 14:11:31 +02:00
Robert Schäfer
908a89759e
Merge branch 'master' into 206_setup_neo4j_db_constraints_on_startup 2019-06-05 13:40:12 +02:00
Robert Schäfer
be79e1ee5a
Merge pull request #751 from Human-Connection/fix_deployment 
Fix deployment - wrong docker image name
 2019-06-05 13:37:33 +02:00
Wolfgang Huß
7ebd1ec009
Merge pull request #752 from Human-Connection/402-userprofile-shouted-tab-2 
402 userprofile shouted tab 2
 2019-06-05 12:57:21 +02:00
senderfm
12e79c83da Fixed No untranslated strings 2 2019-06-05 10:45:00 +02:00
dependabot-preview[bot]
bd71d1bf66
Bump apollo-cache-inmemory from 1.6.0 to 1.6.1 in /backend 
Bumps [apollo-cache-inmemory](https://github.com/apollographql/apollo-client) from 1.6.0 to 1.6.1.
- [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.0...apollo-cache-inmemory@1.6.1)
 2019-06-05 08:44:49 +00:00
Robert Schäfer
dc84b913d4
Merge pull request #743 from Human-Connection/dependabot/npm_and_yarn/backend/graphql-shield-5.3.6 
Bump graphql-shield from 5.3.5 to 5.3.6 in /backend
 2019-06-05 10:43:33 +02:00
Robert Schäfer
129d62fd7d
Merge pull request #744 from Human-Connection/dependabot/npm_and_yarn/webapp/apollo-client-2.6.1 
Bump apollo-client from 2.6.0 to 2.6.1 in /webapp
 2019-06-05 10:42:55 +02:00
Robert Schäfer
04ab624963
Merge pull request #745 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-client-2.6.1 
Bump apollo-client from 2.5.1 to 2.6.1 in /backend
 2019-06-05 10:42:32 +02:00
Robert Schäfer
fe99d6061a
Merge pull request #748 from Human-Connection/dependabot/npm_and_yarn/webapp/nuxt-2.8.1 
Bump nuxt from 2.8.0 to 2.8.1 in /webapp
 2019-06-05 10:39:05 +02:00