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,916 Commits 5 Branches 2 Tags
Commit Graph

3916 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Schäfer
4ea6834919
Merge pull request #881 from Human-Connection/paginage_12_entries 
Page size of 12 entries on / page
 2019-06-25 11:50:23 +02:00
Robert Schäfer
ef9b43f1da
Merge pull request #901 from Human-Connection/900-refactor-create-comments-mutation-remove-global-event-listener-update-cache 
Refactor CreateComments functionality
 2019-06-25 11:49:19 +02:00
Robert Schäfer
ad51da8e3c
Merge pull request #882 from Human-Connection/unfork-neo4j-graphql-js 
Use upstream neo4j-graphql-js
 2019-06-25 11:48:10 +02:00
Robert Schäfer
9b7a0f0031
Merge pull request #898 from Human-Connection/895-write-component-tests-for-update-post 
Write tests for UpdatePost, refactor tests
 2019-06-25 11:47:04 +02:00
Robert Schäfer
a1882859b4
Merge pull request #902 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-plugin-import-2.18.0 
Bump eslint-plugin-import from 2.17.3 to 2.18.0 in /backend
 2019-06-25 11:46:36 +02:00
Robert Schäfer
7140950c59
Merge pull request #903 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-vue-5.2.3 
Bump eslint-plugin-vue from 5.2.2 to 5.2.3 in /webapp
 2019-06-25 11:45:52 +02:00
Robert Schäfer
d45d7e2622
Merge pull request #904 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-import-2.18.0 
Bump eslint-plugin-import from 2.17.3 to 2.18.0 in /webapp
 2019-06-25 11:44:59 +02:00
dependabot-preview[bot]
b723093c06
Bump eslint-plugin-import from 2.17.3 to 2.18.0 in /webapp 
Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import) from 2.17.3 to 2.18.0.
- [Release notes](https://github.com/benmosher/eslint-plugin-import/releases)
- [Changelog](https://github.com/benmosher/eslint-plugin-import/blob/master/CHANGELOG.md)
- [Commits](https://github.com/benmosher/eslint-plugin-import/compare/v2.17.3...v2.18.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-25 04:26:49 +00:00
dependabot-preview[bot]
e27fd6c0e4
Bump eslint-plugin-vue from 5.2.2 to 5.2.3 in /webapp 
Bumps [eslint-plugin-vue](https://github.com/vuejs/eslint-plugin-vue) from 5.2.2 to 5.2.3.
- [Release notes](https://github.com/vuejs/eslint-plugin-vue/releases)
- [Commits](https://github.com/vuejs/eslint-plugin-vue/compare/v5.2.2...v5.2.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-25 04:26:05 +00:00
dependabot-preview[bot]
21b38e1942
Bump eslint-plugin-import from 2.17.3 to 2.18.0 in /backend 
Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import) from 2.17.3 to 2.18.0.
- [Release notes](https://github.com/benmosher/eslint-plugin-import/releases)
- [Changelog](https://github.com/benmosher/eslint-plugin-import/blob/master/CHANGELOG.md)
- [Commits](https://github.com/benmosher/eslint-plugin-import/compare/v2.17.3...v2.18.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-25 04:25:55 +00:00
mattwr18
49cc012da3
Merge pull request #877 from Human-Connection/dependabot/npm_and_yarn/backend/date-fns-2.0.0-alpha.36 
Bump date-fns from 2.0.0-alpha.34 to 2.0.0-alpha.36 in /backend
 2019-06-24 20:18:03 -03:00
mattwr18
dca4e34623
Merge pull request #888 from Human-Connection/dependabot/npm_and_yarn/webapp/date-fns-2.0.0-alpha.36 
Bump date-fns from 2.0.0-alpha.35 to 2.0.0-alpha.36 in /webapp
 2019-06-24 20:15:56 -03:00
mattwr18
af0ecdc1b7
Merge pull request #890 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-plugin-jest-22.7.1 
Bump eslint-plugin-jest from 22.7.0 to 22.7.1 in /backend
 2019-06-24 20:15:37 -03:00
mattwr18
028460a515
Merge pull request #889 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-jest-22.7.1 
Bump eslint-plugin-jest from 22.7.0 to 22.7.1 in /webapp
 2019-06-24 20:15:15 -03:00
Matt Rider
6908cd6316 Fix lint 
- remove unused variable
 2019-06-24 19:11:59 -03:00
Matt Rider
c6203ad8eb Refactor CreateComments functionality 
- update apollo cache on successful mutation
- remove global event listener
- avoid refetch Post to update CommentsList
- return comment with its author from resolver
 2019-06-24 18:21:52 -03:00
Matt Rider
49fff114b3 Write tests for UpdatePost, refactor tests 2019-06-24 16:38:33 -03:00
dependabot-preview[bot]
37e8eb9a68
Bump date-fns from 2.0.0-alpha.34 to 2.0.0-alpha.36 in /backend 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.0.0-alpha.34 to 2.0.0-alpha.36.
- [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.34...v2.0.0-alpha.36)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-24 19:37:14 +00:00
Robert Schäfer
96cda680bb Use upstream neo4j-graphql-js 
After the relevant PR of mine has been merged, we should point our
`package.json` back to the published npm version of `neo4j-graphql-js`.
That way we are receiving updates again.
 2019-06-24 21:33:23 +02:00
dependabot-preview[bot]
b30b7d7d78
Bump date-fns from 2.0.0-alpha.35 to 2.0.0-alpha.36 in /webapp 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.0.0-alpha.35 to 2.0.0-alpha.36.
- [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.35...v2.0.0-alpha.36)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-24 19:28:36 +00:00
dependabot-preview[bot]
be737e4dc8
Bump eslint-plugin-jest from 22.7.0 to 22.7.1 in /webapp 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.7.0 to 22.7.1.
- [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.7.0...v22.7.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-24 19:28:32 +00:00
dependabot-preview[bot]
0ebfdd27c5
Bump eslint-plugin-jest from 22.7.0 to 22.7.1 in /backend 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.7.0 to 22.7.1.
- [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.7.0...v22.7.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-24 19:28:15 +00:00
Robert Schäfer
90fe507791 Page size of 12 entries on / page 
It annoys me that there are gaps for the 3 column layout, even if there
are more records left. So, the newsfeed layout has 1 column on mobile, 2
columns on tablet, and 3 columns on a desktop pc. So we should choose a
page size which is dividable by 1,2 and 3 that is 6. I have chosen 12
which is 2*6 to avoid clicking the reload posts button so often.
 2019-06-24 21:28:06 +02:00
Robert Schäfer
eb93127add
Merge pull request #893 from Human-Connection/deploy_development_mailserver 
Deploy development mailserver
 2019-06-24 21:25:51 +02:00
Robert Schäfer
301b530efc
Merge pull request #885 from Human-Connection/883-fix-build 
Fix failing build due to lorempixel.com being down
 2019-06-24 21:22:11 +02:00
Matt Rider
0336e860d0 Fix failing build 
- adding updated faker to root level package.json
 2019-06-24 12:01:21 -03:00
Matt Rider
b84bd6fbb3 Try with imageUrl 2019-06-24 11:44:03 -03:00
Robert Schäfer
91e7e2adaf The protocol is not supposed to go into SMTP_HOST 2019-06-24 14:49:45 +02:00
Matt Rider
debbf2299b Use yarn add to add the faker master branch 2019-06-24 09:40:02 -03:00
Matt Rider
a85aa3c244 Update package.json faker import 2019-06-24 09:22:07 -03:00
Robert Schäfer
6ce96d906b Fix configmap template 2019-06-24 13:31:13 +02:00
Robert Schäfer
ce0e3cb520 Write documentation for mailserver deployment 2019-06-24 13:24:56 +02:00
Robert Schäfer
dd1d77f2bb Add env to configmap 2019-06-24 13:24:56 +02:00
Robert Schäfer
a2d99c9831 Write kubernetes deployment for dummy mailserver 2019-06-24 13:24:56 +02:00
Ulf Gebhardt
070bc23e30
Merge pull request #863 from Human-Connection/2019/kw25/improve_import_accuracy 
🍰 2019/kw25/improve_import_accuracy
 2019-06-24 13:03:24 +02:00
Ulf Gebhardt
5653242c32
Merge branch 'master' into 2019/kw25/improve_import_accuracy 2019-06-24 12:16:05 +02:00
Ulf Gebhardt
c14a4f3134
fixed deleted flag import 2019-06-24 12:06:09 +02:00
Matt Rider
6bd153b7cc Remove --force as it didn't make a difference 2019-06-22 13:57:20 -03:00
Matt Rider
f029439024 Force install all dependencies in the backend 2019-06-22 12:31:44 -03:00
Matt Rider
f551e9a637 Fix failing build due to lorempixel.com being down 2019-06-22 12:01:00 -03:00
Robert Schäfer
3c36cad373
Merge pull request #868 from Human-Connection/867-fix-vue-warn-enableDeletionValue 
Add enableDeletionValue to unlock deletion
 2019-06-22 08:54:48 +02:00
Robert Schäfer
181b4b48e6
Merge pull request #829 from Human-Connection/2019/kw24/fix_imported_img_urls 
🍰 2019/kw24/fix_imported_img_urls
 2019-06-21 23:41:32 +02:00
Robert Schäfer
dde8f90064
Merge pull request #834 from Human-Connection/801_reset_password 
801 reset password
 2019-06-21 23:02:10 +02:00
Robert Schäfer
86e538f7eb Merge branch 'fix_broken_master' into 801_reset_password 2019-06-21 22:39:51 +02:00
Robert Schäfer
3076f9f455 Get rid of console.errors in tests of FilterMenu 2019-06-21 22:11:41 +02:00
Robert Schäfer
5125967542
Merge pull request #871 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-jest-22.7.0 
Bump eslint-plugin-jest from 22.6.4 to 22.7.0 in /webapp
 2019-06-21 14:33:41 +02:00
Robert Schäfer
119a5c23ed
Merge pull request #873 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-2.6.4 
Bump apollo-server from 2.6.3 to 2.6.4 in /backend
 2019-06-21 14:33:13 +02:00
Robert Schäfer
15e4e1b6b8
Merge pull request #876 from Human-Connection/dependabot/npm_and_yarn/backend/graphql-shield-5.7.1 
Bump graphql-shield from 5.6.1 to 5.7.1 in /backend
 2019-06-21 14:32:40 +02:00
Robert Schäfer
6e1d334671 Add env to deployment 2019-06-21 14:06:20 +02:00
Robert Schäfer
9723bb12e3 Merge branch 'master' into 801_reset_password 2019-06-21 13:59:45 +02:00