IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2025-12-13 07:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,801 Commits 5 Branches 2 Tags
Commit Graph

3801 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dependabot-preview[bot]
4f9127a9f9
Bump graphql-shield from 5.6.1 to 5.7.1 in /backend 
Bumps [graphql-shield](https://github.com/maticzav/graphql-shield) from 5.6.1 to 5.7.1.
- [Release notes](https://github.com/maticzav/graphql-shield/releases)
- [Commits](https://github.com/maticzav/graphql-shield/compare/v5.6.1...v5.7.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-21 09:53:10 +00:00
Robert Schäfer
6ad99b1a73
Merge pull request #875 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-plugin-jest-22.7.0 
Bump eslint-plugin-jest from 22.6.4 to 22.7.0 in /backend
 2019-06-21 11:51:07 +02:00
dependabot-preview[bot]
872562029d
Bump eslint-plugin-jest from 22.6.4 to 22.7.0 in /backend 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.6.4 to 22.7.0.
- [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.6.4...v22.7.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-21 04:29:58 +00:00
mattwr18
a01d4ba721
Merge pull request #866 from Human-Connection/dependabot/npm_and_yarn/backend/graphql-shield-5.6.1 
Bump graphql-shield from 5.3.8 to 5.6.1 in /backend
 2019-06-20 17:27:27 -03:00
mattwr18
3c1d72c9db
Merge pull request #865 from Human-Connection/dependabot/npm_and_yarn/backend/graphql-yoga-1.18.0 
Bump graphql-yoga from 1.17.4 to 1.18.0 in /backend
 2019-06-20 17:27:06 -03:00
dependabot-preview[bot]
37b913620f
Bump graphql-shield from 5.3.8 to 5.6.1 in /backend 
Bumps [graphql-shield](https://github.com/maticzav/graphql-shield) from 5.3.8 to 5.6.1.
- [Release notes](https://github.com/maticzav/graphql-shield/releases)
- [Commits](https://github.com/maticzav/graphql-shield/compare/v5.3.8...v5.6.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-20 04:35:38 +00:00
dependabot-preview[bot]
c1ca7c6e58
Bump graphql-yoga from 1.17.4 to 1.18.0 in /backend 
Bumps [graphql-yoga](https://github.com/prisma/graphql-yoga) from 1.17.4 to 1.18.0.
- [Release notes](https://github.com/prisma/graphql-yoga/releases)
- [Commits](https://github.com/prisma/graphql-yoga/compare/v1.17.4...v1.18.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-20 04:34:36 +00:00
Ulf Gebhardt
0c3e53a239
Merge pull request #836 from Human-Connection/835-use-vuex-to-make-editor-placeholder-reactive 
Set up editor placeholder to use Vuex
 2019-06-19 14:59:17 +02:00
Ulf Gebhardt
40010826ba
Merge pull request #851 from Human-Connection/dependabot/npm_and_yarn/backend/babel-eslint-10.0.2 
Bump babel-eslint from 10.0.1 to 10.0.2 in /backend
 2019-06-19 14:57:46 +02:00
Ulf Gebhardt
8debbd03eb
Merge pull request #854 from Human-Connection/dependabot/npm_and_yarn/webapp/babel-eslint-10.0.2 
Bump babel-eslint from 10.0.1 to 10.0.2 in /webapp
 2019-06-19 14:57:06 +02:00
Ulf Gebhardt
c91932a028
Merge pull request #861 from Human-Connection/dependabot/npm_and_yarn/webapp/apollo-client-2.6.3 
Bump apollo-client from 2.6.2 to 2.6.3 in /webapp
 2019-06-19 14:56:34 +02:00
Ulf Gebhardt
288b0606bd
Merge pull request #862 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-client-2.6.3 
Bump apollo-client from 2.6.2 to 2.6.3 in /backend
 2019-06-19 14:55:08 +02:00
dependabot-preview[bot]
2e66c671c2
Bump apollo-client from 2.6.2 to 2.6.3 in /backend 
Bumps [apollo-client](https://github.com/apollographql/apollo-client) from 2.6.2 to 2.6.3.
- [Release notes](https://github.com/apollographql/apollo-client/releases)
- [Changelog](https://github.com/apollographql/apollo-client/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-client/compare/apollo-client@2.6.2...apollo-client@2.6.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-19 04:20:14 +00:00
dependabot-preview[bot]
a6a0ee16a0
Bump apollo-client from 2.6.2 to 2.6.3 in /webapp 
Bumps [apollo-client](https://github.com/apollographql/apollo-client) from 2.6.2 to 2.6.3.
- [Release notes](https://github.com/apollographql/apollo-client/releases)
- [Changelog](https://github.com/apollographql/apollo-client/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-client/compare/apollo-client@2.6.2...apollo-client@2.6.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-19 04:19:09 +00:00
Alexander Friedland
5a80c6df6f
Merge pull request #855 from Human-Connection/436-Menu-in-Post-Scroll-to-Comment-section 
When you call up a post you can scroll to the comments
 2019-06-18 15:20:39 +02:00
Alexander Friedland
fbad4ce6ce
Merge pull request #856 from Human-Connection/849-Text-description-for-Filter-Bubble 
Fix a text description for the filter bubble
 2019-06-18 15:12:19 +02:00
Alexander Friedland
524dec1095
Merge pull request #786 from Human-Connection/764-Untranslated-Texts-in-Post-Page 
[Bug] Untranslated Texts in Post Page #764
 2019-06-18 15:07:42 +02:00
senderfm
8484704460 Fix a text description for the filter bubble 2019-06-18 10:49:20 +02:00
senderfm
0a66ad56d9 Fix Specs, lint, fix test 2019-06-18 09:58:29 +02:00
dependabot-preview[bot]
ef5a20b3df
Bump babel-eslint from 10.0.1 to 10.0.2 in /webapp 
Bumps [babel-eslint](https://github.com/babel/babel-eslint) from 10.0.1 to 10.0.2.
- [Release notes](https://github.com/babel/babel-eslint/releases)
- [Commits](https://github.com/babel/babel-eslint/compare/v10.0.1...v10.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-18 05:06:24 +00:00
dependabot-preview[bot]
994eecd2c2
Bump babel-eslint from 10.0.1 to 10.0.2 in /backend 
Bumps [babel-eslint](https://github.com/babel/babel-eslint) from 10.0.1 to 10.0.2.
- [Release notes](https://github.com/babel/babel-eslint/releases)
- [Commits](https://github.com/babel/babel-eslint/compare/v10.0.1...v10.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-18 05:04:09 +00:00
mattwr18
00286ef6b9
Merge pull request #843 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-link-http-1.5.15 
Bump apollo-link-http from 1.5.14 to 1.5.15 in /backend
 2019-06-17 19:33:05 -03:00
Matt Rider
fa1613543c Merge branch 'dependabot/npm_and_yarn/backend/apollo-link-http-1.5.15' of github.com:Human-Connection/Human-Connection into dependabot/npm_and_yarn/backend/apollo-link-http-1.5.15 2019-06-17 18:17:51 -03:00
Matt Rider
a750e66063 Merge branch 'master' of github.com:Human-Connection/Human-Connection into dependabot/npm_and_yarn/backend/apollo-link-http-1.5.15 2019-06-17 18:17:30 -03:00
dependabot-preview[bot]
eadfbe6190
Bump apollo-link-http from 1.5.14 to 1.5.15 in /backend 
Bumps [apollo-link-http](https://github.com/apollographql/apollo-link) from 1.5.14 to 1.5.15.
- [Release notes](https://github.com/apollographql/apollo-link/releases)
- [Changelog](https://github.com/apollographql/apollo-link/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-link/compare/apollo-link-http@1.5.14...apollo-link-http@1.5.15)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-17 21:17:00 +00:00
mattwr18
95fc61697a
Merge pull request #842 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-config-prettier-5.0.0 
Bump eslint-config-prettier from 4.3.0 to 5.0.0 in /backend
 2019-06-17 18:15:13 -03:00
mattwr18
115d230181
Merge pull request #841 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-link-context-1.0.18 
Bump apollo-link-context from 1.0.17 to 1.0.18 in /backend
 2019-06-17 18:14:52 -03:00
mattwr18
ce77ec28ce
Merge pull request #838 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-config-prettier-5.0.0 
Bump eslint-config-prettier from 4.3.0 to 5.0.0 in /webapp
 2019-06-17 18:14:28 -03:00
mattwr18
4014fcaed7
Merge pull request #840 from Human-Connection/dependabot/npm_and_yarn/backend/date-fns-2.0.0-alpha.34 
Bump date-fns from 2.0.0-alpha.33 to 2.0.0-alpha.34 in /backend
 2019-06-17 18:14:02 -03:00
mattwr18
0a7546fdb3
Merge pull request #837 from Human-Connection/dependabot/npm_and_yarn/webapp/date-fns-2.0.0-alpha.34 
Bump date-fns from 2.0.0-alpha.33 to 2.0.0-alpha.34 in /webapp
 2019-06-17 18:13:38 -03:00
Matt Rider
35428fbaaa Add test for LocaleSwitch 2019-06-17 10:07:53 -03:00
dependabot-preview[bot]
7458fd62e2
Bump apollo-link-http from 1.5.14 to 1.5.15 in /backend 
Bumps [apollo-link-http](https://github.com/apollographql/apollo-link) from 1.5.14 to 1.5.15.
- [Release notes](https://github.com/apollographql/apollo-link/releases)
- [Changelog](https://github.com/apollographql/apollo-link/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-link/compare/apollo-link-http@1.5.14...apollo-link-http@1.5.15)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-17 04:59:16 +00:00
dependabot-preview[bot]
4566980eaa
Bump eslint-config-prettier from 4.3.0 to 5.0.0 in /backend 
Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) from 4.3.0 to 5.0.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/v4.3.0...v5.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-17 04:58:59 +00:00
dependabot-preview[bot]
8ff98cbc25
Bump apollo-link-context from 1.0.17 to 1.0.18 in /backend 
Bumps [apollo-link-context](https://github.com/apollographql/apollo-link) from 1.0.17 to 1.0.18.
- [Release notes](https://github.com/apollographql/apollo-link/releases)
- [Changelog](https://github.com/apollographql/apollo-link/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-link/compare/apollo-link-context@1.0.17...apollo-link-context@1.0.18)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-17 04:58:20 +00:00
dependabot-preview[bot]
dc420d4116
Bump date-fns from 2.0.0-alpha.33 to 2.0.0-alpha.34 in /backend 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.0.0-alpha.33 to 2.0.0-alpha.34.
- [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-alpha.33...v2.0.0-alpha.34)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-17 04:57:46 +00:00
dependabot-preview[bot]
1cdaef179e
Bump eslint-config-prettier from 4.3.0 to 5.0.0 in /webapp 
Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) from 4.3.0 to 5.0.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/v4.3.0...v5.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-17 04:56:53 +00:00
dependabot-preview[bot]
31dde68ff2
Bump date-fns from 2.0.0-alpha.33 to 2.0.0-alpha.34 in /webapp 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.0.0-alpha.33 to 2.0.0-alpha.34.
- [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-alpha.33...v2.0.0-alpha.34)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-17 04:56:26 +00:00
Matt Rider
01eb25eca6 Update CommentForm with vuex 2019-06-15 16:15:49 -03:00
Matt Rider
4adc450f43 Fix failing test 
- add Vuex, with editor/placeholder getter
 2019-06-15 15:53:30 -03:00
Matt Rider
e583486143 Set up editor placeholder to use Vuex 
- to make reactive
- safer than using global event buses ($root.$emit)

Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
Co-authored-by: Mike Aono <aonomike@gmail.com>
 2019-06-15 15:23:51 -03:00
mattwr18
53ce72908b
Merge pull request #833 from Human-Connection/832-fix-empty-placeholder-new-contributions 
Add placeholder for new contributions
 2019-06-15 08:52:23 -03:00
mattwr18
54ca9a6e0c
Merge pull request #831 from Human-Connection/804-turn-root-listener-off 
Turn off $root listeners in beforeDestroy
 2019-06-15 08:51:54 -03:00
mattwr18
e5edf6e756
Merge pull request #720 from Human-Connection/dependabot/npm_and_yarn/webapp/tiptap-1.21.0 
Bump tiptap from 1.20.1 to 1.21.0 in /webapp
 2019-06-14 18:08:58 -03:00
Matt Rider
35878d3fa9 Merge branch 'dependabot/npm_and_yarn/webapp/tiptap-1.21.0' of github.com:Human-Connection/Human-Connection into dependabot/npm_and_yarn/webapp/tiptap-1.21.0 2019-06-14 17:24:18 -03:00
Matt Rider
4cc810205a Merge branch 'master' of github.com:Human-Connection/Human-Connection into dependabot/npm_and_yarn/webapp/tiptap-1.21.0 2019-06-14 17:22:46 -03:00
Matt Rider
ebb73c8782 Add placeholder for new contributions 2019-06-14 17:18:09 -03:00
Robert Schäfer
869383be25
Merge pull request #830 from Human-Connection/2019/kw23/import_images_improvements 
2019/kw24/import_images_improvements
 2019-06-14 21:15:37 +02:00
Wolfgang Huß
60bbd3f408
Merge pull request #763 from Human-Connection/734-authorization-problem-disabling-post 
Authorisation problem when disabling a post
 2019-06-14 20:45:02 +02:00
Wolfgang Huß
23185fa29e Fix a problem in PostMutations.js which came in through merging the master 2019-06-14 20:25:25 +02:00
Wolfgang Huß
68dcbacaff Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 734-authorization-problem-disabling-post 
# Conflicts:
#	webapp/components/ContributionForm/index.vue
#	webapp/graphql/PostMutations.js
 2019-06-14 19:02:33 +02:00