757 Commits

Author SHA1 Message Date
Alexander Friedland
b89e081bad
Merge branch 'master' into 1746-Blur_explicit_Image_Content 2019-12-11 10:39:55 +01:00
lokalise-bot
f672abfaa9 Lokalise: update of webapp/locales/ru.json 2019-12-10 21:55:16 +01:00
lokalise-bot
08dbfb31c9 Lokalise: update of webapp/locales/es.json 2019-12-10 21:55:15 +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
Erhardt Stiefel
93e4712002
Update it.json 2019-12-07 18:40:12 +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
mattwr18
35c3219460
Merge pull request #2316 from Human-Connection/2170-Change_of_Terms_of_Service
Terms of use extended with dot - no commercial use
2019-12-02 13:10:58 +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
mattwr18
107f10edc9 Update table styling 2019-11-29 15:29:11 +01:00
mattwr18
a8a9abb4e4 Refactor/Add new components 2019-11-29 14:02:53 +01:00
lokalise-bot
8a812aaaee Lokalise: update of webapp/locales/pt.json 2019-11-29 11:04:08 +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
3e52ee090c Lokalise: update of webapp/locales/ru.json 2019-11-22 12:55:34 +01:00
lokalise-bot
bcd9f0ec93 Lokalise: update of webapp/locales/pt.json 2019-11-22 12:55:32 +01:00
lokalise-bot
32942e1346 Lokalise: update of webapp/locales/it.json 2019-11-22 12:55:30 +01:00
lokalise-bot
7ab1686caa Lokalise: update of webapp/locales/fr.json 2019-11-22 12:55:29 +01:00
lokalise-bot
b5f0e83cb7 Lokalise: update of webapp/locales/es.json 2019-11-22 12:55:27 +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
Robert Schäfer
694fb52381
Merge pull request #2293 from Human-Connection/2230-fix-typo
Fix Typo Of Issue 2230
2019-11-20 00:19:48 +01:00
Moriz Wahl
37b71b5e9a Fix Typo Of Issue 2230 2019-11-19 18:35:13 +01:00
Mogge
f7a072a64e
Merge pull request #2277 from Human-Connection/lokalise-2019-11-18_23-21-50
Lokalise: Translations update
2019-11-19 10:12:19 +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
lokalise-bot
906e8518bf Lokalise: update of webapp/locales/ru.json 2019-11-18 23:21:52 +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
dcc9889cee Update webapp/locales/en.json
Co-Authored-By: Alina Beck <alina.beck@mail.com>
2019-11-15 14:29:33 +01:00
Alexander Friedland
9bd1c59463 change unblk to unblock 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
mattwr18
5ed54c220a Add portuguese translations 2019-11-14 11:11:04 +01:00