144 Commits

Author SHA1 Message Date
Matt Rider
1c53c58f42 Add backend validation tests to expose non-validation
- remove validation/index.js as it's not being used
- move validations to validationMiddleware.js where it validates
2019-07-16 14:54:13 -03:00
Matt Rider
a019c8c311 Revert unintended changes, refactor
- rename some variables in comments.spec.js while dealing with merge conflicts
- rename EditCommentForm/index.vue with new naming convention
- add comment to explain absense of <no-ssr>
- use a comments content for edit comment form content, not excerpt
2019-07-16 07:53:57 -03:00
Matt Rider
7de337f96d Merge branch 'master' of github.com:Human-Connection/Human-Connection into 552-update_comment 2019-07-16 07:24:23 -03:00
Wolfgang Huß
dded3344cc
Merge pull request #1040 from Human-Connection/remove_graphql_yoga
Remove graphql-yoga
2019-07-16 09:13:44 +02:00
Matt Rider
36c4a22b76 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 552-update_comment 2019-07-15 18:29:26 -03:00
Robert Schäfer
d59c94c9f3 Keep gql syntax highglighting
... with custom fake template string
2019-07-15 18:09:54 +02:00
Wolfgang Huß
ea896f8b3a
Merge pull request #1039 from Human-Connection/bugfix_email_template
Bugfix: Signup email was missing email query param
2019-07-15 13:35:57 +02:00
Robert Schäfer
0d06b78ad4
Merge pull request #1038 from Human-Connection/1037-refactor-comments-resolver-extract-out-validations
Refactor CreateComment resolver
2019-07-13 23:59:15 +02:00
Robert Schäfer
f64a21bd01 Remove graphql-yoga 2019-07-13 19:26:56 +02:00
Robert Schäfer
2d4eec6a52 Bugfix: Signup email was missing email query param 2019-07-12 14:31:28 +02:00
Matt Rider
ba7e44a762 Refactor CreateComment resolver
- extract out the validations for a valid comment
2019-07-12 08:07:07 -03:00
Robert Schäfer
95a06a8344 Refactor all badges resolvers to use neode
FYI: @Tirokk I think we'll never remove or add new badges through
graphql. Instead, we will seed them manually with direct access to the
database. Therefore I removed the respective mutations and also your
tests regarding permissions.
2019-07-10 14:36:42 +02:00
Robert Schäfer
8c18b9c59b Allow to list all badges 2019-07-10 12:36:19 +02:00
Wolfgang Huß
e69f292bd8 Hashtags restricted in the chars, in Editor Suggestions and Backend
Refactor Seeding with Tag ids as Tag names.
In Frontend: Done as a suggestion with all the forbidden chars removed.
In Backend by Regex only the fitting links.
Rewrite backend test to make sure Hashtag „id“ is the name of the Hashtag.
Test for „https://www.example.org/#anchor“

Co-Authored-By: mattwr18 <mattwr18@gmail.com>
2019-07-08 19:25:57 +02:00
Wolfgang Huß
ac17f3fe1c Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 779-tags-of-contribution-in-text
# Conflicts:
#	backend/src/middleware/index.js
#	backend/src/schema/resolvers/passwordReset.js
2019-07-04 20:56:14 +02:00
Robert Schäfer
09ff79763d Follow @mattwr18's other suggestion 2019-07-03 23:20:36 +02:00
Matt Rider
e7b70ce7cd Fix failing test after new implementation merged in 2019-07-03 17:08:47 -03:00
Matt Rider
b187fbb7b2 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 779-tags-of-contribution-in-text 2019-07-03 16:30:15 -03:00
Robert Schäfer
10ae4abaae Use neode to bring User mutations under control
This commit takes all backend changes for signup and invite feature. I
was working on these features and removed the generated mutations for
type user along the way.
2019-07-03 15:58:42 +02:00
mattwr18
db3221cec6
Merge pull request #948 from Human-Connection/dependabot/npm_and_yarn/backend/graphql-shield-6.0.2
Bump graphql-shield from 5.6.2 to 6.0.2 in /backend
2019-07-02 13:38:57 -03:00
mattwr18
7fa3cc7709
Merge pull request #919 from Human-Connection/778-categories-for-posts
Post with categories
2019-07-02 12:20:43 -03:00
Matt Rider
17ff9c4c0f Add caching rule to allow for upgrade 2019-07-02 08:36:47 -03:00
Matt Rider
0982ca716b Fix lint 2019-07-01 18:17:09 -03:00
Matt Rider
f302961376 Get categories working with UpdatePost, refactor 2019-07-01 18:00:55 -03:00
Wolfgang Huß
a4cf2d3ee8 Store Hashtags of Post content in database and write a lot of tests
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
2019-07-01 20:13:28 +02:00
Wolfgang Huß
c81b495186 Lint fix 2019-06-28 17:12:14 +02:00
Wolfgang Huß
28e4433b87 Refactoring and second approach to change the database 2019-06-28 16:47:26 +02:00
Wolfgang Huß
1d1959561b First approach to extract the Hashtags in the middleware and change the database 2019-06-28 08:14:37 +02:00
ALau2088
5e9f46405e Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 552-update_comment 2019-06-27 10:18:53 -07:00
Matt Rider
07576d084c Get categories working with CreatePost 2019-06-26 15:59:57 -03:00
senderfm
74cbe47485 region and place is no longer created twice. 2019-06-25 07:43:27 +02:00
Wolfgang Huß
1f0f8c9e39 Set Hashtag also by press space and creates then a new one
Changed Tag permissionMiddleware from isAdmin to allow.
2019-06-24 09:25:36 +02:00
Robert Schäfer
181b4b48e6
Merge pull request #829 from Human-Connection/2019/kw24/fix_imported_img_urls
🍰 2019/kw24/fix_imported_img_urls
2019-06-21 23:41:32 +02:00
7613ddfc04
lint fixes 2019-06-19 13:36:14 +02:00
65471efb0d
removed fixImageUrls reference 2019-06-19 13:08:51 +02:00
8984df9371
lint fixes 2019-06-18 17:43:00 +02:00
98dbf801ab
Merge branch 'master' into 2019/kw24/fix_imported_img_urls
# Conflicts:
#	backend/src/middleware/fixImageUrlsMiddleware.js
#	backend/src/middleware/fixImageUrlsMiddleware.spec.js
2019-06-17 13:24:29 +02:00
Robert Schäfer
c9ea956f85 Test+Implement resetPassword 2019-06-16 23:32:16 +02:00
Robert Schäfer
e44ed7d281 Start writing a resolver for requestPasswordReset 2019-06-15 15:42:17 +02:00
Matt Rider
664a8b327f Merge branch 'master' of github.com:Human-Connection/Human-Connection into 404-delete-user-account-and-data 2019-06-14 11:37:45 -03:00
794bb08f14
removed reference for fixImageUrls middleware 2019-06-14 14:04:15 +02:00
89d630b1eb
removed fixImageUrlsMiddleware 2019-06-14 14:03:37 +02:00
Robert Schäfer
eb4b05e431 Add relevant permissions to let cypress tests pass 2019-06-14 10:14:48 +02:00
Robert Schäfer
fc4e9f40b3 Whitelist queries/mutations, fix backend tests 2019-06-13 23:29:29 +02:00
ALau2088
3cc05c0916 add backend managecomments tests 2019-06-13 13:00:20 -07:00
Matt Rider
589fb16c51 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 404-delete-user-account-and-data 2019-06-13 14:59:23 -03:00
ALau2088
d91221fe7e Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 552-update_comment 2019-06-13 10:22:25 -07:00
Robert Schäfer
113cf04c60 Fix build 2019-06-13 00:26:20 +02:00
Robert Schäfer
4166936e5f Fix #800
Ok, so apparently all we have to do is to remove the `/api` prefix from
fixImageUrlMiddleware. I guess that's just a leftover.
2019-06-12 23:27:43 +02:00
Matt Rider
70567857e8 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 404-delete-user-account-and-data 2019-06-12 15:51:38 -03:00