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

4123 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Robert Schäfer
9ec9034ea5 Fix translatios as suggested by @Tirokk 2019-06-20 15:25:59 +02:00
Robert Schäfer
ff46740e90 Follow @mattwr18 suggetions don't enter mail twice 2019-06-20 15:13:22 +02:00
Wolfgang Huß
c5f2d7cc78 Solve remaind merge conflict 2019-06-20 11:26:51 +02:00
Wolfgang Huß
42942e4777 Merge remote-tracking branch 'origin/master' into 779-tags-of-contribution-in-text 
# Conflicts:
#	webapp/components/Editor/index.vue
 2019-06-20 10:37:10 +02:00
Wolfgang Huß
ffbe0b949a Translate menu item, renamed variables and tried to get hashtag to work correct 2019-06-20 08:40:05 +02: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
Robert Schäfer
9dd340c69b Template emails based on postmark-templates 
Credit: https://github.com/wildbit/postmark-templates/

Also we distinguish now if a user has been found and if not. The
password reset link brings us directly to the last step in the flow.
 2019-06-20 01:29:50 +02:00
Robert Schäfer
61ad100bfb Get rid of unnecessary .env var - document it 2019-06-20 00:09:26 +02:00
senderfm
d85f49fb15 Fix: long comments can be folded up and down 2019-06-19 17:45:52 +02:00
Robert Schäfer
3f5e9a21cc Disable SEND_MAILS for local development and test 
.. but enable it by default for `docker-compose.override.yml`. If the developer
uses `docker-compose` we can safely assume that a local smtp server for
development is running.
 2019-06-19 15:03:38 +02: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
Robert Schäfer
c85c94aa40 Splitting components, better route navigation 
This also allows us to generate a password reset link to quickly reset
your password without entering the code and email manually.
 2019-06-19 14:23:22 +02:00
Ulf Gebhardt
9cbb736d70
cleanup import todo 2019-06-19 13:54:20 +02:00
Robert Schäfer
a7eced5f8e Redirect to `/' if user is authenticated 2019-06-19 13:40:08 +02:00
Ulf Gebhardt
7613ddfc04
lint fixes 2019-06-19 13:36:14 +02:00
Ulf Gebhardt
aa54433afb
improved accuracy of import to reflect different types of contributions & follows. Cleaned neo4j import folder structure 2019-06-19 13:35:21 +02:00
Robert Schäfer
217c905800 Merge remote-tracking branch 'origin/master' into 801_reset_password 2019-06-19 13:26:13 +02:00
Ulf Gebhardt
65471efb0d
removed fixImageUrls reference 2019-06-19 13:08:51 +02:00
Wolfgang Huß
4725b8cbd2 Got Tags as # in the editor as an extension to work 2019-06-19 09:12:26 +02:00
Wolfgang Huß
49568259b0 Merge remote-tracking branch 'origin/master' into 779-tags-of-contribution-in-text 2019-06-19 07:42:38 +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
Robert Schäfer
304fd028f0 Leftover token=>code 2019-06-18 23:51:54 +02:00
Robert Schäfer
38327ddf71 Split password flow into different routes part 1 2019-06-18 23:49:38 +02:00
Robert Schäfer
d8eca07c21 Fix lint 2019-06-18 23:28:48 +02:00
Robert Schäfer
29b910cfb7 Really basic passwordReset flow works 2019-06-18 23:28:06 +02:00
Robert Schäfer
cc26d0be94 Handle passwordReset response on reset page 2019-06-18 22:48:53 +02:00
Robert Schäfer
506fe0fe94 Add support instructions 2019-06-18 22:35:52 +02:00
Robert Schäfer
7446464d6c Better translations 2019-06-18 19:08:59 +02:00
Robert Schäfer
ba185bcb65 Refactor backend 2019-06-18 19:03:59 +02:00