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

5807 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dependabot-preview[bot]
06dd347a08
Bump metascraper-logo from 5.6.6 to 5.7.4 in /backend 
Bumps [metascraper-logo](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:05 +00:00
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
6f21926a76
Merge pull request #1564 from Human-Connection/dependabot/npm_and_yarn/webapp/date-fns-2.2.1 
Bump date-fns from 2.1.0 to 2.2.1 in /webapp
 2019-09-13 23:49:09 +02: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
eff788ac7b
Merge pull request #1573 from Human-Connection/1555_import_createdAt_updatedAt_for_comments 
Fix import to add createdAt and updatedAt for comments
 2019-09-13 20:37:33 +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
dependabot-preview[bot]
6f127d6e16
Bump styleguide from 793556a to 808b3c5 
Bumps [styleguide](https://github.com/Human-Connection/Nitro-Styleguide) from `793556a` to `808b3c5`.
- [Release notes](https://github.com/Human-Connection/Nitro-Styleguide/releases)
- [Commits](793556ad19...808b3c5a95)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-13 14:10:33 +00:00
Robert Schäfer
6a4a96f5d5
Merge pull request #1560 from Human-Connection/github_release 
Use automatic Github releases as a CHANGELOG
 2019-09-13 16:10:20 +02:00
Robert Schäfer
9c9b7045cf
Merge pull request #1559 from Human-Connection/add_styleguide_as_submodule 
Add styleguide as submodule
 2019-09-13 16:07:41 +02:00
Robert Schäfer
f2b48da828
Merge pull request #1558 from Human-Connection/push_current_version_to_dockerhub 
Push all docker images at VERSION to dockerhub
 2019-09-13 16:06:43 +02:00
roschaefer
5555e64f0f Fix #1555 2019-09-13 13:52:54 +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]
650300bc90
Bump date-fns from 2.1.0 to 2.2.1 in /webapp 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.1.0 to 2.2.1.
- [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.1.0...v2.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-13 04:22:37 +00: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
1273d5f2b5 Implement automatic Github releases 
I hope this will create a git tag and upload a release for us.
 2019-09-13 03:04:19 +02: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
roschaefer
832a1e43e8 Update Styleguide 2019-09-13 00:51:48 +02:00
roschaefer
4db0d69fad Add styleguide/ as submodule 
This should make new contributors aware that the Styleguide exists and
maybe maybe even encourage people to contribute to the Styleguide.

Also this enabled `yarn run dev:styleguide` to build the `webapp/` along
with the styleguide.
 2019-09-13 00:50:48 +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
7f2cd575cb Push all docker images at VERSION to dockerhub 
Inspired by the tagging of e.g. `node` on dockerhub:
https://hub.docker.com/_/node/?tab=description

I would like to push the current version of all our images to dockerhub.
This is a first step to push to production later on.

If sb. increments the VERSION file, this is considered a release.
 2019-09-12 23:41:58 +02:00
Robert Schäfer
23d17d7b44
Merge pull request #1543 from Human-Connection/more_realistic_end_to_end_tests 
Various changes to build pipeline
 2019-09-12 23:39:46 +02:00
roschaefer
86f9824c2e Fix lint 2019-09-12 23:13:20 +02:00
roschaefer
08244ab4b2 Address @mattwr18's review here: 
https://github.com/Human-Connection/Human-Connection/pull/1543#pullrequestreview-287593264

Thinking about it, I really ask myself why I did not find this solution
earlier 🙈

Of course, you don't want to share the generated `buildDir`
with the host system. If you happen to share the `webapp/` folder,
simply point NuxtJS to a build directory somewhere else. Easy!
 2019-09-12 22:56:52 +02:00
Robert Schäfer
064096922f
Merge pull request #1557 from Human-Connection/fix-broken-navbar 
Fix navbar styling
 2019-09-12 22:16:30 +02:00
Alexander Friedland
8fa42ea6ea
update 2019-09-12 18:51:41 +02:00
mattwr18
fb2cade2f9
Merge pull request #1537 from Human-Connection/1455-fix-update-comment-list 
🍰 Fixes a create and update comment problem in the comments list
 2019-09-12 18:36:30 +02:00
mattwr18
cc74b3e8dd Fix navbar styling 
- with all the merge conflicts to deal with, I accidentally added the
wrong value
 2019-09-12 18:33:50 +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
Robert Schäfer
ef0f0353ea
Merge pull request #1548 from Human-Connection/1491-fix-show-less-link-not-working-reliably 
Fix show less link not working reliably
 2019-09-12 16:36:05 +02:00
Robert Schäfer
43d93de6ef
Merge pull request #1551 from Human-Connection/dependabot/npm_and_yarn/cypress-plugin-retries-1.3.0 
Bump cypress-plugin-retries from 1.2.2 to 1.3.0
 2019-09-12 16:33:42 +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
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
Wolfgang Huß
0f2398295b Helper message for backend tests failed by missing constraints in database 2019-09-12 11:14:42 +02:00
Wolfgang Huß
36a0844fdd Followed @mattwrd18 suggestion 2019-09-12 09:30:47 +02:00
Wolfgang Huß
199079cff8 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1455-fix-update-comment-list 2019-09-12 08:46:36 +02:00
dependabot-preview[bot]
7bb24a2215
Bump cypress-plugin-retries from 1.2.2 to 1.3.0 
Bumps [cypress-plugin-retries](https://github.com/Bkucera/cypress-plugin-retries) from 1.2.2 to 1.3.0.
- [Release notes](https://github.com/Bkucera/cypress-plugin-retries/releases)
- [Commits](https://github.com/Bkucera/cypress-plugin-retries/compare/v1.2.2...v1.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-12 04:21:02 +00: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