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

5549 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
roschaefer
f3c31aed28 Don't expose termsAndConditionsAgreedAt 
1. Don't expose `termsAndConditionsAgreedAt` as input param, because of ..why?
2. Make the `termsAndConditionsAgreedVersion` a *required* input param
   for `SignupVerification`. If new users register, they have to confirm
   the terms and conditions. I added another test to check what happens if
   the user sends `null`.
3. Sorry @ogerly for confusing you with my review here:
   https://github.com/Human-Connection/Human-Connection/pull/1556#pullrequestreview-287516516
   What I meant is that we want to simulate a user with no
   `termsAndConditionsAgreedVersion`. But of course the `variables` must
   have it set when you run the mutations. Now we have the
   exclamation mark in the input param, see point 1 ☝️
 2019-09-13 01:11:46 +02:00
Alexander Friedland
8fa42ea6ea
update 2019-09-12 18:51:41 +02:00
Alexander Friedland
0bef3a729c
Update backend/src/schema/resolvers/registration.spec.js 
Co-Authored-By: Robert Schäfer <git@roschaefer.de>
 2019-09-12 18:00:14 +02:00
Alexander Friedland
aa234edc0a
Update backend/src/schema/resolvers/registration.spec.js 
Co-Authored-By: Robert Schäfer <git@roschaefer.de>
 2019-09-12 18:00:02 +02:00
ogerly
4b97131225 old stand 2019-09-12 16:37:30 +02:00
mattwr18
33942f6475
Merge pull request #1283 from Human-Connection/fix/header-alignment 
fix(header-alignment): Fix logo and locale position.
 2019-09-12 11:44:52 +02:00
mattwr18
6ff532ab4a
Merge pull request #1517 from Human-Connection/better_maintenance_page 
Better maintenance page
 2019-09-11 18:25:21 +02:00
mattwr18
c36ec623ec Make container wider 
- the text is all jumbled up, and there is nothing else on the page
 2019-09-11 16:43:45 +02:00
mattwr18
73db6c5e58 Left align text on password-rest page 
- to maintain consistency with login page

- Co-authored-by: Mike Aono <aonomike@gmail.com>
 2019-09-11 16:40:39 +02:00
mattwr18
1a65d75c10 Add back blank layout 
- The new maintenance page will use a blank layout that does not have a
footer because we don't want users thinking they can click on a link
that will just lead back to the maintenance page
 2019-09-11 16:40:39 +02:00
mattwr18
fa3053dca7 Tidy up, follow @roschaefer, @Tirokk PR suggestions 
- Fix tests by stubbing LocaleSwitch/client-only
- Add portuguese translations
- Add back to login link
- Use span over &nbsp following @alina-becks PR review on another PR
 2019-09-11 16:40:39 +02:00
mattwr18
17f2c990db Fix lint 2019-09-11 16:40:39 +02:00
Brent Vardy
ca49c2296c improved class names for current component 2019-09-11 16:40:39 +02:00
Brent Vardy
53408f4bf4 refactor create-user-account to have no header 
- also added locale switch to card
 2019-09-11 16:40:39 +02:00
Brent Vardy
ea16d1652a used no header for login and password reset pages 
- added locale switch back on login
- added locale switch to password reset
- increased width of login and password reset
- added logo to password reset

- co-authored-by: mattwr18 <mattwr18@gmail.com>
- co-authored-by: mikeaono <aonomike@gmail.com>
 2019-09-11 16:40:39 +02:00
Vasily Belolapotkov
f4b3c84815 moved footer styles into footer component and added shadow 2019-09-11 16:40:39 +02:00
Brent Vardy
5d73cad168 refactor page footer to component 2019-09-11 16:40:39 +02:00
Brent Vardy
e9ac462889 update name of blanks layout to basic layout 2019-09-11 16:40:39 +02:00
Brent Vardy
e0fec965dc improved navigation layout when not logged in, moved locale selector to nav on login page 2019-09-11 16:40:39 +02:00
Brent Vardy
6589fe10af WIP - refactor of blank layout to have header and footer 2019-09-11 16:40:38 +02:00
Brent Vardy
a751a10783 update login page to use blank layout 2019-09-11 16:40:38 +02:00
gha-gozu
7fdabd9ac4 fix(header-alignment): Fix logo and locale position. 2019-09-11 16:40:38 +02:00
Robert Schäfer
a01c73536f
Merge pull request #1542 from Human-Connection/1538_test-filter-by-followed-by 
Test filter by followed by
 2019-09-11 13:29:00 +02:00
Robert Schäfer
5273f8b9fa
Merge pull request #1533 from Human-Connection/293-fix-follower-counter 
[WIP] 🍰 Update follower count on follow/unfollow
 2019-09-11 12:33:56 +02:00
mattwr18
030ff32b13 Fix lint 2019-09-11 09:16:06 +02:00
roschaefer
f3a9996962 Copy package.json from webapp/ 
This will install the dependencies of the webapp/ folder first and then
overwrite the package.json to use different scripts. If we would track
dependencies in a separate package.json we would have to update it
with dependabot. We don't want that because of our precious build
server time.
 2019-09-11 08:43:26 +02:00
roschaefer
5804b1352c Remove old docker files 2019-09-11 08:43:26 +02:00
roschaefer
d6b7374ddb Change strategy, only build docker image 
I couldnt' get the local build to run with the alternative
`nuxt.config.js`. So I'm building docker only now.
 2019-09-11 08:43:26 +02:00
roschaefer
61e583e31b Translatable, mobile-responsive maintenance page 2019-09-11 08:43:26 +02: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
mattwr18
9487d0491e
Merge pull request #1546 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-config-prettier-6.3.0 
Bump eslint-config-prettier from 6.2.0 to 6.3.0 in /webapp
 2019-09-11 08:22:04 +02:00
mattwr18
e7cbdb4adc
Merge pull request #1545 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-config-prettier-6.3.0 
Bump eslint-config-prettier from 6.2.0 to 6.3.0 in /backend
 2019-09-11 08:21:46 +02:00
dependabot-preview[bot]
1239071fab
Bump eslint-config-prettier from 6.2.0 to 6.3.0 in /webapp 
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:54 +00: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
aonomike
785b59f96e Test filter by followed by 2019-09-10 23:32:55 +03: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
8bf11b18aa Remove dead code 2019-09-10 16:37:13 +02:00
roschaefer
656834fa0b Remove nodemon, use nuxt cli tools 
@appinteractive can you tell me why we had the custom code in
`server/index.js`?
 2019-09-10 16:37:13 +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