293 Commits

Author SHA1 Message Date
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
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
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
roschaefer
74a65a9114 Be more specific "Current status" inst. of "Type" 2019-11-30 02:21:29 +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
mattwr18
542647f418 Add NotificationsDropdownFilter story, refactor
- rename incorrectly named varaibles
- use filterOptions to remove unneccessary computed routes

Co-authored-by: @alina-beck
2019-11-11 08:52:04 +01:00
mattwr18
58b1f7948c Follow @alina-beck and @Tirokk suggestions
- following PR reviews
2019-11-11 08:50:35 +01:00
mattwr18
e8cf51095a Add back missing translation 2019-11-11 08:50:35 +01:00
mattwr18
cf8124fb2d Clean up/add german translations 2019-11-11 08:50:35 +01:00
Wolfgang Huß
553a3ca2cb Implement 'decide' button and functionality 2019-11-08 17:29:09 +01:00
roschaefer
4108bb7d71 Merge remote-tracking branch 'origin/2119_Create_Post_consistent_form_input_validation' into 2119_Create_Post_consistent_form_input_validation-improvements 2019-11-08 16:32:16 +01:00
Wolfgang Huß
c2444a5288 Changed layout 2019-11-08 16:26:46 +01:00
roschaefer
a2dbe47f1f Fix tests 2019-11-08 00:50:20 +01:00
Wolfgang Huß
2a23bbf101 Refactor frontend and 'reports' query again 2019-11-07 15:54:26 +01:00
ogerly
dd03f4b7f0 Fix Add Language check for form submit 2019-11-07 15:40:58 +01:00
Wolfgang Huß
4a6f8c423e Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1710-list-and-protocol-moderation 2019-11-06 07:49:20 +01:00
Moriz Wahl
1dbd36c1e1 Tests Added For Language Filter Of Posts 2019-10-29 17:20:33 +01:00
Moriz Wahl
aeae72f691 first implementation 2019-10-28 13:49:32 +01:00
Wolfgang Huß
a949fce606 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1710-list-and-protocol-moderation 2019-10-25 13:19:19 +02:00
Alexander Friedland
060f8cc747
chnage
Änderungen & Verlauf zu Änderungen
2019-10-24 15:48:11 +02:00