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
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
mattwr18
97f31abccd
Merge pull request #905 from Human-Connection/850-api-mapbox-check-place-or-region 
region and place is no longer created twice.
 2019-07-02 12:18:12 -03:00
Matt Rider
677f657b2e Update schemas, fix typo 
Co-authored-by: Robert Schäfer <git@roschaefer.de>
 2019-07-02 10:40:32 -03:00
Robert Schäfer
0bc1444336 Explicitly define all comment mutations in schema 
Remove `postId` as part of the to-be-saved comment type.
 2019-07-02 15:11:21 +02:00
Matt Rider
17ff9c4c0f Add caching rule to allow for upgrade 2019-07-02 08:36:47 -03:00
Matt Rider
b034d22732 Fix failing cypress test 2019-07-01 18:50:24 -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ß
69070f824c Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 779-tags-of-contribution-in-text 
# Conflicts:
#	webapp/components/ContributionForm/ContributionForm.spec.js
 2019-07-01 20:18:09 +02: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
Matt Rider
b8ea32cfc1 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 778-categories-for-posts 2019-07-01 15:06:52 -03:00
mattwr18
730c18faec
Merge pull request #935 from Human-Connection/fix_cypher_injection 
Patch cypher injection vulnerability
 2019-07-01 12:30:31 -03:00
Ulf Gebhardt
a264ff8eee
emotion data modelling 2019-07-01 16:21:11 +02:00
Robert Schäfer
4e687a06ea Patch cypher injection vulnerability 
@mattwr18 this patches the vulnerability. However we should never do
string interpolation with user input.
 2019-06-29 13:48:40 +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
Matt Rider
865e2c0ec3 Refactor resolver, rename params 
- Use one cypher statement

Co-authored-by: Tirokk <wolle.huss@pjannto.com>
 2019-06-28 10:17:22 -03: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
Matt Rider
351f258fab Refactor resolver, write component tests 
- use UNWIND instead of iterating over categories(cypher magic)
- do not return nested categories on post creation as it's expensive and we don't use
- refactor backend test
- component tests for CategoriesSelect
 2019-06-27 16:57:55 -03:00
ALau2088
912b94d43c add EditCommentForm spec.js 2019-06-27 10:59:53 -07: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
Wolfgang Huß
d80e38ede8 Merge remote-tracking branch 'origin/master' into 779-tags-of-contribution-in-text 
# Conflicts:
#	webapp/components/ContributionForm/ContributionForm.spec.js
 2019-06-27 10:27:39 +02:00
Matt Rider
07576d084c Get categories working with CreatePost 2019-06-26 15:59:57 -03:00
Matt Rider
46b83c540d Add contentExcerpt to CreatePost Mutation 2019-06-26 13:53:11 -03:00
Matt Rider
d714927315 Set up backend for Post creation with categories 2019-06-26 11:26:44 -03:00
senderfm
6c7ee1ef42 das einmalige melden eines User, Beitrags oder Kommentars 
ist jetzt möglich
 2019-06-25 17:51:14 +02:00
Matt Rider
9f8720df81 Remove need for third party url upload 
- we can save the file to a variable, it requires a "url" returned
- we can get by returning an empty string
 2019-06-25 12:09:48 -03:00
Matt Rider
145f488556 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 759-teaser-image-create-posts 2019-06-25 09:41:40 -03:00
senderfm
74cbe47485 region and place is no longer created twice. 2019-06-25 07:43:27 +02:00
Matt Rider
c6203ad8eb Refactor CreateComments functionality 
- update apollo cache on successful mutation
- remove global event listener
- avoid refetch Post to update CommentsList
- return comment with its author from resolver
 2019-06-24 18:21:52 -03:00
Matt Rider
b84bd6fbb3 Try with imageUrl 2019-06-24 11:44:03 -03: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
Matt Rider
f551e9a637 Fix failing build due to lorempixel.com being down 2019-06-22 12:01:00 -03:00
Matt Rider
bbeb61e1eb Merge branch 'master' of github.com:Human-Connection/Human-Connection into 759-teaser-image-create-posts 2019-06-21 18:51:34 -03: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
Matt Rider
be70088dd7 Get imageUpload working for Posts 2019-06-20 17:05:47 -03:00
Robert Schäfer
da30001ba8 Testing mail delivery with a remote SMTP server 2019-06-20 15:54:56 +02:00
Robert Schäfer
1ed338542c Another suggestion by @Tirokk 2019-06-20 15:33:48 +02:00
Robert Schäfer
9ec9034ea5 Fix translatios as suggested by @Tirokk 2019-06-20 15:25:59 +02:00
Robert Schäfer
9dd340c69b Template emails based on postmark-templates 
Credit: https://github.com/wildbit/postmark-templates/

Also we distinguish now if a user has been found and if not. The
password reset link brings us directly to the last step in the flow.
 2019-06-20 01:29:50 +02:00
Robert Schäfer
61ad100bfb Get rid of unnecessary .env var - document it 2019-06-20 00:09:26 +02:00
Robert Schäfer
3f5e9a21cc Disable SEND_MAILS for local development and test 
.. but enable it by default for `docker-compose.override.yml`. If the developer
uses `docker-compose` we can safely assume that a local smtp server for
development is running.
 2019-06-19 15:03:38 +02:00
Ulf Gebhardt
7613ddfc04
lint fixes 2019-06-19 13:36:14 +02:00
Ulf Gebhardt
65471efb0d
removed fixImageUrls reference 2019-06-19 13:08:51 +02:00
Robert Schäfer
29b910cfb7 Really basic passwordReset flow works 2019-06-18 23:28:06 +02:00
Robert Schäfer
ba185bcb65 Refactor backend 2019-06-18 19:03:59 +02:00
Ulf Gebhardt
8984df9371
lint fixes 2019-06-18 17:43:00 +02:00
Ulf Gebhardt
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
5a806ca99e Remove duplicate test case 2019-06-17 12:24:14 +02:00