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

379 Commits

Author SHA1 Message Date
Robert Schäfer
47a9d38790 Consistency for email success messages 2019-07-09 22:12:40 +02:00
Robert Schäfer
90aa1822b5 Disable the form button with a slot scope 2019-07-09 22:12:40 +02:00
Robert Schäfer
29bbeaa0fa Fix tests by calling wrapper.html() once more 
I really don't understand why, but apparently `wrapper.html()` does some
re-rendering which in our cases fixes the tests, because we reach the
new sub component in the DOM tree.
 2019-07-09 22:12:40 +02:00
Robert Schäfer
d76923c471 Copy all relevant files changed from branch signup 2019-07-09 22:12:40 +02:00
Robert Schäfer
6f24f066d6 Revert "Get rid of obsolete /search/hashtag page" 
This reverts commit ec19c732e5678544d8dfd50c25f2c33e5aeb217e.

Ok, native module URL cannot parse relative URLs. It ensures that all parts
of the URL are present. So I'll revert this to get the ball rolling. We
can refactor out the obsolete page later on.

FYI @Tirokk
 2019-07-09 14:39:28 +02:00
Robert Schäfer
ec19c732e5 Get rid of obsolete /search/hashtag page 
@Tirokk there is this neat URL module: https://nodejs.org/api/url.html

It has convenience methods for adding query params. I'm just not quite
sure about browser compatibility though.
 2019-07-08 23:10:46 +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ß
1c8dac7359 Get the links of the Tags in the Post as a URL driven query to work 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-07-04 19:55:06 +02: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
senderfm
0c1403dda5 fix conflict 2019-07-03 10:06:48 +02:00
Alexander Friedland
76388d4c4b
Merge pull request #908 from Human-Connection/785-reporting-a-user-post-or-comment 
the one-time reporting of a user, post or comment
 2019-07-03 08:44:19 +02:00
Matt Rider
2407f0b0d1 Add basic styling for comment list 2019-07-02 19:14:18 -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
82c08b17b4
Merge pull request #933 from Human-Connection/907-Mobile-Responsive-Menu-Navbar 
907 mobile responsive menu navbar
 2019-07-02 12:18:59 -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
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
Matt Rider
2edf99148d Remove test 
- we don't set the form language because we want to have the name of the language as a placeholder, not its code
 2019-07-01 08:22:46 -03:00
Matt Rider
51a7a0e5d8 Add back test accidentally deleted 2019-07-01 07:29:06 -03:00
senderfm
d7b423ec61 code variable designation changed from isActive to isCollapsed 2019-07-01 12:17:14 +02:00
senderfm
e255b71cc8 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 844-Comments-cannot-be-expanded-if-they-are-too-long 2019-07-01 11:19:01 +02:00
Wolfgang Huß
118e53fa02 Added a missing Deletable 2019-06-29 19:21:20 +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
senderfm
ac6da2e42c fixed lint und test ok 2019-06-28 11:19:22 +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
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
Wolfgang Huß
12418eefd9 Little refactoring 2019-06-27 11:10:42 +02: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
bb40e9d432 Update component tests for categories 2019-06-26 18:21:12 -03:00
Matt Rider
07576d084c Get categories working with CreatePost 2019-06-26 15:59:57 -03:00
Matt Rider
2baaf85b21 Extract TeaserImage component, refactor tests 2019-06-25 20:49:09 -03:00
Matt Rider
6d8e981043 Fix styling for EditPost teaser image 2019-06-25 19:20:26 -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
e0c7566edd variable changed 2019-06-25 12:09:50 +02:00
Robert Schäfer
ef9b43f1da
Merge pull request #901 from Human-Connection/900-refactor-create-comments-mutation-remove-global-event-listener-update-cache 
Refactor CreateComments functionality
 2019-06-25 11:49:19 +02:00
Robert Schäfer
9b7a0f0031
Merge pull request #898 from Human-Connection/895-write-component-tests-for-update-post 
Write tests for UpdatePost, refactor tests
 2019-06-25 11:47:04 +02:00
Wolfgang Huß
58810c6add Merge branch '779-tags-of-contribution-in-text' of https://github.com/Human-Connection/Human-Connection into 779-tags-of-contribution-in-text 2019-06-25 08:53:47 +02:00
Matt Rider
6908cd6316 Fix lint 
- remove unused variable
 2019-06-24 19:11:59 -03: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
49fff114b3 Write tests for UpdatePost, refactor tests 2019-06-24 16:38:33 -03:00
Matt Rider
7796483a46 Add test for upload error, update variable name 2019-06-24 12:45:53 -03:00
Wolfgang Huß
8c2c731322 Backfactored as close as possible to original of Mention.js 2019-06-24 12:34:14 +02:00
senderfm
a678f05574 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 844-Comments-cannot-be-expanded-if-they-are-too-long 2019-06-24 11:32:41 +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