681 Commits

Author SHA1 Message Date
Wolfgang Huß
43e401293d Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1707-reporting-with-specific-information 2019-10-07 08:45:34 +02:00
aonomike
64b9ca7f43 Implement dislplay email for admins 2019-10-04 16:55:53 +03:00
mattwr18
908bc2a8c9
Merge pull request #1807 from Human-Connection/1669-show-edited-for-posts-comments
Show that a Post/Comment has been edited
2019-10-04 14:18:44 +02:00
Robert Schäfer
b881641f19
Merge pull request #1796 from Human-Connection/consisten-image-cropping
Max aspect ratio of 1:1 for Post index page
2019-10-04 14:00:12 +02:00
mattwr18
fd388fc1ba Fix tests for changed implementation
- we do not display a load more button when there are clearly no more
posts to load... if there are at least 6, the pageSize, we display it
because there might or might not be posts to load
2019-10-04 12:34:48 +02:00
mattwr18
3b5e39c54d Update orderBy, remove >=, more realistic seed data 2019-10-04 11:42:55 +02:00
Wolfgang Huß
b4f47997b3 Centralized and refactored report mutations and queries 2019-10-04 10:40:18 +02:00
roschaefer
3912b21ea2 refactor: use named slot for additional text
@mattwr18 I can see odd behaviour of the EDITED marker on mobile: The
text would just overlap.

The current behaviour has its flaws, e.g. if you have a long text it
won't wrap but overflow the comment card. But putting the additional
text into a named slot is certainly better than adding some nodes next
to the `<hc-user>` component.
2019-10-04 01:00:31 +02:00
aonomike
eae19ca33d Display user email for administrators 2019-10-03 14:31:39 +03:00
mattwr18
a5e3c52e1d Show that a Post/Comment has been edited 2019-10-03 12:01:04 +02:00
mattwr18
6f1c5e3efa Set hasMore to false when returned Posts are equal to pageSize
- this was causing bugs on User profile page, and saves a database call
2019-10-03 11:04:23 +02:00
mattwr18
4aeaa58eb6 Max aspect ratio of 1:1 for Post index page
- we are currently enforcing a 1:1 max ratio on the root path and would
like to maintain consistency
2019-10-02 16:53:24 +02:00
roschaefer
56ce95a6fd refactor: follow review of @alina-beck + @mattwr18 2019-10-02 15:50:35 +02:00
mattwr18
263b7d0aea Fix lint 2019-10-02 10:11:39 +02:00
roschaefer
4ac80b0d58 refactor: align submit buttons consistently
@alina-beck said we have most buttons left-aligned, so I went with that:
https://github.com/Human-Connection/Human-Connection/pull/1711#discussion_r329505767

Also this uses icon `envelope` for emails. This makes sense, because we
could use icon `at` for slugs.
2019-10-02 01:10:28 +02:00
roschaefer
01e583b45e Translate backend error and avoid $toast 2019-10-02 00:54:01 +02:00
roschaefer
76841d27f1 Styling 2019-10-02 00:54:01 +02:00
roschaefer
573edce788 Show at least the error message in SSR 2019-10-02 00:54:01 +02:00
roschaefer
3e3452c7bc Better help messages, styling 2019-10-02 00:54:01 +02:00
roschaefer
69cd41d3eb Test email verification page 2019-10-02 00:54:01 +02:00
roschaefer
6a212fb668 Test verify-nonce page 2019-10-02 00:54:01 +02:00
roschaefer
f61441d3e6 Test my-email-address settings page 2019-10-02 00:54:01 +02:00
roschaefer
89cc6da5f1 Don't redirect if email change was not successful 2019-10-02 00:54:01 +02:00
roschaefer
9808e1c4f8 Validate different email address 2019-10-02 00:54:01 +02:00
roschaefer
69542617ac Split routes in two
So, to get a direct link it's better to have one route that calls a
mutation as soon as it is visited.
2019-10-02 00:54:01 +02:00
roschaefer
0592f685f6 Basic email change works 2019-10-02 00:54:01 +02:00
roschaefer
80ce079920 Implement first page to change email address 2019-10-02 00:54:01 +02:00
Vasily Belolapotkov
2c705a8680 sync with master to resolve merge conflicts 2019-09-29 20:33:39 +03:00
Alexander Friedland
deb21f6edb
Merge branch 'master' into Allow_embedded_code_in_posts_permanent_memory 2019-09-25 19:11:05 +02:00
ogerly
e8f771b59a first mega PR crazy update, all work 2019-09-25 18:39:01 +02:00
mattwr18
0f40df7cb4 Fix bug UpdateComment, Fix styling on Comment
- There was a bug that updates to comments were not being displayed
because of a v-show... https://vuejs.org/v2/guide/conditional.html#v-if-vs-v-show
Basically, what it says that is important for this bug is
"v-if...ensures that event listeners and child components inside the
conditional block are properly destroyed and re-created during toggles"

- Since we are using the editor to display comments in ContentViewer, we
need to set the min-height to 0px

- Co-authored-by: Alina Beck <alina.beck@mail.com>
- Co-authored-by: Robert Schäfer <git@roschaefer.de>
2019-09-25 13:39:18 +02:00
Vasily Belolapotkov
50feeed8bf fix the bug with scrolling post comments into view 2019-09-24 12:47:42 +03:00
ogerly
044e2bfed9 Allow embedded code in posts permanent in database 2019-09-23 20:08:45 +02:00
ogerly
4b11168687 confirm embeded iframes only frontend style 2019-09-23 16:11:20 +02:00
ogerly
e4c7c1125d zwischenspeichern 2019-09-23 09:11:41 +02:00
roschaefer
c378505293 Add one test case for update user form 2019-09-20 20:30:57 +02:00
roschaefer
b4ffa13517 Fix webapp tests by disabling the slug validations 2019-09-20 20:05:27 +02:00
roschaefer
be6c4a6f7c Refactor to use FormSchema
That way we can re-use the code for slug validation in the
CreateUserAccount component
2019-09-20 20:05:27 +02:00
roschaefer
efe9c96edb Obviously your own slug does not matter 2019-09-20 20:05:27 +02:00
roschaefer
e6d7d1a936 Fix #1650 2019-09-20 20:05:27 +02:00
Alexander Friedland
006d6e8eeb
Merge pull request #1646 from Human-Connection/changelog
Point the changelog to Github
2019-09-19 20:19:26 +02:00
Robert Schäfer
d830fa4ae4
Merge pull request #1596 from Human-Connection/1583-follow-mutation
Improve follow/ufollow mutation
2019-09-19 16:54:35 +02:00
roschaefer
b761eea700 Point the changelog to Github
The justification for this change is that the releases page on Github
is more likely to keep up to date than our changelog.

This also means that our changelog is not translated. But I think that's
fine.
2019-09-19 13:21:51 +02:00
Vasily Belolapotkov
39db954ec6 improve follow/unfollow mutation usage 2019-09-19 12:10:59 +03:00
roschaefer
ec7d9753db Follow @alina-beck's PR review
https://github.com/Human-Connection/Human-Connection/pull/1640#pullrequestreview-290089879
2019-09-18 23:32:10 +02:00
roschaefer
85f1773211 Add slug to user profile page 2019-09-18 17:15:04 +02:00
ogerly
c23212b306 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into links_to_imprint_and_privacy_policy_changed_to_human-connection.org 2019-09-18 10:10:59 +02:00
ogerly
94599c624b Delete dead code 2019-09-18 10:10:24 +02:00
roschaefer
431de3319f Make data-hashtag-id authoritive for #links
This adds consistency: The mention links with `@` was implemented
that way already. Instead of parsing the URL, we add some redundancy and
add another attribute: data-hashtag-id

So, what characters are valid for html attributes?
Read: https://stackoverflow.com/questions/925994/what-characters-are-allowed-in-an-html-attribute-name

Thanks to @Tirokk, who added some validations on the hahstag ids, I
think we are all set. If you try to write a hashtag with a `"` double
quotation mark for example, it gets automatically replaced with a valid
hashtag. If someone wants to send us invalid hashtag ids to the backend
directly, the regex there would filter it out.
2019-09-16 23:09:32 +02:00
Wolfgang Huß
2ad4bb3476 Fix decodeURI on indexpage 2019-09-16 22:06:36 +02:00