ogerly
e7056dd100
fix lint
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
roschaefer
db25403429
Fix lint
2019-11-15 11:20:50 +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
34239631a2
toggle shouts tab depending on user setting
2019-11-13 11:44:24 +03:00
Alina Beck
1625e0705e
run update mutation when submitting shouts form
2019-11-13 11:02:53 +03:00
mattwr18
7ce3e25110
Merge branch 'master' of github.com:Human-Connection/Human-Connection into donation-info
2019-11-12 21:04:54 +01:00
Alina Beck
6e3bd19267
set up privacy page in settings
2019-11-12 19:13:56 +03:00
mattwr18
797b8338be
Merge pull request #2197 from Human-Connection/2195-define-missing-getters
...
Added Empty Definitions For Missing Getters And Mutations
2019-11-12 15:54:45 +01: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
e19990a58b
Fix lint
2019-11-12 13:43:51 +01:00
mattwr18
a215093bc3
Make Donations reactive
...
Co-authored-by: @alina-beck <alina.beck@mail.com>
2019-11-12 13:26:30 +01:00
mattwr18
71bcf814db
Fix incorrect destructuring, parseInt
...
- graphql schema expects an integer
2019-11-12 12:08:19 +01:00
Moriz Wahl
d7397f5e46
posts/currentPosts now return empty array
2019-11-12 11:20:56 +01:00
Alina Beck
bdeb208556
pre-fill donation input fields with data from query
2019-11-12 12:45:59 +03:00
mattwr18
cbab34e83c
Update test with mock $18n.locale
...
Co-authored-by: @alina-beck <alina.beck@mail.com>
2019-11-12 10:35:02 +01:00
Moriz Wahl
e46a23d445
css hyphens for webkit and moz
2019-11-11 23:01:03 +01:00
Moriz Wahl
d0c0fd373a
Language attribute added to post and postCard
2019-11-11 22:42:37 +01:00
Moriz Wahl
163825e562
Added Empty Definitions For Missing Getters And Mutations
2019-11-11 21:20:53 +01:00
mattwr18
f51ad1131b
UpdateDonations from admin/donations
...
@alina-beck I'm not 100% satisfied with this at the moment. I think that
the admin could have the goal and progress initialized from a query for
the Donations, and be able to update if one of them changed... what do
you think?
2019-11-11 19:16:07 +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
mattwr18
36722962e0
Merge pull request #1975 from Human-Connection/1974-notifications-page
...
Add notifications page with All Notifications
2019-11-11 14:29:40 +01:00
Alina Beck
d15a1a8105
style donations info for mobile
2019-11-11 15:57:29 +03:00
Alina Beck
2cd7ee9ac6
add donations info page to admin pages
2019-11-11 15:07:26 +03:00
mattwr18
52bdfa7c48
Merge pull request #2073 from Human-Connection/Laod_saved_Laguage_and_select
...
1931 - after successful login the saved language of the user is set
2019-11-11 11:43:12 +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
Alina Beck
768f5f6631
extract progress bar into separate component
2019-11-11 12:31:10 +03:00
Alina Beck
88436c3cf7
add donation info with hardcoded values
2019-11-11 12:05:09 +03:00
mattwr18
f2e2c78582
Add tests for notifications index page
2019-11-11 08:52:51 +01:00
mattwr18
ddb9fcdcb7
Make dropdown filter reusable
2019-11-11 08:52:04 +01: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
cb2cc37556
Extract components following @alina-beck suggestion
...
- see https://github.com/Human-Connection/Human-Connection/pull/2075/files
2019-11-11 08:50:35 +01:00
mattwr18
7007b1c444
Paginate notifications, reusable component w/ test
2019-11-11 08:50:35 +01:00
mattwr18
084388a21e
Follow new file structure
...
- avoid nested directories
2019-11-11 08:50:35 +01:00
mattwr18
d83a424513
Add styling
...
- to link in NotificationMenu
- make table more mobile responsive
- remove unneccessary props
Co-authored-by: Alina Beck <alina.beck@mail.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
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
roschaefer
7c278d7c7f
fix: send 403 if you try to edit another's post
...
This also fixes the glitch that you click on "Edit post" and the
contribution form is empty.
2019-11-08 17:30:29 +01:00
Wolfgang Huß
553a3ca2cb
Implement 'decide' button and functionality
2019-11-08 17:29:09 +01:00
Wolfgang Huß
c2444a5288
Changed layout
2019-11-08 16:26:46 +01:00
Wolfgang Huß
1a4ca722ca
Corrected icon color related to decision status
2019-11-08 09:46:47 +01:00
Wolfgang Huß
526e4c642b
Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1710-list-and-protocol-moderation
2019-11-08 08:28:47 +01:00
