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

16408 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Grzegorz Leoniec
fb9a8605a9 First attempt of using storybook for component dev 2019-06-24 21:03:54 +02:00
Matt Rider
7796483a46 Add test for upload error, update variable name 2019-06-24 12:45:53 -03: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
Wolfgang Huß
8c2c731322 Backfactored as close as possible to original of Mention.js 2019-06-24 12:34:14 +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
senderfm
a678f05574 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 844-Comments-cannot-be-expanded-if-they-are-too-long 2019-06-24 11:32:41 +02:00
Wolfgang Huß
1f0f8c9e39 Set Hashtag also by press space and creates then a new one 
Changed Tag permissionMiddleware from isAdmin to allow.
 2019-06-24 09:25:36 +02:00
Wolfgang Huß
a80320007c Merge remote-tracking branch 'origin/master' into 779-tags-of-contribution-in-text 2019-06-24 07:47:42 +02:00
Matt Rider
6bd153b7cc Remove --force as it didn't make a difference 2019-06-22 13:57:20 -03:00
Matt Rider
aff2b4aaf0 Revert graphql-shield 
- broke the CreatePost functionality when image was added 🤷

Co-authored-by: Mike Aono <aonomike@gmail.com>
 2019-06-22 13:55:03 -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
Matt Rider
6fccece6db Merge branch 'master' of github.com:Human-Connection/Human-Connection into 759-teaser-image-create-posts 2019-06-22 08:14:14 -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
Matt Rider
9cbeacea64 Update test to use filters 2019-06-21 19:00:02 -03:00
Matt Rider
bbeb61e1eb Merge branch 'master' of github.com:Human-Connection/Human-Connection into 759-teaser-image-create-posts 2019-06-21 18:51:34 -03: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
Matt Rider
6367d226ff Styling, tweak to work with edit and create 2019-06-21 13:16:18 -03:00
senderfm
6ab519b114 Fix edit gitignore 2019-06-21 16:22:54 +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
senderfm
9ae9cdacad Fix specs, Fix lint, Fix tests 2019-06-21 14:32:59 +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
Wolfgang Huß
5018e60a13 Renamed Tag to Hashtag in the Frontend 
Not in the database yet …
 2019-06-21 14:10:56 +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
senderfm
a9161f4cee Fix lint backend/seed/factories/reports.js 2019-06-21 13:41:44 +02:00
senderfm
b160fe9b5a Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 844-Comments-cannot-be-expanded-if-they-are-too-long 2019-06-21 13:11:41 +02:00