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
16,425 Commits 117 Branches 1,511 Tags
Commit Graph

2184 Commits

Author SHA1 Message Date
ogerly
53532025d6 Fix translation add backend test case todo 2019-08-23 11:36:41 +02:00
Matt Rider
abbfc6d757 Remove commented out, unneeded code 2019-08-23 11:30:20 +02:00
ogerly
0bb71cfbb3 Specs tests run through cleanly 2019-08-23 11:02:24 +02:00
ogerly
592a682bd7 Temporary commit 2019-08-23 11:02:24 +02:00
ogerly
2b634b8706 BUGFIX: 'email' attribute is the ID 2019-08-23 11:02:24 +02:00
ogerly
36ce6361ec Alle Daten übernommen die für serverseitig rendern nötig sind 2019-08-23 11:02:24 +02:00
Matt Rider
773779e5f1 Fix UpdatePost resolver/validations 2019-08-23 10:57:11 +02:00
roschaefer
62c8d34079 Fix expiration dates of JWT and cookie 
This won't fix the bug that can happen in `nuxtServerInit`. However,
according to the docs, we accepted JWT which was valid for 1000 days and
our cookie was valid for 3 days - completely weird.

See:
https://github.com/auth0/node-jsonwebtoken
https://github.com/nuxt-community/apollo-module
 2019-08-22 22:29:50 +02:00
Wolfgang Huß
793485c0fc Write frontend tests 2019-08-22 15:20:40 +02:00
Wolfgang Huß
04fe6b0a8c Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1062-notification-about-comment-on-post 
# Conflicts:
#	backend/src/middleware/handleNotifications/handleNotificationsMiddleware.spec.js

Refactored there tests a little
 2019-08-22 11:02:10 +02:00
Wolfgang Huß
3e91a66673 Correct wrong merge of master 2019-08-22 08:32:19 +02:00
Robert Schäfer
deb0fcabd4
Merge pull request #1268 from Human-Connection/post-needs-to-have-category#1222 
Validate that a post cannot be created without categories/too many categories
 2019-08-21 16:28:32 +02:00
Wolfgang Huß
3d2df56141 Backend tests 2019-08-21 14:27:32 +02:00
Wolfgang Huß
d98ebdd713 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1062-notification-about-comment-on-post 2019-08-21 08:37:43 +02:00
roschaefer
5c72799095 Fix #1315 2019-08-21 01:52:43 +02:00
Matt Rider
ea923ae1dc Merge branch 'master' of github.com:Human-Connection/Human-Connection into post-needs-to-have-category#1222 2019-08-20 21:29:10 +02:00
Matt Rider
512bf32b0c Update cypress tests, fix broken comment reactivity 2019-08-20 21:27:00 +02:00
Matt Rider
8735045d11 Update cypress tests, post query 2019-08-20 20:13:29 +02:00
Robert Schäfer
89b377fee1
Merge pull request #1281 from Human-Connection/272-add_error_reporting 
272 add error reporting
 2019-08-20 19:07:49 +02:00
Robert Schäfer
af377fd06c
Merge pull request #1298 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-config-standard-14.0.0 
Bump eslint-config-standard from 13.0.1 to 14.0.0 in /backend
 2019-08-20 19:05:07 +02:00
Matt Rider
7bbbf40bcc Update seeds to create post with a category 2019-08-20 16:39:26 +02:00
Matt Rider
a000719663 Merge branch 'master' of github.com:Human-Connection/Human-Connection into post-needs-to-have-category#1222 2019-08-20 16:13:38 +02:00
Matt Rider
29f39c4f45 Update backend tests 
- Every test that created or updated a post needed to be updated to add categoryIds
 2019-08-20 15:54:51 +02:00
roschaefer
c3edc92436 Fix lint 2019-08-20 14:06:24 +02:00
Wolfgang Huß
83a538d345 Write backend tests 
Rename files.

Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-08-19 22:13:42 +02:00
roschaefer
58795ad990 Implement error reporting for the backend 2019-08-19 20:14:43 +02:00
Matt Rider
555c5254bc Add tests, validations for too many categories 
- Co-authored-by: Joseph Ngugi <jngugi88@gmail.com>
 2019-08-19 17:31:55 +02:00
Wolfgang Huß
aae5fd396e Merge branch '1017-send-out-notifications-on-create-omment' of https://github.com/Human-Connection/Human-Connection into 1062-notification-about-comment-on-post 
# Conflicts:
#	backend/src/middleware/handleNotifications/handleNotifications.js
#	backend/src/middleware/handleNotifications/handleNotifications.spec.js
#	webapp/components/notifications/Notification/Notification.vue
#	webapp/components/notifications/NotificationMenu/NotificationMenu.vue
 2019-08-19 16:58:18 +02:00
Matt Rider
3b09c31cbb Merge branch 'master' of github.com:Human-Connection/Human-Connection into post-needs-to-have-category#1222 2019-08-19 16:55:29 +02:00
Matt Rider
caff74e58b Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1017-send-out-notifications-on-create-omment 2019-08-19 10:50:46 +02:00
Robert Schäfer
87461c21ca
Merge pull request #1280 from Human-Connection/refactor-graphql-queries 
Refactor graphql queries
 2019-08-19 09:58:38 +02:00
Wolfgang Huß
68c25b8d54 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1062-notification-about-comment-on-post 
# Conflicts:
#	backend/src/middleware/handleNotifications/handleNotifications.spec.js
 2019-08-19 08:42:00 +02:00
Wolfgang Huß
a972215579 Lint fix 2019-08-16 18:29:26 +02:00
Wolfgang Huß
f653bac9e1 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1017-send-out-notifications-on-create-omment 
# Conflicts:
#	backend/src/middleware/handleHtmlContent/handleContentData.spec.js
 2019-08-16 18:22:36 +02:00
Wolfgang Huß
1ff7750918 Remove comment 2019-08-16 18:15:40 +02:00
Wolfgang Huß
0b9a58e317 Wrote and tested the mention of a blocked user on a post of a blocker 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-08-16 18:14:14 +02:00
Wolfgang Huß
efb5c75c24 Refactor after Roberts suggestions, number I 
Start writing tests
 2019-08-16 16:56:14 +02:00
Matt Rider
dbaa8e687f Fix vue warnings, fix tests, refactor 
- was throwing an error when trying to update commentsCount because of new implementation by @roschaefer which uses countResolver, but there was no related for commentsCount, it was r... also commentsCount is no longer needed anywhere in the code base, it is commentedCount now
 2019-08-16 13:28:55 +02:00
roschaefer
51b734275a The name of the hashtag is now it's ID 
`name` was just a redundant attribute
 2019-08-16 01:49:29 +02:00
Wolfgang Huß
8acccc99d0 Implemented a reason in the Notification 
Used this for displaying in the mentions menu in frontend.
Rewrite backend test.
 2019-08-15 19:29:06 +02:00
Wolfgang Huß
af70d4f717 Get Notification for author for Commenting their Posts 2019-08-15 16:59:42 +02:00
kachulio1
314dfcf413 Throw error if no categories on post creation 
Co-authored-by: mattwr18 <mattwr18@gmail.com>
 2019-08-15 17:55:02 +03:00
Wolfgang Huß
5b5489232f Rename files 2019-08-15 15:47:53 +02:00
Wolfgang Huß
a6eaea70dc Add UpdateComment support for Mentions in Comment 2019-08-15 15:47:13 +02:00
Matt Rider
f0af231975 Merge branch '1017-send-out-notifications-on-create-omment' of github.com:Human-Connection/Human-Connection into 1017-send-out-notifications-on-create-omment 2019-08-15 12:14:22 +02:00
Wolfgang Huß
6ab9a3204b Fix the backend test 2019-08-15 11:07:57 +02:00
Wolfgang Huß
0d66cc4dcf Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1017-send-out-notifications-on-create-omment 
# Conflicts:
#	backend/src/middleware/handleHtmlContent/handleContentData.js
#	backend/src/schema/types/schema.gql
 2019-08-15 10:16:33 +02:00
Matt Rider
569ace137b Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1017-send-out-notifications-on-create-omment 2019-08-15 10:14:47 +02:00
Wolfgang Huß
e8c1a5fe8d Write backend tests 2019-08-14 18:05:13 +02:00
Robert Schäfer
b6c96b7a57
Merge pull request #1261 from Human-Connection/1201-localise-categories 
Localise categories
 2019-08-14 17:44:21 +02:00