ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,408 Commits 117 Branches 1,511 Tags
Commit Graph

5716 Commits

Author SHA1 Message Date
dependabot-preview[bot]
de9437d173
Bump @nuxtjs/axios from 5.5.4 to 5.6.0 in /webapp 
Bumps [@nuxtjs/axios](https://github.com/nuxt-community/axios-module) from 5.5.4 to 5.6.0.
- [Release notes](https://github.com/nuxt-community/axios-module/releases)
- [Changelog](https://github.com/nuxt-community/axios-module/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/nuxt-community/axios-module/compare/v5.5.4...v5.6.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-21 08:10:39 +00:00
mattwr18
307692dc5b
Merge pull request #1309 from Human-Connection/dependabot/npm_and_yarn/webapp/nuxtjs/apollo-4.0.0-rc11 
Bump @nuxtjs/apollo from 4.0.0-rc9 to 4.0.0-rc11 in /webapp
 2019-08-21 10:07:40 +02:00
mattwr18
8aa8be3152
Merge pull request #1314 from Human-Connection/1308-fix_broken_graphql_query 
Fix #1308
 2019-08-21 09:34:50 +02:00
Wolfgang Huß
d98ebdd713 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1062-notification-about-comment-on-post 2019-08-21 08:37:43 +02:00
dependabot-preview[bot]
fa182cfd27
Bump nuxt-dropzone from 1.0.2 to 1.0.3 in /webapp 
Bumps [nuxt-dropzone](https://github.com/Etheryte/nuxt-dropzone) from 1.0.2 to 1.0.3.
- [Release notes](https://github.com/Etheryte/nuxt-dropzone/releases)
- [Commits](https://github.com/Etheryte/nuxt-dropzone/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-21 04:31:23 +00:00
dependabot-preview[bot]
620e7e82f0
Bump tiptap from 1.24.2 to 1.25.0 in /webapp 
Bumps [tiptap](https://github.com/scrumpy/tiptap) from 1.24.2 to 1.25.0.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap@1.24.2...tiptap@1.25.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-21 04:29:52 +00:00
dependabot-preview[bot]
096d4f249b
Bump date-fns from 2.0.0-beta.5 to 2.0.0 in /webapp 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.0.0-beta.5 to 2.0.0.
- [Release notes](https://github.com/date-fns/date-fns/releases)
- [Changelog](https://github.com/date-fns/date-fns/blob/master/CHANGELOG.md)
- [Commits](https://github.com/date-fns/date-fns/compare/v2.0.0-beta.5...v2.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-21 04:28:56 +00:00
dependabot-preview[bot]
dc29169110
Bump sass-loader from 7.2.0 to 7.3.1 in /webapp 
Bumps [sass-loader](https://github.com/webpack-contrib/sass-loader) from 7.2.0 to 7.3.1.
- [Release notes](https://github.com/webpack-contrib/sass-loader/releases)
- [Changelog](https://github.com/webpack-contrib/sass-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/sass-loader/compare/v7.2.0...v7.3.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-21 04:25:26 +00:00
Robert Schäfer
af5772db49
Merge pull request #1256 from Human-Connection/add-masonry-grid 
Add masonry layout grid
 2019-08-21 00:42:48 +02:00
roschaefer
ca24747550 Fix #1308 2019-08-20 23:53:10 +02:00
Matt Rider
ea923ae1dc Merge branch 'master' of github.com:Human-Connection/Human-Connection into post-needs-to-have-category#1222 2019-08-20 21:29:10 +02:00
Matt Rider
512bf32b0c Update cypress tests, fix broken comment reactivity 2019-08-20 21:27:00 +02:00
Matt Rider
8735045d11 Update cypress tests, post query 2019-08-20 20:13:29 +02:00
dependabot-preview[bot]
575fd9fa97
Bump @nuxtjs/apollo from 4.0.0-rc9 to 4.0.0-rc11 in /webapp 
Bumps [@nuxtjs/apollo](https://github.com/nuxt-community/apollo-module) from 4.0.0-rc9 to 4.0.0-rc11.
- [Release notes](https://github.com/nuxt-community/apollo-module/releases)
- [Commits](https://github.com/nuxt-community/apollo-module/compare/v4.0.0-rc.9...v4.0.0-rc.11)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-20 17:10:15 +00:00
Robert Schäfer
89b377fee1
Merge pull request #1281 from Human-Connection/272-add_error_reporting 
272 add error reporting
 2019-08-20 19:07:49 +02:00
Alina Beck
626e9e24d4 use rowGap property with gridRowGap as fallback 2019-08-20 15:46:41 +01:00
Matt Rider
a000719663 Merge branch 'master' of github.com:Human-Connection/Human-Connection into post-needs-to-have-category#1222 2019-08-20 16:13:38 +02:00
Matt Rider
c614e4de47 Update UI, component tests 
- enforce that a post cannot be created or updated with no categories nor more than 3 categories
 2019-08-20 15:53:07 +02:00
mattwr18
830552cfc4
Merge pull request #1018 from Human-Connection/1017-send-out-notifications-on-create-omment 
🍰 Send out notifications on CreateComment
 2019-08-20 13:25:34 +02:00
Robert Schäfer
da7ab5a5f8
Merge pull request #1299 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-config-prettier-6.1.0 
Bump eslint-config-prettier from 6.0.0 to 6.1.0 in /webapp
 2019-08-20 12:07:42 +02:00
Matt Rider
f5ef859cc9 Merge branch 'master' of github.com:Human-Connection/Human-Connection into add-masonry-grid 2019-08-20 08:52:31 +02:00
Matt Rider
dc1e25b090 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1017-send-out-notifications-on-create-omment 2019-08-20 08:38:00 +02:00
Matt Rider
a77c9638f6 Refactor Notification.vue 
- Follow @alina-beck's suggestions, use notification over notification: true, use span with font weight and margin-right to remove &nbsp;
 2019-08-20 08:36:05 +02:00
dependabot-preview[bot]
ee8ea57682
Bump eslint-plugin-standard from 4.0.0 to 4.0.1 in /webapp 
Bumps [eslint-plugin-standard](https://github.com/standard/eslint-plugin-standard) from 4.0.0 to 4.0.1.
- [Release notes](https://github.com/standard/eslint-plugin-standard/releases)
- [Commits](https://github.com/standard/eslint-plugin-standard/compare/v4.0.0...v4.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-20 04:24:31 +00:00
dependabot-preview[bot]
f29507b6f6
Bump eslint-config-prettier from 6.0.0 to 6.1.0 in /webapp 
Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) from 6.0.0 to 6.1.0.
- [Release notes](https://github.com/prettier/eslint-config-prettier/releases)
- [Changelog](https://github.com/prettier/eslint-config-prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/eslint-config-prettier/compare/v6.0.0...v6.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-20 04:23:28 +00:00
roschaefer
07a90b8865 Simplify webapp sentry configuration 
If commit is set, use it as `release`.
 2019-08-19 21:43:22 +02:00
roschaefer
58795ad990 Implement error reporting for the backend 2019-08-19 20:14:43 +02:00
roschaefer
4d29206982 Configure sentry for nuxtJS 2019-08-19 20:14:43 +02:00
Robert Schäfer
a20ed6abf6
Merge pull request #1287 from Human-Connection/dependabot/npm_and_yarn/webapp/jest-24.9.0 
Bump jest from 24.8.0 to 24.9.0 in /webapp
 2019-08-19 20:04:14 +02:00
Alina Beck
3703fc787a fix lint errors – thanks github editor 2019-08-19 16:23:38 +01:00
Wolfgang Huß
aae5fd396e Merge branch '1017-send-out-notifications-on-create-omment' of https://github.com/Human-Connection/Human-Connection into 1062-notification-about-comment-on-post 
# Conflicts:
#	backend/src/middleware/handleNotifications/handleNotifications.js
#	backend/src/middleware/handleNotifications/handleNotifications.spec.js
#	webapp/components/notifications/Notification/Notification.vue
#	webapp/components/notifications/NotificationMenu/NotificationMenu.vue
 2019-08-19 16:58:18 +02:00
Robert Schäfer
13d9965599
Merge pull request #1294 from Human-Connection/1221-fix-logout-login-bug 
Downgrade @nuxtjs/apollo
 2019-08-19 16:54:51 +02:00
dependabot-preview[bot]
f65c3dea14
Bump jest from 24.8.0 to 24.9.0 in /webapp 
Bumps [jest](https://github.com/facebook/jest) from 24.8.0 to 24.9.0.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/compare/v24.8.0...v24.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-19 14:50:55 +00:00
Robert Schäfer
3b6e211640
Merge pull request #1290 from Human-Connection/dependabot/npm_and_yarn/webapp/date-fns-2.0.0-beta.5 
Bump date-fns from 2.0.0-beta.4 to 2.0.0-beta.5 in /webapp
 2019-08-19 16:50:20 +02:00
Robert Schäfer
8a147c5153
Merge pull request #1292 from Human-Connection/dependabot/npm_and_yarn/webapp/babel-jest-24.9.0 
Bump babel-jest from 24.8.0 to 24.9.0 in /webapp
 2019-08-19 16:48:32 +02:00
Alina Beck
b74c47a265
Merge branch 'master' into add-masonry-grid 2019-08-19 15:05:54 +01:00
Alina Beck
0bb746804b add masonry grid item tests 2019-08-19 14:06:32 +01:00
Alina Beck
5abf6003cc add tests for masonry grid 2019-08-19 13:15:13 +01:00
Alina Beck
52c3a15be1 use masonry grid on user profile 2019-08-19 12:01:43 +01:00
Matt Rider
053d8bcf7b Fix UserQuery 2019-08-19 11:41:23 +02:00
Alina Beck
bec5ed9695 remove computed props from grid 2019-08-19 10:37:20 +01:00
Alina Beck
b0de4ec2b5 move calculation from grid to grid item 2019-08-19 10:16:44 +01:00
Matt Rider
caff74e58b Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1017-send-out-notifications-on-create-omment 2019-08-19 10:50:46 +02:00
mattwr18
90fa70e83d
Merge pull request #1282 from Human-Connection/count_from_0_to_0_by_default 
Get rid of property warnings
 2019-08-19 10:06:09 +02:00
Robert Schäfer
87461c21ca
Merge pull request #1280 from Human-Connection/refactor-graphql-queries 
Refactor graphql queries
 2019-08-19 09:58:38 +02:00
Matt Rider
12131f2ee3 Downgrade @nuxtjs/apollo 
- Upgrading breaks our logut/login flow
- see
https://github.com/nuxt-community/apollo-module/releases
https://github.com/nuxt-community/apollo-module/pull/242/files
 2019-08-19 09:03:37 +02:00
Wolfgang Huß
68c25b8d54 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1062-notification-about-comment-on-post 
# Conflicts:
#	backend/src/middleware/handleNotifications/handleNotifications.spec.js
 2019-08-19 08:42:00 +02:00
dependabot-preview[bot]
63c05d76b5
Bump babel-jest from 24.8.0 to 24.9.0 in /webapp 
Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest) from 24.8.0 to 24.9.0.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v24.9.0/packages/babel-jest)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-19 04:36:03 +00:00
dependabot-preview[bot]
a2e1f52294
Bump date-fns from 2.0.0-beta.4 to 2.0.0-beta.5 in /webapp 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.0.0-beta.4 to 2.0.0-beta.5.
- [Release notes](https://github.com/date-fns/date-fns/releases)
- [Changelog](https://github.com/date-fns/date-fns/blob/master/CHANGELOG.md)
- [Commits](https://github.com/date-fns/date-fns/compare/v2.0.0-beta.4...v2.0.0-beta.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-19 04:34:24 +00:00
Alina Beck
0aa1b8046b remove grid logic from post component 2019-08-18 18:28:48 +01:00