418 Commits

Author SHA1 Message Date
Wolfgang Huß
3b88c47206 Update the contentExcerpt
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
2019-07-16 15:48:38 +02:00
Wolfgang Huß
e4fd7f4cf7 Merge branch '552-update_comment' of https://github.com/Human-Connection/Human-Connection into 552-update_comment 2019-07-16 15:11:41 +02: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ß
9203f7310d Edit Comment content not contentExcerpt
Comment button now only active, if the comment has changed.
Remove `console.log`.
2019-07-16 11:48:33 +02:00
Wolfgang Huß
75758ab2e7 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 552-update_comment 2019-07-16 09:29:22 +02:00
Matt Rider
c7dc2f6a5c Hide CommentForm when an edit is in progress
- Follow @Tirokk PR review
2019-07-15 19:09:33 -03: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
Matt Rider
cf6ace59aa Merge branch 'master' of github.com:Human-Connection/Human-Connection into 967-filter-post-by-category 2019-07-15 11:34:42 -03:00
Matt Rider
bb4532827a Refactor search input, navbar
- fix search input width on desktop
- removed adding removing classes on focus/blur search input
- fix notifications dropdown on mobile

Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
2019-07-15 11:20:28 -03:00
Matt Rider
b0f999ac05 Fix styling of navbar
- Follow @Tirokk suggestions

Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
2019-07-15 11:06:56 -03:00
Matt Rider
d42083a32e Move header to left, add border left
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
2019-07-15 09:55:09 -03:00
Robert Schäfer
99740e6ad6 Follow @Tirokk's suggestion and rename key=>id 2019-07-13 14:27:19 +02:00
Matt Rider
c7094d82b8 Fix styling, follow @Tirokk suggestions 2019-07-12 10:37:27 -03:00
Matt Rider
2e97af074c Remove duplicate code
- was silly for writing so much duplicate code to change the index of the array
- woke up with inspiration
2019-07-11 07:10:57 -03:00
Matt Rider
b6dcafcc2b Fix linting 2019-07-10 18:52:23 -03:00
Matt Rider
6536574a3b Refactor FilterPosts
- extract FilterPostsMenuItems to its own component
- update tests accordingly
- add _.chunk from lodash to dry out code
2019-07-10 17:10:01 -03:00
Robert Schäfer
9a72e7b9e6 Proper null handling
FYI @mattwr18
2019-07-10 18:01:18 +02:00
Matt Rider
0113751003 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 967-filter-post-by-category 2019-07-10 07:09:58 -03:00
Robert Schäfer
e6e9b1b7d7
Merge pull request #994 from Human-Connection/signup_as_admin
Signup new users as admin
2019-07-10 11:46:50 +02:00
Matt Rider
0d4617399b Fix/add tests 2019-07-09 18:29:31 -03:00
Robert Schäfer
4b308886ff
Merge pull request #976 from Human-Connection/961-thumbnail-for-the-contributions-must-get-a-maximum-height
large images are set to maximum height
2019-07-09 23:21:27 +02:00
Robert Schäfer
4207aee09d DRY up password validations 2019-07-09 22:12:40 +02:00
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
Matt Rider
fdde050f17 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 967-filter-post-by-category 2019-07-09 13:29:23 -03:00
Matt Rider
c7959dadb7 Refactor code
- Remove vuex as we don't need with vue-apollo and watch
- Use chunk[i] instead of firstGroup, etc...
- Extract Category query to its own file
- Mobile responsive categories dropdown
2019-07-09 13:00:08 -03: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
Matt Rider
737d1f839a Style categories filter dropdown, get working with multiple categories 2019-07-08 21:44:47 -03: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
Matt Rider
98080b597d Style categories dropdown items
- it's a vertical list, dealing with difficulties to make it horizontal
2019-07-05 14:34:54 -03:00
Matt Rider
3b6db5f631 Set up posts in store, get working from FilterPosts
- also, set it up to be mobile responsive
2019-07-05 12:47:44 -03:00
Matt Rider
65f11d6f98 Add functionality to filter posts by category
- only filters if you send two requests :'(
2019-07-04 20:32:16 -03: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
senderfm
8de9516b96 large images are set to maximum height fix lint 2019-07-04 11:06:10 +02:00
senderfm
9d6d47cebb large images are set to maximum height 2019-07-04 10:22:03 +02:00
Matt Rider
bb93052b88 Add FilterPosts dropdown with category names 2019-07-03 19:46:49 -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
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