419 Commits

Author	SHA1	Message	Date
mattwr18	17f2c990db	Fix lint	2019-09-11 16:40:39 +02:00
Brent Vardy	53408f4bf4	refactor create-user-account to have no header ... - also added locale switch to card	2019-09-11 16:40:39 +02:00
Brent Vardy	ea16d1652a	used no header for login and password reset pages ... - added locale switch back on login - added locale switch to password reset - increased width of login and password reset - added logo to password reset - co-authored-by: mattwr18 <mattwr18@gmail.com> - co-authored-by: mikeaono <aonomike@gmail.com>	2019-09-11 16:40:39 +02:00
Brent Vardy	e9ac462889	update name of blanks layout to basic layout	2019-09-11 16:40:39 +02:00
Brent Vardy	e0fec965dc	improved navigation layout when not logged in, moved locale selector to nav on login page	2019-09-11 16:40:39 +02:00
Brent Vardy	6589fe10af	WIP - refactor of blank layout to have header and footer	2019-09-11 16:40:38 +02:00
Brent Vardy	a751a10783	update login page to use blank layout	2019-09-11 16:40:38 +02:00
Robert Schäfer	5586a2b5ea	Merge pull request #1512 from Human-Connection/refactor_email_middleware ... Refactor email middleware	2019-09-11 01:58:37 +02:00
mattwr18	0c83d276bb	Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1488-filter-posts-by-emotion	2019-09-10 09:32:45 +02:00
Alexander Friedland	f327cc01dd	Merge pull request #1539 from Human-Connection/1462-Sorting_dropdown_should_be_aligned_with_post_cards ... [WIP] Sorting dropdown is aligned with post cards	2019-09-09 19:18:12 +02:00
Wolfgang Huß	f1b52c7b81	Merge pull request #1536 from Human-Connection/fix-test-set-up ... Fix test by setting value of the mocked hashtag	2019-09-09 17:17:44 +02:00
mattwr18	ba3e0ca941	Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1488-filter-posts-by-emotion	2019-09-09 16:59:35 +02:00
ogerly	e278fa4afc	Padding remove	2019-09-09 16:45:11 +02:00
aonomike	34ddd12948	Fix test by setting value of the mocked hashtag ... - The test wasnt testing anything as the hashtag value was defaulting to null - Fixed by setting value of hashtag to a string and then testing if the clearSearch works	2019-09-09 16:22:21 +03:00
mattwr18	2aef2add3d	Add temporarily console.log statements to debug failed API call ... - in production environment, the user locationName is updated, but it is failing the `createOrUpdateLocations` function in backend/src/middleware/nodes/locations.js For some reason, it seems like the API call is coming back with something other than what we are looking for. Need help debugging... we can remove this code after we figure out what's wrong	2019-09-09 12:53:47 +02:00
aonomike	11dd61c430	Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1488-filter-posts-by-emotion	2019-09-09 12:29:57 +03:00
mattwr18	e819ade8cb	Add console.log statement on error to help debug ... - Geolocation is working in development, but not on staging or production	2019-09-09 09:54:38 +02:00
mattwr18	3d419c1f21	Merge pull request #1508 from Human-Connection/1505_remove_html_in_moderation_view ... Fix #1505 remove html	2019-09-09 08:49:00 +02:00
mattwr18	07c58fc03e	Add emotions buttons, get it filtering	2019-09-07 12:37:03 +02:00
roschaefer	2ca508ba2f	Rename code => nonce in webapp/	2019-09-06 19:31:04 +02:00
Wolfgang Huß	80d1e03c03	Merge pull request #1510 from Human-Connection/1506-anonymize_deleted_user ... 1506 Anonymize deleted user also for moderators	2019-09-06 17:12:31 +02:00
roschaefer	1bd57dfeb8	Fix console.errors in test	2019-09-06 16:42:16 +02:00
Wolfgang Huß	f0923ad864	Add hashtag for the comment id to the comments links of the list	2019-09-06 15:55:11 +02:00
Wolfgang Huß	40103e84e7	Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1505_remove_html_in_moderation_view	2019-09-06 15:52:47 +02:00
Wolfgang Huß	a82882529c	Merge pull request #1504 from Human-Connection/fix_broken_pagination_on_user_profile ... Fix leftover of #1479	2019-09-06 14:37:20 +02:00
Robert Schäfer	1932c03b95	Merge pull request #1509 from Human-Connection/1199-fix-preview-image-craziness ... Fix preview image craziness	2019-09-06 14:02:18 +02:00
roschaefer	a053181334	Fix #1506	2019-09-06 13:29:53 +02:00
mattwr18	daf1ae864c	Reuse css from ds-card-image, consistent width ... - the width of the contribution form is now the same as the post card	2019-09-06 13:08:28 +02:00
roschaefer	4005d2fb01	Fix #1505 remove html	2019-09-06 12:10:41 +02:00
roschaefer	0b464bf596	Fix leftover of #1479	2019-09-06 10:22:11 +02:00
roschaefer	c61b03483e	Failed to write a test for admin/index.vue ... I am not able to properly mock the data for ApolloQuery. However I find it valuable to push this particular piece of dead code. Maybe people find it helpful.	2019-09-05 19:07:12 +02:00
roschaefer	c129c3fbae	Admin page handles loading and error state	2019-09-05 17:22:04 +02:00
roschaefer	0fca14a29e	Fix nullpointer issues ... It seems that `this.$apollo.queries.Post` can be undefined sometimes. Honestly I don't know why but I could imagine that it might happen on subpages and when the cypress test triggers the infinite loader, we face this bug.	2019-09-05 13:07:22 +02:00
roschaefer	da57e9391c	Fix #1394 ... It seems that we weren't using the API of `vue-apollo` in the right way. The `update` callback is to transform the results (e.g. to map between the server response and a `data` attribute with a different name). For pagination there is a dedicated procedure called `fetchMore`. See: * https://vue-apollo.netlify.com/guide/apollo/pagination.html * https://vue-apollo.netlify.com/guide/components/query.html#query-operations	2019-09-05 11:30:37 +02:00
mattwr18	4e065325d1	Merge pull request #1480 from Human-Connection/cleanup_unused_code ... Remove a lot of unused code, reduce graphql schema	2019-09-05 08:03:39 +02:00
roschaefer	66ed78e19b	Remove a lot of unused code, reduce graphql schema	2019-09-05 03:20:32 +02:00
roschaefer	aea9caee80	Remove slow sorting options ... Sadly, I think this the only way for now. As I explained in https://github.com/Human-Connection/Human-Connection/issues/1272#issuecomment-527864948 I think we cannot do anything about it on our side for now.	2019-09-04 23:46:18 +02:00
Robert Schäfer	8d2ea9c4c0	Merge pull request #1474 from Human-Connection/cursor-fixes ... Cursor fixes	2019-09-04 23:20:57 +02:00
mattwr18	4ca84ee04a	Merge pull request #1334 from Human-Connection/C-1187-terms-and-conditions-confirmed-function ... Check if user has agreed to the current terms and conditions	2019-09-04 20:55:09 +02:00
Alina Beck	d1beed50d7	use masonry grid for related posts	2019-09-04 16:51:08 +01:00
Alina Beck	ba82765fa7	set cursor to auto on post card	2019-09-04 16:23:57 +01:00
ogerly	643b931167	Merge branch 'C-1187-terms-and-conditions-confirmed-function' of https://github.com/Human-Connection/Human-Connection into C-1187-terms-and-conditions-confirmed-function	2019-09-04 07:04:17 +02:00
ogerly	c64ff67a55	Fixed constant for terms and conditions created in folder for constant	2019-09-04 07:03:56 +02:00
Alexander Friedland	e618ff005d	Merge branch 'master' into C-1187-terms-and-conditions-confirmed-function	2019-09-04 06:42:40 +02:00
mattwr18	290bdf5ff4	Merge pull request #1440 from Human-Connection/1414-soft_delete ... 1414 Implement soft delete	2019-09-03 23:59:52 +02:00
roschaefer	5f14b4c45f	Fix lint	2019-09-03 23:19:55 +02:00
roschaefer	99dd6ea20a	Centralize fragments, fix @mattwr18's bugs ... Most of those bugs weren't even introduced in this PR, e.g. the missing `this.$i18n` for the comments mutations.	2019-09-03 21:28:29 +02:00
roschaefer	bb3f419532	Refactor graphql queries and fix bug ... It's sometimes unbelievable how many bugs you find when doing refactoring. This time there was some apparent confusion about `commentsCount` and `commentedCount`. The counters on the post card were never showing the correct number.	2019-09-03 21:28:29 +02:00
roschaefer	491a626031	Replace deleteComment with a more KISS solution	2019-09-03 21:28:29 +02:00
Alexander Friedland	41767cc27e	Merge branch 'master' into C-1187-terms-and-conditions-confirmed-function	2019-09-03 09:51:12 +02:00