ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2026-01-15 17:34:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
Ocelot-Social/cypress/integration
History
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
..
administration
Merge master
2020-03-09 08:37:05 +01:00
common
Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1709-send-feedbacks-in-report-processes-second-approach-merge-master
2020-03-09 09:34:49 +01:00
internationalization
Changed translation must change test :(
2019-11-20 19:48:04 +01:00
moderation
Merge master
2020-03-09 08:37:05 +01:00
notifications
Merge master
2020-03-09 08:37:05 +01:00
post
Merge master
2020-03-09 08:37:05 +01:00
search
Please pass the tests now
2020-01-06 18:36:59 +01:00
user_account
Merge master
2020-03-09 08:37:05 +01:00
user_profile
Merge master
2020-03-09 08:37:05 +01:00