296 Commits

Author SHA1 Message Date
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
Moriz Wahl
37b71b5e9a Fix Typo Of Issue 2230 2019-11-19 18:35:13 +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
roschaefer
56a940285b refactor: translations, tests 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
ogerly
958b88ceda 2106-unblock a user in the user settings 2019-11-15 14:29:33 +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
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
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
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
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
roschaefer
a2dbe47f1f Fix tests 2019-11-08 00:50:20 +01:00
ogerly
dd03f4b7f0 Fix Add Language check for form submit 2019-11-07 15:40:58 +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
Alexander Friedland
fb765ac1d8
change
Changes & History  to  Changes
2019-10-24 15:51:07 +02:00
ogerly
9308646a56 add FAQ, lint ok 2019-10-24 14:27:53 +02:00
ogerly
ff8680ff86 new terms and conditions fixed 2019-10-23 18:58:03 +02:00
mattwr18
fee7f9ff12
Merge pull request #1872 from Human-Connection/1733-fix
🍰 Fix - maintaining sorting after navigation
2019-10-22 12:47:18 +02:00
mattwr18
98e3bb40d5
Merge pull request #1906 from Human-Connection/add_storybook_stories_for_our_university_students
Add storybook stories for our university students
2019-10-22 11:58:17 +02:00
mattwr18
333b38d1b2 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1733-fix 2019-10-22 11:07:29 +02:00
Alina Beck
c2c69a2f70 update styling and wording for pinned post ribbons 2019-10-21 14:34:26 +03:00
roschaefer
16d07bd3ba refactor: lint, frontend tests, vuex store
This fixes the lint errors and failing frontend tests. Also, when the
user chooses another orderBy, the menu gets translated.

The refactoring moves code and complexity into the vuex store where it
can be tested separately.
2019-10-18 21:58:53 +02:00
roschaefer
3e04b26068 Add styling to pinned post 2019-10-17 17:56:16 +02:00
mattwr18
f871df02ae Start setting up frontend pinning/unpinning
- Add pin/unpin post to content menu
- Update apollo cache to reactively unpin
- Update apollo cache in root path to re-order Posts
- Order with pinned post first
- Start setting up filters, so that the pinned post is always the first
post visible
2019-10-17 17:56:16 +02:00
mattwr18
5505deee79
Follow @alina-beck and @Tirokk PR suggestions 2019-10-17 12:44:30 +02:00
Youri Seichter
b89ef8987e Change login.failure translations, log login.failure error 2019-10-16 17:57:03 +02:00
Youri Seichter
b72f3da489 Make login failure translateable, translate 'login.failure' to german and english 2019-10-16 17:06:44 +02:00
Robert Schäfer
0792e06a24
Merge pull request #1910 from Human-Connection/add-missing-translations-contribution-form
Add missing translations for Title placeholder
2019-10-16 12:10:19 +02:00
Wolfgang Huß
6dff10b236 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1707-reporting-with-specific-information 2019-10-16 09:27:13 +02:00
mattwr18
17ead96450 Add missing translations for Title placeholder 2019-10-15 23:50:34 +02:00
mattwr18
e8c6941142 Follow @roschaefer's PR review suggestions
- disable button if form.reasonCategory is falsy
- extract valuesReasonCategoryOptions to global constant
- extract reasonCategoryOptions to created lifecycle hook to keep data()
clean and use map
- extract formSchema to components/utils and test
- remove validator from formSchema and validate based on "Deep Rules" https://github.com/yiminghe/async-validator#deep-rules
- Use v-model to update reasonCategory and reasonDescription
- default to error message in English from backend
- Update template slot to use new syntax
2019-10-15 20:28:25 +02:00
ogerly
461defd460 WITH CHECKBOXES 2019-10-15 15:43:31 +02:00
ogerly
855caf78e9 reference to terms of use, data protection, minimum age at added 2019-10-15 13:05:51 +02:00
Brent Vardy
227db5f13a refactored tranformImage to remove dupication
- styled confirm button
- added locale translations
- added dropzoneDrop method to handle scenario where users drag and drop an image whilst in the cropper interface.

- co-authored-by: mattwr18 <mattwr18@gmail.com>
2019-10-14 16:42:11 +02:00
Wolfgang Huß
fd27583c1d Merge branch '1707-reporting-with-specific-information' of github.com:Human-Connection/Human-Connection into 1707-refactor-db-reporting-with-specific-information
# Conflicts:
#	shared/moderation/report.js
2019-10-14 16:21:08 +02:00
Wolfgang Huß
c7849cedd8 Rename report reason category names to have '_' instead '-' 2019-10-14 16:12:21 +02:00