Wolfgang Huß
a52cbe1c66
Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1709-send-feedbacks-in-report-processes-second-approach
...
# Conflicts:
# backend/src/db/seed.js
# backend/src/middleware/notifications/notificationsMiddleware.js
# backend/src/schema/resolvers/notifications.js
# webapp/components/NotificationsTable/NotificationsTable.spec.js
2020-04-01 12:22:56 +02:00
roschaefer
276ea79e8f
Update prettier to v2
2020-03-24 21:11:11 +01:00
Robert Schäfer
512ef672bf
feat: Introduce graphql image type ( #3043 )
...
* refactor(graphql): Introduce image type
* Undo changes to .travis.yml
* chore: Upgrade travis to node LTS
- URL is available since v10
* chore: use lts
Co-authored-by: mattwr18 <mattwr18@gmail.com>
2020-03-16 15:32:19 +01:00
Wolfgang Huß
5dfd0f9ada
Merge fixes and lint fixes
2020-03-09 09:54:43 +01:00
Wolfgang Huß
af8b479fb4
Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1709-send-feedbacks-in-report-processes-second-approach-merge-master
...
# Conflicts:
# backend/package.json
# backend/src/db/seed.js
# backend/src/middleware/notifications/notificationsMiddleware.js
# backend/src/middleware/notifications/notificationsMiddleware.spec.js
# backend/src/schema/resolvers/notifications.js
# backend/src/schema/resolvers/notifications.spec.js
# backend/yarn.lock
# cypress/integration/common/steps.js
# webapp/components/Notification/Notification.spec.js
# webapp/components/Notification/Notification.vue
# webapp/components/NotificationList/NotificationList.spec.js
# webapp/components/UserTeaser/UserTeaser.vue
# webapp/locales/de.json
# webapp/locales/en.json
# webapp/package.json
# webapp/yarn.lock
2020-03-09 09:34:49 +01:00
Wolfgang Huß
3ea1348bd4
Merge master
2020-03-09 08:37:05 +01:00
Alina Beck
701564c708
Merge branch 'master' into migrate-styleguide-card
2020-02-20 00:37:07 +01:00
abdellani
e3c95cbbf5
fixes linter error
2020-02-17 15:04:16 +01:00
Alina Beck
ad385490bc
follow @mattwr18 PR review
...
- replace magic numbers with tokens
- remove unused name attribute
- use slot shorthand (for the slots added in this PR)
2020-02-17 10:44:52 +01:00
abdellani
cd62bb457b
Removes popover menu
2020-02-13 00:46:50 +01:00
Wolfgang Huß
0161b7f16c
Implement suggestions of Matt
2020-02-05 12:50:16 +01:00
roschaefer
d6f5740ac1
Merge remote-tracking branch 'origin/master' into 1709-send-feedbacks-in-report-processes
2020-02-01 15:12:13 +01:00
Alina Beck
7c090cc3ed
set z-index for UserTeaser only on PostCard
2020-01-22 18:09:44 +03:00
Alina Beck
0392826211
set avatar size to small in AvatarMenu and for Anonymous users
2020-01-22 18:05:00 +03:00
Wolfgang Huß
e563887022
Fix test in 'NotificationsTable.spec.js' for new 'user-teaser' component
2020-01-22 13:17:11 +01:00
mattwr18
769c0cd105
Merge branch 'master' of github.com:Human-Connection/Human-Connection into 2675-migrate-avatar-component-2
2020-01-21 17:08:51 +01:00
Alina Beck
e93332b173
display username below slug when there is no date-time
2020-01-21 17:00:20 +03:00
Alina Beck
c5af2dbfb4
truncate overflowing user name
2020-01-21 11:58:54 +03:00
mattwr18
7b73c990ec
Remove unintended changes to class name/comment
2020-01-20 10:19:39 +01:00
mattwr18
77ef3b0406
Fix failing tests
2020-01-20 10:07:02 +01:00
mattwr18
fdf00fc0c6
Follow @alina-beck's PR review suggestions
...
- Update styling
- Avoid nested tags
- Rename components with two names
- Add story
- Co-authored-by: Alina Beck <alina.beck@mail.com>
2020-01-20 10:04:30 +01:00
