ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,297 Commits 117 Branches 1,511 Tags
Commit Graph

76 Commits

Author SHA1 Message Date
Ulf Gebhardt
1b8b356432
notification subscription 2023-07-20 13:41:59 +02:00
Moriz Wahl
c9135d321d fix notification added subscription 2023-06-21 14:31:16 +02:00
Moriz Wahl
033630e8e3 add group type for mark notifications as read 2023-03-16 16:55:30 +01:00
Moriz Wahl
ab58c569d0 related user for group notifications 2023-03-15 17:49:52 +01:00
Moriz Wahl
10c02c251e group notifications in notification dropdown 2023-03-15 16:23:45 +01:00
Moriz Wahl
bdc1cb33da Merge branch 'master' into feature/mark-all-notification-as-read 2023-03-08 16:50:02 +01:00
Wolfgang Huß
654bf0f64e Add 'about' to 'mapUserQuery' 2023-01-25 17:24:55 +01:00
Wolfgang Huß
36239bc762 Show all users with locations on map 2023-01-12 11:25:58 +01:00
Wolfgang Huß
e8d21147ae Split 'locationAndBadgesFragment' into 'locationFragment' and 'badgesFragment' 2023-01-12 10:53:43 +01:00
Wolfgang Huß
04810ca500 Move the admins user query GQL to the appropriate file 2023-01-12 10:50:44 +01:00
Wolfgang Huß
13f2451e02 Change default GQL 'UserQuery' to named 'profileUserQuery' 2023-01-12 10:12:32 +01:00
Wolfgang Huß
9790eb1f88 Make 'followedByCount' and 'followingCount' in 'User' query imperative 2023-01-11 16:17:34 +01:00
Wolfgang Huß
dd80dc764c Fix unused parameters naming 2022-11-16 14:13:32 +01:00
Wolfgang Huß
b398eabf47 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into feature/mark-all-notification-as-read 
# Conflicts:
#	webapp/locales/it.json
 2022-11-16 11:45:19 +01:00
ogerly
a8cf6acd93 add slug user to group member 2022-10-18 13:38:05 +02:00
Wolfgang Huß
0048486a78 Refactor to save location in db by 'UpdateUser', 'CreateGroup', and 'UpdateGroup' resolvers 
- Refactor, add, and refine tests of location for 'CreateGroup' and 'UpdateGroup' resolvers.
 2022-09-17 20:55:43 +02:00
Moriz Wahl
d05919fddb add active categories to current user query 2022-09-07 14:08:03 +02:00
Wolfgang Huß
e82d35c824 Fix linting 2022-08-25 23:17:50 +02:00
Wolfgang Huß
7ae5593f82 Implement user notifications settings 2021-09-22 14:05:10 +02:00
Wolfgang Huß
a94d7188be Merge branch 'master' of https://github.com/Ocelot-Social-Community/Ocelot-Social into feature/mark-all-notification-as-read-test 2020-11-12 15:37:38 +01:00
Ademílson F. Tonato
0bffede021 feat: add mutation for new functionality (mark-all-as-read) 
- Add mutation for markAllAsRead (notifications)
- Add method to the schema that returns a list of all notifications
- Add permissions rules to invoke this method (isAuthenticated)

See #2660
 2020-10-24 11:29:09 +01:00
Moriz Wahl
f9518619fe id for author added 2020-10-14 16:35:47 +02:00
Moriz Wahl
8e527a83f1 post categories added for data export 2020-10-14 00:14:56 +02:00
Moriz Wahl
f0354c337f Export of user data as XML 2020-09-29 15:54:21 +02:00
Moriz Wahl
0e678a5559 basic json download of user data 2020-09-29 13:35:47 +02:00
ogerly
1c1a0030f7 fix: i have taken over and implemented the proposals from tirrok 2020-08-04 13:08:11 +02:00
ogerly
b2326c710e git pull conflicts fixed 2020-04-29 10:10:14 +02:00
ogerly
7e5a7f5d42 bug: deleteUser on old status, currentUserCounts are retrieved additionally, admin cannot delete himself via his user settings 2020-04-29 10:04:54 +02:00
ogerly
8a2d238f96 fix: #3498 Checkboxes missing on delete user account page 2020-04-26 13:11:32 +02:00
Raphael Beer
e6361c9b74
Refactor: move following/followedBy updating to page component 2020-03-28 05:57:48 +01:00
Raphael Beer
984f69a738
Chore: lint 2020-03-25 12:51:36 +01:00
Raphael Beer
f339ed2c7f
Add: button to load all remaining connections 2020-03-25 12:51:35 +01:00
roschaefer
276ea79e8f Update prettier to v2 2020-03-24 21:11:11 +01:00
Robert Schäfer
512ef672bf
feat: Introduce graphql image type (#3043) 
* refactor(graphql): Introduce image type

* Undo changes to .travis.yml

* chore: Upgrade travis to node LTS

- URL is available since v10

* chore: use lts

Co-authored-by: mattwr18 <mattwr18@gmail.com>
 2020-03-16 15:32:19 +01:00
roschaefer
7d9cbb3ce9 perf(neo4j): Improve currentUser read performance 2020-03-04 13:32:30 +01:00
mattwr18
f16c8b27e7 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1703-add-vue-apollo-subsriptions 2020-02-10 17:37:34 +01:00
mattwr18
5347f734af Fix cypress tests/frontend implementation 
- Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
 2020-02-10 16:25:00 +01:00
mattwr18
2f43069ea0 Subscribe to notifications/remove polling 
- We want to publish when a notification occurs for a specific user, not
  have the client poll the backend for ever user every minute.

- Co-authored-by: @Tirokk <wolle.huss@pjannto.com>
 2020-02-05 17:37:38 +01:00
mattwr18
04f0467d2d Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1703-add-vue-apollo-subsriptions 2020-02-05 14:33:57 +01:00
mattwr18
bcc1ab167e Improve styling per @alina-beck review 2020-01-30 10:46:43 +01:00
mattwr18
a28eb8c91f Start subscriptions for notifications 2020-01-24 18:23:59 +01:00
mattwr18
bbb4dd56cd Follow review suggestions/add button to unblock 
- @roschaefer gave several suggestions
- we have a button to unblock/unmute users on profile page
 2020-01-23 19:18:12 +01:00
mattwr18
ba3e9e1025 Rename blacklist/whitelist to mute/unmute 
- Follow @roschaefer suggestion in issue
- This can be reverted if we decide otherwise
 2020-01-08 18:04:26 +01:00
mattwr18
c297b83f87 Convert block/unblock to blacklist/whitelist 
- at the moment, we have implemented blocked like we want the
blacklist/whitelistUserContent to be, with the exception that is should
not be both ways. If I blacklist a user's content, they still see my
content in their news feed.
 2020-01-07 18:57:35 +01:00
mattwr18
3abfe13dcc Fix maintenance service/LocaleSwitch import 2019-12-17 16:15:11 +01:00
roschaefer
107409ecee Fix duplicate fragment user issue 
This is refactoring all our fragments and fixing the warning about an
existing name `user`. Apparently, fragments should have a unique name
globally.

I decided to call `userFragment`, `postFragment` the fragments for one
object and use different names to query for related objects.

I would be glad to learn a better way to handle this.
 2019-12-14 00:37:42 +01:00
mattwr18
fd1e2c91fd Refactor to consolidate UpdateUser mutations 2019-12-12 18:48:56 +01:00
mattwr18
d375ebe7d9 Write test/refactor tests/resolvers/middleware 
- write tests for userMiddleware
- checks the functionality of nodes/locations middleware
- refactor to not allow users to update to remove their name
  debatable whether we want that or not, but we do not allow users to
create accounts with no name, so we should be consistent, before we were
using neode to validate this, but we have are removing neode from
production code, so we must validate ourselves
- collate UpdateUser mutations to one
 2019-12-12 18:14:47 +01:00
roschaefer
deefc4e12f Improve notification query performance 
Just don't ask for stuff that you don't want to show anyways
 2019-12-10 18:09:32 +01:00
Alina Beck
6213a25355
Merge branch 'master' into 1747-show-shouts 2019-11-14 09:37:54 +03:00