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

4261 Commits

Author SHA1 Message Date
dependabot-preview[bot]
da6029dc9b
Bump metascraper-youtube from 5.6.7 to 5.7.4 in /backend 
Bumps [metascraper-youtube](https://github.com/microlinkhq/metascraper-youtube) from 5.6.7 to 5.7.4.
- [Release notes](https://github.com/microlinkhq/metascraper-youtube/releases)
- [Commits](https://github.com/microlinkhq/metascraper-youtube/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-13 21:50:02 +00:00
dependabot-preview[bot]
e4029b4a0a
Bump metascraper-url from 5.6.6 to 5.7.4 in /backend 
Bumps [metascraper-url](https://github.com/microlinkhq/metascraper) from 5.6.6 to 5.7.4.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.6.6...v5.7.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-13 21:50:01 +00:00
mattwr18
99b48429b8
Merge pull request #1562 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-date-5.7.0 
Bump metascraper-date from 5.6.6 to 5.7.0 in /backend
 2019-09-13 23:48:28 +02:00
mattwr18
a4a4722bd5
Merge pull request #1561 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-title-5.7.0 
Bump metascraper-title from 5.6.6 to 5.7.0 in /backend
 2019-09-13 23:47:52 +02:00
mattwr18
bec629e8ef Fix intermittent failing test 
- not concerned about the order of the notification in this test
 2019-09-13 20:51:15 +02:00
mattwr18
d1ecac4580 Write tests to ensure createdAt is not deleted on update 
- we had a silly serious bug by overwriting all attributes at the time
of UpdatePost
- tests in place to ensure we don't accidentally delete our createdAt
attribute
 2019-09-13 20:14:47 +02:00
mattwr18
60c473bb94 Create UpdateComment resolver, update UpdateUser 
- UpdateUser should update updatedAt at point of insertion in the
database as well
 2019-09-13 20:14:47 +02:00
mattwr18
ca6ae3bd1b Remove dateTimeMiddleware 
- favor adding createdAt, updatedAt attributes at point of insertion to
the database
 2019-09-13 20:14:47 +02:00
mattwr18
16d7e6c91a Update notifications 
- create only one relationship by using merge, but do not update
createdAt attribute/update test
- order by updatedAt_desc
 2019-09-13 20:14:47 +02:00
mattwr18
67d68db231 Update post resolver to fix embarrasing bugs 
- when a user updates a post, we should not override every property in
our database with the new params, since we have read-only properties
like createdAt that we don't want to go deleting aimlessly.
 2019-09-13 20:14:47 +02:00
mattwr18
ce487f1e0f Set notifications.createdAt only at creation 
- we should not be setting it every time a notification is created
 2019-09-13 20:14:47 +02:00
roschaefer
2a3e6ad76f Alternative solution for #1494 2019-09-13 20:14:47 +02:00
Alexander Friedland
193ac8e6b2
Merge pull request #1556 from Human-Connection/1503_datum_agb 
II Add Date to Terms and Conditions #1535
 2019-09-13 07:21:19 +02:00
dependabot-preview[bot]
0f4efb3400
Bump metascraper-date from 5.6.6 to 5.7.0 in /backend 
Bumps [metascraper-date](https://github.com/microlinkhq/metascraper) from 5.6.6 to 5.7.0.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.6.6...v5.7.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-13 04:21:45 +00:00
dependabot-preview[bot]
20976b08ca
Bump metascraper-title from 5.6.6 to 5.7.0 in /backend 
Bumps [metascraper-title](https://github.com/microlinkhq/metascraper) from 5.6.6 to 5.7.0.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.6.6...v5.7.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-13 04:21:19 +00:00
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
Robert Schäfer
8fa794f282
Merge pull request #1553 from Human-Connection/helper-for-backend-tests-failed-by-missing-constraints 
🍰 [Helper] Message for backend tests failed by missing constraints
 2019-09-12 23:51:15 +02:00
roschaefer
86f9824c2e Fix lint 2019-09-12 23:13:20 +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
roschaefer
9233049ff3 Show a helpful message only if test fails 
Inspired by the `ON FAIL` markup from the previous commit
0f2398295bcced3af3772bb4add1f42472c97893
 2019-09-12 17:16:10 +02:00
ogerly
4b97131225 old stand 2019-09-12 16:37:30 +02:00
roschaefer
bc153ee42e Synchronize dockerfiles, fix cypress 
.. make tippy.js a production dependency (was throwing errors on my
machine).
 2019-09-12 12:16:20 +02:00
Wolfgang Huß
0f2398295b Helper message for backend tests failed by missing constraints in database 2019-09-12 11:14:42 +02:00
roschaefer
10418f061b Various changes to build pipeline 
* Use `production` docker images for cypress tests. As one of our contributors
pointed out: It is bad practice to end-to-end test sth. else than the actual
production images.
* Have a dedicated `docker-compose.travis-integration.yml` to test
backend integration tests. The backend *needs* a database when doing
integration tests. So there is no way around using docker-compose. But
we could stop using the `build-and-test` stage when we do cypress tests.
* Remove a couple of unused ports and DRY `docker-compose.override.yml`
* Build and tag all images first and then run `docker-compose .. up` - I
hope this will not rebuild the image.
* Reduce docker image size
 2019-09-12 00:29:36 +02: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
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
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
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
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