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
3,879 Commits 117 Branches 1,511 Tags
Commit Graph

3879 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Schäfer
91e7e2adaf The protocol is not supposed to go into SMTP_HOST 2019-06-24 14:49:45 +02: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
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
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
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
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
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
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
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
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
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