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

531 Commits

Author SHA1 Message Date
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
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
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
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
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
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
senderfm
42f5fb6bf3 Fixed No untranslated strings 2019-06-05 10:38:15 +02:00
dependabot-preview[bot]
1cca86390d
Bump node from 12.3.1-alpine to 12.4-alpine in /webapp 
Bumps node from 12.3.1-alpine to 12.4-alpine.
 2019-06-05 05:01:38 +00:00
dependabot-preview[bot]
5caa6007c1
Bump nuxt from 2.8.0 to 2.8.1 in /webapp 
Bumps [nuxt](https://github.com/nuxt/nuxt.js) from 2.8.0 to 2.8.1.
- [Release notes](https://github.com/nuxt/nuxt.js/releases)
- [Changelog](https://github.com/nuxt/nuxt.js/blob/dev/RELEASE_PLAN.md)
- [Commits](https://github.com/nuxt/nuxt.js/compare/v2.8.0...v2.8.1)
 2019-06-05 05:00:18 +00:00
dependabot-preview[bot]
a7197ae666
Bump tiptap-extensions from 1.20.2 to 1.21.0 in /webapp 
Bumps [tiptap-extensions](https://github.com/scrumpy/tiptap) from 1.20.2 to 1.21.0.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap-extensions@1.20.2...tiptap-extensions@1.21.0)
 2019-06-05 04:59:14 +00:00
dependabot-preview[bot]
af8a548958
Bump apollo-client from 2.6.0 to 2.6.1 in /webapp 
Bumps [apollo-client](https://github.com/apollographql/apollo-client) from 2.6.0 to 2.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-client@2.6.0...apollo-client@2.6.1)
 2019-06-05 04:58:14 +00:00
Robert Schäfer
36f77e660e
Merge pull request #731 from Human-Connection/722_comment-date 
Add date relative date on comments
 2019-06-05 00:54:48 +02:00
Robert Schäfer
52a52d7ad4 Provide better user experience with different icon 
@ogerly I changed the icon to use a normal eye if you want to release
the contribution. Changing visual state usually improves user
experience.
 2019-06-04 18:15:07 +02:00
senderfm
f1b85d5256 Fixed clean ReleaseModal and DeleteModal 2019-06-04 16:25:59 +02:00
aonomike
55b3764258 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 722_comment-date 2019-06-04 13:54:41 +03:00
dependabot-preview[bot]
b9c8d35def
Bump tippy.js from 4.3.1 to 4.3.2 in /webapp 
Bumps [tippy.js](https://github.com/atomiks/tippyjs) from 4.3.1 to 4.3.2.
- [Release notes](https://github.com/atomiks/tippyjs/releases)
- [Commits](https://github.com/atomiks/tippyjs/compare/v4.3.1...v4.3.2)
 2019-06-04 04:59:26 +00:00
mattwr18
094a46861b
Merge pull request #721 from Human-Connection/dependabot/npm_and_yarn/webapp/tiptap-extensions-1.20.2 
Bump tiptap-extensions from 1.20.1 to 1.20.2 in /webapp
 2019-06-03 19:30:10 -03:00
aonomike
f7e5c7bf2c Add date relative date on comments 2019-06-03 23:36:04 +03:00
Wolfgang Huß
d365f9368b Lint Fixes 2019-06-03 13:54:50 +02:00
Wolfgang Huß
948a99d9da Merge remote-tracking branch 'origin/master' into 553-delete-comment 
# Conflicts:
#	webapp/components/Modal/DeleteModal.vue
#	webapp/components/PostCard/index.vue
#	webapp/components/comments/CommentList/index.vue
#	webapp/pages/index.vue
#	webapp/pages/post/_id/_slug/more-info.vue
 2019-06-03 10:39:13 +02:00
dependabot-preview[bot]
86d1e2a4b9
Bump tiptap-extensions from 1.20.1 to 1.20.2 in /webapp 
Bumps [tiptap-extensions](https://github.com/scrumpy/tiptap) from 1.20.1 to 1.20.2.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap-extensions@1.20.1...tiptap-extensions@1.20.2)
 2019-06-03 05:01:54 +00:00
Matt Rider
e09ef35c4a Merge branch 'master' of github.com:Human-Connection/Human-Connection into 691_handle-large-file-sizes-bug 2019-06-01 16:05:43 -03:00
aonomike
78100bec37 Add tests to upload error bug fix 
Co-authored-by: mattwr18 <mattwr18@gmail.com>
 2019-06-01 20:23:04 +03:00
Robert Schäfer
13a2f771f8
Merge pull request #712 from Human-Connection/dependabot/docker/webapp/node-12.3.1-alpine 
Bump node from 10-alpine to 12.3.1-alpine in /webapp
 2019-05-31 20:15:10 +02:00
Robert Schäfer
321ead32fc
Merge pull request #663 from Human-Connection/dependabot/npm_and_yarn/webapp/prettier-1.17.1 
Bump prettier from 1.14.3 to 1.17.1 in /webapp
 2019-05-31 19:33:43 +02:00
Robert Schäfer
1773d136e9 Yarn --ignore-engines, v12.x.x will become LTS 2019-05-31 19:32:36 +02:00
Wolfgang Huß
92ae6375e1 Merge remote-tracking branch 'origin/master' into 553-delete-comment 2019-05-31 17:42:19 +02:00
Wolfgang Huß
e63e4ad890 Written custom mutation and Jest tests for DeleteComment 2019-05-31 17:42:04 +02:00
dependabot-preview[bot]
038e216748
Bump node from 10-alpine to 12.3.1-alpine in /webapp 
Bumps node from 10-alpine to 12.3.1-alpine.
 2019-05-31 15:06:18 +00:00
Wolfgang Huß
5bec0f1d72 Refined list deletion functions and started writing custom mutation for DeleteComment and their tests 2019-05-31 15:46:34 +02:00
Robert Schäfer
cd9d589801 Update lockfile 2019-05-31 14:57:59 +02:00
Wolfgang Huß
b46016203a Started writing Jest tests for Deletion of Comments 2019-05-31 14:57:44 +02:00
Robert Schäfer
284ca34e03
Merge pull request #711 from Human-Connection/dependabot/npm_and_yarn/webapp/nuxt-2.8.0 
Bump nuxt from 2.7.1 to 2.8.0 in /webapp
 2019-05-31 14:26:22 +02:00
Robert Schäfer
d39b5a87ef
Merge pull request #707 from Human-Connection/705-upgrade-axios 
Upgrade @nuxt/axios
 2019-05-31 14:11:21 +02:00
Robert Schäfer
ea42d73d04 Merge remote-tracking branch 'origin/master' into dependabot/npm_and_yarn/webapp/prettier-1.17.1 2019-05-31 13:35:20 +02:00
Robert Schäfer
e162cd480e Run yarn run lint --fix on prettier v1.17.1 2019-05-31 13:33:20 +02:00
Robert Schäfer
e366c278a7
Merge pull request #704 from Human-Connection/dependabot/npm_and_yarn/webapp/fuse.js-3.4.5 
Bump fuse.js from 3.4.4 to 3.4.5 in /webapp
 2019-05-31 13:05:42 +02:00
Robert Schäfer
a027e7599d
Merge pull request #706 from Human-Connection/686-dummy-placeholder-for-empty-avatars 
Add logo as default avatar background image
 2019-05-31 13:00:45 +02:00
Matt Rider
1f0e7bf7d9 Upgrade @nuxt/axios 
- was dependent on axios <= 0.18.0 and there is a high severity security alert from google
 2019-05-31 12:59:38 +02:00
dependabot-preview[bot]
9c06fe71e8
Bump nuxt from 2.7.1 to 2.8.0 in /webapp 
Bumps [nuxt](https://github.com/nuxt/nuxt.js) from 2.7.1 to 2.8.0.
- [Release notes](https://github.com/nuxt/nuxt.js/releases)
- [Changelog](https://github.com/nuxt/nuxt.js/blob/dev/RELEASE_PLAN.md)
- [Commits](https://github.com/nuxt/nuxt.js/compare/v2.7.1...v2.8.0)
 2019-05-31 10:51:43 +00:00
Wolfgang Huß
52a430fc91 Merge remote-tracking branch 'origin/master' into 553-delete-comment 2019-05-31 11:36:50 +02:00
Wolfgang Huß
76469df059 Getting Jest Tests to run again. 2019-05-31 11:36:27 +02:00
dependabot-preview[bot]
67bce21104
Bump @nuxtjs/axios from 5.5.2 to 5.5.3 in /webapp 
Bumps [@nuxtjs/axios](https://github.com/nuxt-community/axios-module) from 5.5.2 to 5.5.3.
- [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.2...v5.5.3)
 2019-05-31 04:58:50 +00:00