685 Commits

Author SHA1 Message Date
mattwr18
fee7f9ff12
Merge pull request #1872 from Human-Connection/1733-fix
🍰 Fix - maintaining sorting after navigation
2019-10-22 12:47:18 +02:00
mattwr18
98e3bb40d5
Merge pull request #1906 from Human-Connection/add_storybook_stories_for_our_university_students
Add storybook stories for our university students
2019-10-22 11:58:17 +02:00
mattwr18
333b38d1b2 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1733-fix 2019-10-22 11:07:29 +02:00
mattwr18
6d1044d292 Hide new CommentForm while editing a comment 2019-10-21 16:08:01 +02:00
Wolfgang Huß
b6d7f9c59b Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1710-list-and-protocol-moderation 2019-10-21 12:40:16 +02:00
roschaefer
16d07bd3ba refactor: lint, frontend tests, vuex store
This fixes the lint errors and failing frontend tests. Also, when the
user chooses another orderBy, the menu gets translated.

The refactoring moves code and complexity into the vuex store where it
can be tested separately.
2019-10-18 21:58:53 +02:00
mattwr18
e37736500a Move comment to above relevant code 2019-10-18 19:05:00 +02:00
mattwr18
7e40295129 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1205-pinned-post-for-admins 2019-10-18 19:03:45 +02:00
Nimit Bhargava
7330987a69 fix - maintaining sorting after navigation 2019-10-18 16:03:14 +02:00
Wolfgang Huß
965882885a Refactor moderators report list 2019-10-18 15:41:18 +02:00
mattwr18
411bbabcd5 Add profilePagePostsQuery to deal with bug
- we do not want to add pinnedPosts to every user's profile page
2019-10-18 00:42:44 +02:00
roschaefer
25f2fc358d fix: console warnings during frontend tests 2019-10-18 00:21:43 +02:00
mattwr18
b45fd51d15 Pin post on user profile as well 2019-10-18 00:13:01 +02:00
mattwr18
b800c7d5c9 Resolve pinnedAt undefinedToNull, clean up
- this was causing the noftications to break since they were using the
post fragment and pinnedAt was returning null
- remove unused bits of code
- revert changes to cypress since they were not causing the error
- can be changed in another PR
2019-10-18 00:01:46 +02:00
mattwr18
8b27250393 Fix vue warning webapp, try to find source of cypress failure
- clean up
2019-10-17 22:44:44 +02:00
mattwr18
973912fb87 Add tests for unpinPost, refactor
- following @roschaefer's PR review suggestions
- simplify UpdatePost by using pinPost/unpinPost
- did not remove filtering because attempting to have two queries caused
problems as well to do with duplicate records, etc... and it's working
now
2019-10-17 21:51:41 +02:00
roschaefer
3e04b26068 Add styling to pinned post 2019-10-17 17:56:16 +02:00
mattwr18
f871df02ae Start setting up frontend pinning/unpinning
- Add pin/unpin post to content menu
- Update apollo cache to reactively unpin
- Update apollo cache in root path to re-order Posts
- Order with pinned post first
- Start setting up filters, so that the pinned post is always the first
post visible
2019-10-17 17:56:16 +02:00
roschaefer
8dff7496c0 refactor: create LoginForm component
I moved most code in pages/login.vue to a separate LoginForm component.
The intention is to have a separate vue storybook for the LoginForm
component.
2019-10-16 12:16:38 +02:00
Robert Schäfer
0a0690aabd
Merge pull request #1903 from Human-Connection/highlight-linked-comment
Highlight and expand linked comment
2019-10-16 12:13:16 +02:00
Wolfgang Huß
6dff10b236 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1707-reporting-with-specific-information 2019-10-16 09:27:13 +02:00
roschaefer
6a50ef6134 fix: storybook story of Comment.vue
This is the best solution that I can think of right now. Sure, it's not
so great to pass a property down from the page component. But at least
it fixes the storybook story, which is something.
2019-10-16 01:14:32 +02:00
mattwr18
e8c6941142 Follow @roschaefer's PR review suggestions
- disable button if form.reasonCategory is falsy
- extract valuesReasonCategoryOptions to global constant
- extract reasonCategoryOptions to created lifecycle hook to keep data()
clean and use map
- extract formSchema to components/utils and test
- remove validator from formSchema and validate based on "Deep Rules" https://github.com/yiminghe/async-validator#deep-rules
- Use v-model to update reasonCategory and reasonDescription
- default to error message in English from backend
- Update template slot to use new syntax
2019-10-15 20:28:25 +02:00
mattwr18
b605dd12c5
Keep images from distorting or getting cropped
great explanation by @alina-beck

Co-Authored-By: Alina Beck <alina.beck@mail.com>
2019-10-14 19:15:22 +02:00
mattwr18
3e72660ed8
Keep images from distorting or getting cropped
Co-Authored-By: Alina Beck <alina.beck@mail.com>
2019-10-14 19:14:27 +02:00
mattwr18
c45f63ffd9 Follow @alina-beck PR suggestions 2019-10-14 16:42:11 +02:00
mattwr18
1c6b5f941b Remove aspect ratio on cropper, limit to max-height 2000px
- discussed it today's internal meeting and agreed upon with
@alina-beck, @Tirokk, @ogerly, @datenbrei, Dennis Hack

- max-height was a suggestion and can be changed at any time
2019-10-14 16:42:11 +02:00
Wolfgang Huß
8bc939c2da Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1707-refactor-db-reporting-with-specific-information 2019-10-14 13:36:24 +02:00
Wolfgang Huß
3bb4d67350
Merge pull request #1863 from Human-Connection/1645_case_insensitive_email
fix: search for email case-insensitively
2019-10-14 11:01:26 +02:00
Wolfgang Huß
1c8385120c Add date-time to the moderators report list 2019-10-11 16:36:37 +02:00
mattwr18
dab05d9e67 Fix embeds settings page
- Dockerfile was not copying providers.json
- Fix file path to providers.json
- Update template to show message based on allowEmbedIframes

Co-authored-by: Robert Schäfer <git@roschaefer.de>
Co-authored-by: Mike Aono <aonomike@gmail.com>
2019-10-11 14:01:39 +02:00
mattwr18
596b8de615
Merge pull request #1805 from Human-Connection/1754-fix-buggy-profile-page-posts-duplicates
Update profile posts apollo query
2019-10-11 10:05:21 +02:00
Wolfgang Huß
2a034ee74f Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1707-reporting-with-specific-information
# Conflicts:
#	webapp/locales/de.json
2019-10-11 08:16:00 +02:00
roschaefer
c1a696577b fix: search for email case-insensitively 2019-10-11 02:40:48 +02:00
mattwr18
7430fdffa9
Merge pull request #1814 from Human-Connection/1785-register_as_new_user
Implement public registration
2019-10-11 01:25:44 +02:00
roschaefer
01252b3584 refactor: follow @mattwr18 code review
https://github.com/Human-Connection/Human-Connection/pull/1814#pullrequestreview-299434476
2019-10-11 00:54:19 +02:00
roschaefer
adec248b18 fix: compare env var with value to avoid type err 2019-10-11 00:54:19 +02:00
roschaefer
8305921f00 Fine tune layout and spacing 2019-10-11 00:54:19 +02:00
roschaefer
9ac1e333d6 feat: implement public registration checks 2019-10-11 00:54:19 +02:00
roschaefer
4c7cc0a9cf refactor: DRY template in pages, fix signup flow 2019-10-11 00:54:19 +02:00
roschaefer
1dc4bc1411 feat: add slot to EnterNonce for back to home link 2019-10-11 00:54:19 +02:00
roschaefer
bb5d581906 refactor: restructure translations and components 2019-10-11 00:54:19 +02:00
roschaefer
7a276db42f fix: remove obsolete css, add link to login page 2019-10-11 00:54:19 +02:00
roschaefer
71e94d88c6 feat: add page component for public registration 2019-10-11 00:54:19 +02:00
roschaefer
ba27d2189d Remove obsolete code 2019-10-10 19:38:52 +02:00
roschaefer
465a46c8d4 refactor: reduce code on settings/embeds 2019-10-10 19:29:35 +02:00
roschaefer
c3b2b4fcac Structure translations based on file locations 2019-10-10 18:27:56 +02:00
ogerly
dbbece43b5 List of providers is always visible, button color changed, info text adapted 2019-10-09 16:52:48 +02:00
Wolfgang Huß
377dc2af53 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1707-reporting-with-specific-information 2019-10-09 16:23:53 +02:00
ogerly
3c04e1a328 code blockuser in settings add 2019-10-08 19:00:14 +02:00