458 Commits

Author	SHA1	Message	Date
mattwr18	3ef04f8391	Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1463-search-for-users	2019-12-19 17:16:48 +01:00
Alina Beck	2e26e3f3f9	Apply suggestions from code review ... change FAQ link text	2019-12-18 17:36:24 +05:30
Alexander Friedland	ed617f8c83	Merge branch 'master' into 1746-Blur_explicit_Image_Content	2019-12-17 07:39:26 +01:00
mattwr18	1f2216cd4f	Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1463-search-for-users	2019-12-13 12:31:14 +01:00
ogerly	4c93f65ef4	arrrr* forget to save textfiles :|	2019-12-13 09:17:12 +01:00
Erhardt Stiefel	aed15f0be9	Update de.json ... After a longer discussion I understood just to change the title of the function deleteUserAccount by renaming "name": "Daten löschen", to "name": "Benutzerkonto löschen", to solve the bug	2019-12-11 12:28:41 +01:00
Alexander Friedland	b89e081bad	Merge branch 'master' into 1746-Blur_explicit_Image_Content	2019-12-11 10:39:55 +01:00
Robert Schäfer	1b787d7687	Merge pull request #2416 from Human-Connection/checkbox_no_comercial_add_to_creatUserAccount ... Checkbox 'no comercial + no political account' add to creat user account	2019-12-10 15:21:40 +01:00
Moriz Wahl	72e4d0abbc	Basic Search Is Working For Users And Posts ... The story of SearchInput.vue throws errors because of line 81, dateTime. What must be included to fix this? The search results shown by the frontend are sometimes differnt from the response of the backend. It shows no results found though there are results incoming. Tests are not implemented yet.	2019-12-10 10:36:08 +01:00
Alexander Friedland	dee22d33db	Merge branch 'master' into 1746-Blur_explicit_Image_Content	2019-12-06 07:21:49 +01:00
mattwr18	085b59bf4d	Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1710-list-and-protocol-moderation	2019-12-04 13:23:06 +01:00
Alexander Friedland	8d93956de0	change ... change representiere <TO> repräsentiere	2019-12-03 18:47:38 +01:00
ogerly	a5bbb06f77	fix Spec + lint	2019-12-03 18:27:05 +01:00
ogerly	38c58af1f3	add confirm checkboc No Comercial account	2019-12-03 17:57:30 +01:00
Alina Beck	d685ff9e7b	translate and style user count	2019-12-03 13:25:20 +03:00
Alina Beck	febabf9303	rename table header translations	2019-12-03 12:25:19 +03:00
roschaefer	58e7f4164d	Fix German translation of "Shouts" ... Requested by @DennisHack @Mogge are you "moriz" on our discord who keeps track of translations? This might be interesting for you, too.	2019-12-02 15:10:09 +01:00
ogerly	19d183e13a	Merge https://github.com/Human-Connection/Human-Connection into 1746-Blur_explicit_Image_Content	2019-12-02 13:22:42 +01:00
roschaefer	74a65a9114	Be more specific "Current status" inst. of "Type"	2019-11-30 02:21:29 +01:00
ogerly	7cdca49b48	Fix lint	2019-11-29 16:04:25 +01:00
ogerly	7f3f81822e	blur the image ok.	2019-11-28 20:40:35 +01:00
Alexander Friedland	dd0f629691	Merge branch 'master' into 2170-Change_of_Terms_of_Service	2019-11-24 21:52:41 +01:00
Wolfgang Huß	67a5a00704	Clean up	2019-11-23 10:58:16 +01:00
Wolfgang Huß	0b7a0496a2	Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1710-list-and-protocol-moderation ... # Conflicts: # webapp/locales/de.json	2019-11-23 08:07:53 +01:00
Wolfgang Huß	99af6cbf8a	Implement displaying multiple claims in the frontend	2019-11-22 18:40:51 +01:00
lokalise-bot	d2b3396e9b	Lokalise: update of webapp/locales/de.json	2019-11-22 12:55:25 +01:00
Moriz Wahl	7be79ddcf8	Same translation as in cypress test	2019-11-21 11:45:25 +01:00
ogerly	b360f71112	Terms of use extended with dot - no commercial use	2019-11-21 10:16:10 +01:00
Wolfgang Huß	ef84e9991f	Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1710-list-and-protocol-moderation ... # Conflicts: # backend/src/schema/index.js	2019-11-21 08:09:50 +01:00
mattwr18	c775884c59	Merge pull request #2160 from Human-Connection/2119_Create_Post_consistent_form_input_validation ... 🍰 2119-Fix Contribution consistent form input validation	2019-11-19 00:27:48 +01:00
Robert Schäfer	735a31ed00	Merge pull request #2101 from Human-Connection/1747-show-shouts ... 1747 show shouts	2019-11-18 17:00:43 +01:00
mattwr18	6685ff3df0	Merge branch 'master' of github.com:Human-Connection/Human-Connection into 2119_Create_Post_consistent_form_input_validation	2019-11-18 15:57:58 +01:00
Wolfgang Huß	4a732beb0a	Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1710-list-and-protocol-moderation	2019-11-18 07:59:44 +01:00
roschaefer	56a940285b	refactor: translations, tests	2019-11-15 14:29:33 +01:00
Alexander Friedland	767b4c8f15	Update webapp/locales/de.json ... Co-Authored-By: Alina Beck <alina.beck@mail.com>	2019-11-15 14:29:33 +01:00
Alexander Friedland	4b2da76709	change unblk TO unblock ... unblk TO unblock	2019-11-15 14:29:33 +01:00
ogerly	958b88ceda	2106-unblock a user in the user settings	2019-11-15 14:29:33 +01:00
Wolfgang Huß	913fcc2cdb	Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1710-list-and-protocol-moderation ... # Conflicts: # backend/src/schema/index.js # webapp/locales/pt.json	2019-11-14 09:41:00 +01:00
Alina Beck	6213a25355	Merge branch 'master' into 1747-show-shouts	2019-11-14 09:37:54 +03:00
Alina Beck	1625e0705e	run update mutation when submitting shouts form	2019-11-13 11:02:53 +03:00
Alina Beck	6e3bd19267	set up privacy page in settings	2019-11-12 19:13:56 +03:00
mattwr18	8b5cd48d3c	Translate success message, guard clause for no Donations	2019-11-12 15:33:21 +01:00
mattwr18	3b5e40efaa	Merge branch 'master' of github.com:Human-Connection/Human-Connection into donation-info	2019-11-12 15:18:10 +01:00
Wolfgang Huß	b305bc27d7	Use eyes icon to show state of decision	2019-11-11 18:02:01 +01:00
Wolfgang Huß	677039b786	Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1710-list-and-protocol-moderation ... # Conflicts: # webapp/pages/moderation/index.vue	2019-11-11 17:52:58 +01:00
Wolfgang Huß	c3f6ad0e44	Implement always show resource status ... - Rename buttons after Roberts suggestion.	2019-11-11 16:38:48 +01:00
Wolfgang Huß	4e49dfe9e1	Add a confirm modal.	2019-11-11 14:53:19 +01:00
Alina Beck	2cd7ee9ac6	add donations info page to admin pages	2019-11-11 15:07:26 +03:00
Alina Beck	f6de44b337	place donation info in separate component ... compute title and label according to selected locale and donation values	2019-11-11 13:09:51 +03:00
mattwr18	7564908456	Refactor to follow @alina-beck suggestions ... - Update CSS - Use design tokens where possible - Update spec description - Avoid scoped scss as it's more expensive - did not change the next and back button as they weren't really visible without the primary class - Fix German translation	2019-11-11 08:52:04 +01:00