757 Commits

Author SHA1 Message Date
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
mattwr18
ce3867a717
Merge pull request #2192 from Human-Connection/fix-invalid-json
Remove unintended comma
2019-11-11 19:21:37 +01:00
Wolfgang Huß
b305bc27d7 Use eyes icon to show state of decision 2019-11-11 18:02:01 +01:00
Wolfgang Huß
3d147a1cff Fix lint 'pt.json' 2019-11-11 17:53:51 +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
mattwr18
46ed623cfa
Merge pull request #2111 from Human-Connection/russian-locales
added Russian to locales
2019-11-11 14:38:00 +01:00
Alina Beck
2cd7ee9ac6 add donations info page to admin pages 2019-11-11 15:07:26 +03:00
mattwr18
bf87291879 Remove unintended comma 2019-11-11 11:55:18 +01: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
b916c9fe83 Add portuguese translations
Co-authored-by: ppelegrin <56610168+ppelegrin@users.noreply.github.com>
2019-11-11 08:50:35 +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
mattwr18
b79770469f Update notifications page
- display more notifications by simplifying the table
- get sorting working
2019-11-11 08:50:35 +01:00
mattwr18
7cdc12f4b9 Add notifications page with Notifications in table
- At the moment, the notifications are displayed in a table, and have
the same functionality as the NotificationMenu where you can click on
the title of the Post and visit the Post

- Unsure about the styling, it would kind of be nice to have a more
condensed list to see more notifications per page, but still be able to
click on a row and visit the Post
2019-11-11 08:50:35 +01:00
mattwr18
ceb77d2bb6
Merge pull request #1909 from Human-Connection/add-missing-portuguese-translations
Add missing portuguese translation
2019-11-11 08:49:19 +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
ppelegrin
09064c57fa Manting portuguese translation 2019-11-07 11:37:10 +01:00
Ewald Arnold
26c0d4d83e add current file 2019-11-06 09:11:52 +01:00
Ewald Arnold
4285932319 Merge branch 'russian-locales' of https://github.com/Human-Connection/Human-Connection into russian-locales 2019-11-06 09:09:48 +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
ppelegrin
15c671c4a8 Finish portuguese translations 2019-11-05 19:24:20 +01:00
ppelegrin
7e070208e0 Continue portuguese translations 2019-11-04 20:49:50 +01:00
Alexander Friedland
60c2bba271
fix missing bracket
fix missing bracket
2019-11-03 19:14:44 +01:00
Alexander Friedland
97bd1b4816
in ru.json i started this once
in ru.json i started this once. as a template you can use german or english. both languages are complete. you can copy and paste the ru.json. what is not translated. default will be shown in english.
2019-11-03 19:12:20 +01:00
Ewald Arnold
5fbe0da2ae add empty russian template 2019-11-03 17:31:10 +01:00
Ewald Arnold
4e0b1d06e3 added Russian to locales 2019-11-02 16:18:18 +01:00
ppelegrin
405021dea6 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into add-missing-portuguese-translations 2019-10-30 22:35:03 +01:00
ppelegrin
c275a3ee00 Continue with translations 2019-10-30 22:23:52 +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
mattwr18
297875304a
Merge pull request #2030 from Human-Connection/ogerly-patch-2
change Changes & History to Changes
2019-10-25 10:04:10 +02:00
Alexander Friedland
fb765ac1d8
change
Changes & History  to  Changes
2019-10-24 15:51:07 +02:00
Alexander Friedland
060f8cc747
chnage
Änderungen & Verlauf zu Änderungen
2019-10-24 15:48:11 +02:00
ogerly
9308646a56 add FAQ, lint ok 2019-10-24 14:27:53 +02:00