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
Alina Beck
2c0b2ed482 place tippy popup in renderless component 2019-08-23 23:21:24 +01:00
Alina Beck
fbe4de347b extract suggestions menu into separate component 2019-08-23 22:30:05 +01:00
roschaefer
894a59ecc7 Fix flickering create-button 2019-08-23 20:05:08 +02:00
ogerly
63549c1101 Tests for create users with terms and conditions are ok 2019-08-23 19:37:23 +02:00
Alina Beck
cbb0d79331 put link bubble back in (wip) 2019-08-23 17:37:17 +01:00
Alina Beck
ee00a3b3df replace floating and bubble menu with menu bar 2019-08-23 15:49:20 +01:00
Wolfgang Huß
df4f0627b5 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1062-notification-about-comment-on-post 
# Conflicts:
#	backend/src/middleware/index.js
 2019-08-23 15:31:48 +02:00
Wolfgang Huß
a10e2e3a9b Make user profile follow(ed) lists exceeds 5 users and X more better translatable 
Slite adjustment of `more` to `more …`
 2019-08-23 14:37:52 +02:00
Wolfgang Huß
66612801ce Change text of invite form 2019-08-23 13:35:22 +02:00
ogerly
877b0ea77e Terms and conditions are handed over cleanly during registration 2019-08-23 13:17:54 +02:00
ogerly
53532025d6 Fix translation add backend test case todo 2019-08-23 11:36:41 +02:00
ogerly
f34cef22f2 Graphical changes 2019-08-23 11:02:24 +02:00
ogerly
54750e39b8 Missing translations added + code checked with Lint 2019-08-23 11:02:24 +02:00
ogerly
c00f281e6c Translations and style adapted 2019-08-23 11:02:24 +02:00
roschaefer
036e2605b7 Implement accept terms and conditions flow 2019-08-23 11:02:24 +02:00
ogerly
592a682bd7 Temporary commit 2019-08-23 11:02:24 +02:00
ogerly
36ce6361ec Alle Daten übernommen die für serverseitig rendern nötig sind 2019-08-23 11:02:24 +02:00
Robert Schäfer
fb8468dc8b
Merge pull request #1358 from Human-Connection/dependabot/npm_and_yarn/webapp/graphql-14.5.0 
Bump graphql from 14.4.2 to 14.5.0 in /webapp
 2019-08-23 10:52:36 +02:00
mattwr18
239e4f92d7
Merge pull request #1366 from Human-Connection/update_vue_izitoast 
Update vue-izitoast after they released v1.2.0!
 2019-08-23 10:46:49 +02:00
mattwr18
6e0f77fc5a
Merge pull request #1338 from Human-Connection/1335-filter_bubble_indicator 
Implement visual feedback if filter is active
 2019-08-23 08:38:42 +02:00
roschaefer
3123041726 Update vue-izitoast after they released v1.2.0! 
See https://github.com/arthurvasconcelos/vue-izitoast/pull/20#issuecomment-524131102
 2019-08-23 08:35:04 +02:00
dependabot-preview[bot]
6550bd33ff
Bump graphql from 14.4.2 to 14.5.0 in /webapp 
Bumps [graphql](https://github.com/graphql/graphql-js) from 14.4.2 to 14.5.0.
- [Release notes](https://github.com/graphql/graphql-js/releases)
- [Commits](https://github.com/graphql/graphql-js/compare/v14.4.2...v14.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-23 06:33:35 +00:00
mattwr18
d5cbc4a07a
Merge pull request #1350 from Human-Connection/fix_contributions_count 
Fix post count always showing 0
 2019-08-23 08:27:43 +02:00
roschaefer
37c12f6681 Fix post count always showing 0 2019-08-23 00:36:47 +02:00
roschaefer
62c8d34079 Fix expiration dates of JWT and cookie 
This won't fix the bug that can happen in `nuxtServerInit`. However,
according to the docs, we accepted JWT which was valid for 1000 days and
our cookie was valid for 3 days - completely weird.

See:
https://github.com/auth0/node-jsonwebtoken
https://github.com/nuxt-community/apollo-module
 2019-08-22 22:29:50 +02:00
Wolfgang Huß
8e893b2c5d Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1062-notification-about-comment-on-post 2019-08-22 15:28:49 +02:00
Wolfgang Huß
793485c0fc Write frontend tests 2019-08-22 15:20:40 +02:00
Robert Schäfer
b37caf1bed
Merge pull request #1343 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-jest-22.15.2 
Bump eslint-plugin-jest from 22.15.1 to 22.15.2 in /webapp
 2019-08-22 12:11:47 +02:00
Wolfgang Huß
04fe6b0a8c Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1062-notification-about-comment-on-post 
# Conflicts:
#	backend/src/middleware/handleNotifications/handleNotificationsMiddleware.spec.js

Refactored there tests a little
 2019-08-22 11:02:10 +02:00
dependabot-preview[bot]
f76b907268
Bump eslint-plugin-jest from 22.15.1 to 22.15.2 in /webapp 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.15.1 to 22.15.2.
- [Release notes](https://github.com/jest-community/eslint-plugin-jest/releases)
- [Changelog](https://github.com/jest-community/eslint-plugin-jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jest-community/eslint-plugin-jest/compare/v22.15.1...v22.15.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-22 08:31:24 +00:00
mattwr18
27e61e5c9d
Merge pull request #1345 from Human-Connection/dependabot/docker/webapp/node-12.9-alpine 
Bump node from 12.8-alpine to 12.9-alpine in /webapp
 2019-08-22 10:30:21 +02:00
mattwr18
c82c107d0e
Merge pull request #1342 from Human-Connection/dependabot/npm_and_yarn/webapp/vue/cli-shared-utils-3.11.0 
Bump @vue/cli-shared-utils from 3.10.0 to 3.11.0 in /webapp
 2019-08-22 10:29:27 +02:00
dependabot-preview[bot]
9ba3e9bddf
Bump node from 12.8-alpine to 12.9-alpine in /webapp 
Bumps node from 12.8-alpine to 12.9-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-22 04:26:44 +00:00
dependabot-preview[bot]
511326867f
Bump @vue/cli-shared-utils from 3.10.0 to 3.11.0 in /webapp 
Bumps [@vue/cli-shared-utils](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-shared-utils) from 3.10.0 to 3.11.0.
- [Release notes](https://github.com/vuejs/vue-cli/releases)
- [Changelog](https://github.com/vuejs/vue-cli/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-cli/commits/v3.11.0/packages/@vue/cli-shared-utils)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-22 04:24:51 +00:00
roschaefer
6e2ef65b99 Visual feedback if filters lead to 0 results 
This is one of the bugs/improvements suggested by @ulfgebhardt.
 2019-08-22 00:26:59 +02:00
Robert Schäfer
835eb8b68b
Merge pull request #1321 from Human-Connection/dependabot/npm_and_yarn/webapp/nuxt-2.9.1 
Bump nuxt from 2.8.1 to 2.9.1 in /webapp
 2019-08-21 23:53:09 +02:00
roschaefer
a7ebbcf154 Implement visual feedback if filter is active 2019-08-21 23:52:10 +02:00
roschaefer
9d02aaa377 Update css-loader along with nuxt 2019-08-21 22:39:42 +02:00
dependabot-preview[bot]
01c2c353d5
Bump nuxt from 2.8.1 to 2.9.1 in /webapp 
Bumps [nuxt](https://github.com/nuxt/nuxt.js) from 2.8.1 to 2.9.1.
- [Release notes](https://github.com/nuxt/nuxt.js/releases)
- [Changelog](https://github.com/nuxt/nuxt.js/blob/dev/RELEASE_PLAN.md)
- [Commits](https://github.com/nuxt/nuxt.js/compare/v2.8.1...v2.9.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-21 15:26:51 +00:00
dependabot-preview[bot]
176be03c48
Bump tiptap-extensions from 1.26.2 to 1.27.0 in /webapp 
Bumps [tiptap-extensions](https://github.com/scrumpy/tiptap) from 1.26.2 to 1.27.0.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap-extensions@1.26.2...tiptap-extensions@1.27.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-21 15:26:30 +00:00
Robert Schäfer
0dbf3275e6
Merge pull request #1327 from Human-Connection/dependabot/npm_and_yarn/webapp/tiptap-1.25.0 
Bump tiptap from 1.24.2 to 1.25.0 in /webapp
 2019-08-21 17:24:07 +02:00
Robert Schäfer
deb0fcabd4
Merge pull request #1268 from Human-Connection/post-needs-to-have-category#1222 
Validate that a post cannot be created without categories/too many categories
 2019-08-21 16:28:32 +02:00
Robert Schäfer
3f9708183c
Merge pull request #1329 from Human-Connection/dependabot/npm_and_yarn/webapp/nuxtjs/axios-5.6.0 
Bump @nuxtjs/axios from 5.5.4 to 5.6.0 in /webapp
 2019-08-21 16:03:21 +02:00
Robert Schäfer
834a3b11d9
Merge pull request #1330 from Human-Connection/dependabot/npm_and_yarn/webapp/nuxt-dropzone-1.0.3 
Bump nuxt-dropzone from 1.0.2 to 1.0.3 in /webapp
 2019-08-21 16:01:34 +02:00
Robert Schäfer
ce4f3bdff3
Merge pull request #1336 from Human-Connection/fix-vue-warnings-masonry-grid 
Fix vue warnings for MasonryGrid/MasonGridItem
 2019-08-21 15:49:21 +02:00
Wolfgang Huß
9a799657e9 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1062-notification-about-comment-on-post 
# Conflicts:
#	backend/src/middleware/handleHtmlContent/handleContentData.js
 2019-08-21 14:42:19 +02:00
Wolfgang Huß
3d2df56141 Backend tests 2019-08-21 14:27:32 +02:00
Robert Schäfer
be407080ef
Merge pull request #1318 from Human-Connection/dependabot/npm_and_yarn/webapp/sass-loader-7.3.1 
Bump sass-loader from 7.2.0 to 7.3.1 in /webapp
 2019-08-21 13:44:32 +02:00
Robert Schäfer
9dd92b7cbe
Merge pull request #1325 from Human-Connection/dependabot/npm_and_yarn/webapp/date-fns-2.0.0 
Bump date-fns from 2.0.0-beta.5 to 2.0.0 in /webapp
 2019-08-21 13:33:43 +02:00
Matt Rider
d1008cd0c7 Fix vue warnings 
- localVue.use(Styleguide) to register components
- find masonryGrid and emit event

- Co-authored-by: Alina Beck <alina.beck@mail.com>
- Co-authored-by: Joseph Ngugi <jngugi88@gmail.com>
 2019-08-21 13:17:32 +02:00