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

4208 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Robert Schäfer
efd105408c
Merge pull request #870 from Human-Connection/dependabot/npm_and_yarn/backend/date-fns-2.0.0-alpha.35 
Bump date-fns from 2.0.0-alpha.34 to 2.0.0-alpha.35 in /backend
 2019-06-21 11:57:31 +02:00
Robert Schäfer
dbf3cdffc8
Merge pull request #872 from Human-Connection/dependabot/npm_and_yarn/webapp/date-fns-2.0.0-alpha.35 
Bump date-fns from 2.0.0-alpha.34 to 2.0.0-alpha.35 in /webapp
 2019-06-21 11:56:59 +02:00
dependabot-preview[bot]
e0e31d46fd
Bump apollo-server from 2.6.3 to 2.6.4 in /backend 
Bumps [apollo-server](https://github.com/apollographql/apollo-server) from 2.6.3 to 2.6.4.
- [Release notes](https://github.com/apollographql/apollo-server/releases)
- [Changelog](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-server/compare/apollo-server@2.6.3...apollo-server@2.6.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-21 09:53:57 +00:00
dependabot-preview[bot]
ba9092fa75
Bump eslint-plugin-jest from 22.6.4 to 22.7.0 in /webapp 
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 09:53:14 +00:00
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
a53268a649
Merge pull request #874 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-testing-2.6.4 
Bump apollo-server-testing from 2.6.3 to 2.6.4 in /backend
 2019-06-21 11:51:46 +02: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
dependabot-preview[bot]
4ed9b4c8ad
Bump apollo-server-testing from 2.6.3 to 2.6.4 in /backend 
Bumps [apollo-server-testing](https://github.com/apollographql/apollo-server) from 2.6.3 to 2.6.4.
- [Release notes](https://github.com/apollographql/apollo-server/releases)
- [Changelog](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-server/compare/apollo-server-testing@2.6.3...apollo-server-testing@2.6.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-21 04:29:13 +00:00
dependabot-preview[bot]
3f8dc10fab
Bump date-fns from 2.0.0-alpha.34 to 2.0.0-alpha.35 in /webapp 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.0.0-alpha.34 to 2.0.0-alpha.35.
- [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.35)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-21 04:28:28 +00:00
dependabot-preview[bot]
11bb5f37c3
Bump date-fns from 2.0.0-alpha.34 to 2.0.0-alpha.35 in /backend 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.0.0-alpha.34 to 2.0.0-alpha.35.
- [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.35)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-21 04:27:18 +00:00
Matt Rider
d2d692ec8f Get working with edit contribution, styling 2019-06-20 22:47:31 -03:00
Matt Rider
51153ca870 Update test, use destructuring to clean up code 2019-06-20 18:04:21 -03: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
Matt Rider
be70088dd7 Get imageUpload working for Posts 2019-06-20 17:05:47 -03:00
Matt Rider
7d9e6623ea Merge branch 'master' of github.com:Human-Connection/Human-Connection into 759-teaser-image-create-posts 2019-06-20 12:28:26 -03:00
Matt Rider
7a5636fdc2 Add enableDeletionValue to unlock deletion 
- Thanks @Tirokk for pointing this out. How was this even working before?
 2019-06-20 12:07:16 -03:00
Matt Rider
8a77fcff15 Fix failing test, console.errors 2019-06-20 11:57:52 -03:00
Robert Schäfer
da30001ba8 Testing mail delivery with a remote SMTP server 2019-06-20 15:54:56 +02:00
Robert Schäfer
1ed338542c Another suggestion by @Tirokk 2019-06-20 15:33:48 +02:00