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

1196 Commits

Author SHA1 Message Date
Alina Beck
e45948f4f0 use password reset template 2019-09-19 00:23:51 +01:00
Alina Beck
2bd7276523 improve padding 2019-09-19 00:14:13 +01:00
Alina Beck
a304dcbfdf add reset password template 2019-09-19 00:06:57 +01:00
Alina Beck
ec0cf36256 refactor email middleware 2019-09-18 18:00:34 +01:00
Alina Beck
96ced53843 fix hover effect for language toggle 2019-09-18 15:16:53 +01:00
Alina Beck
5b8d2eb2f6 fix lint errors 2019-09-18 14:49:39 +01:00
Alina Beck
b3deea4918 add language toggle 2019-09-18 14:39:03 +01:00
Alina Beck
e53609ab14 add german translation to signup template 2019-09-17 15:28:24 +01:00
Alina Beck
24fb601739 clean up email template 2019-09-17 15:17:36 +01:00
Alina Beck
f483220590 use nodemailer-html-to-text plugin to transform html content to plain text 2019-09-17 14:27:10 +01:00
Alina Beck
c94715a128 pass options to html template 2019-09-16 18:29:43 +01:00
Alina Beck
dcbeed319d add and style links 2019-09-16 18:16:43 +01:00
Alina Beck
61ce27464c adapt template to follow human connection styleguide (wip) 2019-09-16 17:02:59 +01:00
Alina Beck
58b56754a4 remove console log 2019-09-11 12:51:52 +01:00
Alina Beck
1cd354ff17 paste html template from TedGoas/Cerberus 2019-09-11 12:51:27 +01:00
Alina Beck
f802eab27d copy email text to separate file 2019-09-11 12:44:15 +01:00
Alina Beck
8c336a97d7 install mustache 2019-09-11 12:27:56 +01:00
mattwr18
04113a1d60
Merge pull request #1516 from Human-Connection/remove_nodemon 
Remove nodemon, use `nuxt` cli tools
 2019-09-11 08:39:56 +02:00
dependabot-preview[bot]
99c9d0d45e
Bump eslint-config-prettier from 6.2.0 to 6.3.0 in /backend 
Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) from 6.2.0 to 6.3.0.
- [Release notes](https://github.com/prettier/eslint-config-prettier/releases)
- [Changelog](https://github.com/prettier/eslint-config-prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/eslint-config-prettier/compare/v6.2.0...v6.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-11 04:20:41 +00:00
roschaefer
5cf82d5e18 Fix build 
Here are the issues
* webapp was built with `NODE_ENV=production` but started with
`NODE_ENV=development`
* using the provided `docker-compose.travis.yml` the command `yarn run
start` would look in the wrong folder
* removed duplicate environment definition
 2019-09-11 02:22:08 +02:00
Robert Schäfer
5586a2b5ea
Merge pull request #1512 from Human-Connection/refactor_email_middleware 
Refactor email middleware
 2019-09-11 01:58:37 +02:00
mattwr18
3712a5d2cf
Merge pull request #1513 from Human-Connection/bugfix_about_me_not_saved_on_signup_verification 
Bugfix: `about me` not saved on signup
 2019-09-10 17:37:22 +02:00
roschaefer
99fe0b001f Fix German signup mail, follow @mattwr18's review 
https://github.com/Human-Connection/Human-Connection/pull/1512#pullrequestreview-285968139
 2019-09-10 16:24:43 +02:00
Robert Schäfer
6cebb61d0f
Merge pull request #1490 from Human-Connection/1488-filter-posts-by-emotion 
Filter posts by emotions
 2019-09-10 15:53:05 +02:00
roschaefer
22af1399b3 Follow @mattwr18's review 2019-09-10 15:40:10 +02:00
mattwr18
77eb8274f3 Improve English grammar in test descriptions 
- Fix typo
- use gender neutral pronoun
- fix third-person conjugation
 2019-09-10 15:39:34 +02:00
roschaefer
b656b5aeb9 Check that about actually gets saved 2019-09-10 15:39:34 +02:00
roschaefer
0cd7ac3d32 Refactor slugifyMiddleware 
* eliminate GraphQL from spec
* much better error handling
* add EmailAdress factory
 2019-09-10 15:39:34 +02:00
mattwr18
42add14856
Merge pull request #1531 from Human-Connection/dependabot/npm_and_yarn/backend/neode-0.3.3 
Bump neode from 0.3.2 to 0.3.3 in /backend
 2019-09-10 15:06:25 +02:00
mattwr18
153bd918bc
Merge pull request #1528 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-link-http-1.5.16 
Bump apollo-link-http from 1.5.15 to 1.5.16 in /backend
 2019-09-10 15:06:09 +02:00
mattwr18
7618318a8a
Merge pull request #1526 from Human-Connection/dependabot/npm_and_yarn/backend/babel/cli-7.6.0 
Bump @babel/cli from 7.5.5 to 7.6.0 in /backend
 2019-09-10 15:05:56 +02:00
mattwr18
c7b590d6b0
Merge pull request #1523 from Human-Connection/dependabot/npm_and_yarn/backend/babel/preset-env-7.6.0 
Bump @babel/preset-env from 7.5.5 to 7.6.0 in /backend
 2019-09-10 15:05:34 +02:00
mattwr18
2b1590aae1 Add German translation to email template, _ for unused variables 2019-09-10 10:30:17 +02:00
mattwr18
0c83d276bb Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1488-filter-posts-by-emotion 2019-09-10 09:32:45 +02:00
dependabot-preview[bot]
1ee2ebe8e7
Bump @babel/preset-env from 7.5.5 to 7.6.0 in /backend 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.5.5 to 7.6.0.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.5.5...v7.6.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-10 06:34:32 +00:00
dependabot-preview[bot]
02ad873427
Bump @babel/cli from 7.5.5 to 7.6.0 in /backend 
Bumps [@babel/cli](https://github.com/babel/babel) from 7.5.5 to 7.6.0.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.5.5...v7.6.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-10 06:34:07 +00:00
dependabot-preview[bot]
00b45b8016
Bump @babel/node from 7.5.5 to 7.6.1 in /backend 
Bumps [@babel/node](https://github.com/babel/babel) from 7.5.5 to 7.6.1.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.5.5...v7.6.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-10 06:34:07 +00:00
dependabot-preview[bot]
53baad9f4d
Bump neode from 0.3.2 to 0.3.3 in /backend 
Bumps [neode](https://github.com/adam-cowley/neode) from 0.3.2 to 0.3.3.
- [Release notes](https://github.com/adam-cowley/neode/releases)
- [Commits](https://github.com/adam-cowley/neode/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-10 06:32:06 +00:00
mattwr18
aeaa637ff0
Merge pull request #1530 from Human-Connection/dependabot/npm_and_yarn/backend/babel/core-7.6.0 
Bump @babel/core from 7.5.5 to 7.6.0 in /backend
 2019-09-10 08:32:04 +02:00
dependabot-preview[bot]
d0ff75cca6
Bump apollo-link-http from 1.5.15 to 1.5.16 in /backend 
Bumps [apollo-link-http](https://github.com/apollographql/apollo-link) from 1.5.15 to 1.5.16.
- [Release notes](https://github.com/apollographql/apollo-link/releases)
- [Changelog](https://github.com/apollographql/apollo-link/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-link/compare/apollo-link-http@1.5.15...apollo-link-http@1.5.16)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-10 06:31:39 +00:00
mattwr18
250976698b
Merge pull request #1524 from Human-Connection/dependabot/npm_and_yarn/backend/graphql-shield-6.1.0 
Bump graphql-shield from 6.0.6 to 6.1.0 in /backend
 2019-09-10 08:30:54 +02:00
mattwr18
6c36f61218
Merge pull request #1520 from Human-Connection/dependabot/npm_and_yarn/backend/babel/register-7.6.0 
Bump @babel/register from 7.5.5 to 7.6.0 in /backend
 2019-09-10 08:30:21 +02:00
mattwr18
7292c15cd0
Merge pull request #1519 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-link-context-1.0.19 
Bump apollo-link-context from 1.0.18 to 1.0.19 in /backend
 2019-09-10 08:29:47 +02:00
mattwr18
d9f8cf02ca
Merge pull request #1518 from Human-Connection/dependabot/npm_and_yarn/backend/date-fns-2.1.0 
Bump date-fns from 2.0.1 to 2.1.0 in /backend
 2019-09-10 08:29:31 +02:00
mattwr18
ba3e0ca941 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1488-filter-posts-by-emotion 2019-09-09 16:59:35 +02:00
mattwr18
3b056aacc1 Fix weird indentation issue with VS Code 2019-09-09 16:58:49 +02:00
mattwr18
86d80c689c Fix indentation issue on EMOTED 2019-09-09 16:51:24 +02:00
mattwr18
919dc1924f Fix indent issue 2019-09-09 16:46:51 +02:00
mattwr18
b89043166b Add backend tests for filtering posts by emotions 
- Co-authored-by: Mike Aono <aonomike@gmail.com>
 2019-09-09 16:35:11 +02:00
mattwr18
d3952e2ada Use debug npm package over console.log 
- @roschaefer `PR` review
- better because we can leave in the code base and show only when/if we
want to
 2019-09-09 14:32:01 +02:00