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
6671d893e6
refactor PostCard (wip)
2020-02-11 09:20:45 +01:00
Wolfgang Huß
0161b7f16c
Implement suggestions of Matt
2020-02-05 12:50:16 +01:00
Wolfgang Huß
4ca18522f1
Implement the filed report notification on the notification page
...
- Get all the old tests running.
- Implement new necessary tests.
- Lint fixing.
2020-01-20 18:03:40 +01:00
Wolfgang Huß
48403471d5
Add tests in Notification.spec.js
2020-01-20 10:29:46 +01:00
Alina Beck
77f4810ddc
set up global localVue
...
by setting up localVue with all required plugins (such as styleguide and vuex)
in a separate testSetup file we can avoid doing this individually in all component tests
the testSetup is executed before each test suite, so each test file gets a fresh
instance of localVue
2019-11-20 12:31:40 +03:00
mattwr18
b79770469f
Update notifications page
...
- display more notifications by simplifying the table
- get sorting working
2019-11-11 08:50:35 +01:00
