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

3409 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Schäfer
ea42d73d04 Merge remote-tracking branch 'origin/master' into dependabot/npm_and_yarn/webapp/prettier-1.17.1 2019-05-31 13:35:20 +02:00
Robert Schäfer
e162cd480e Run yarn run lint --fix on prettier v1.17.1 2019-05-31 13:33:20 +02:00
Robert Schäfer
dad87778e2
Merge pull request #701 from Human-Connection/dependabot/npm_and_yarn/webapp/prettier-1.17.1-fix_incompatibility 
🍰 Fix update incompatibility
 2019-05-31 13:08:49 +02:00
Robert Schäfer
e366c278a7
Merge pull request #704 from Human-Connection/dependabot/npm_and_yarn/webapp/fuse.js-3.4.5 
Bump fuse.js from 3.4.4 to 3.4.5 in /webapp
 2019-05-31 13:05:42 +02:00
Robert Schäfer
2954239443
Merge pull request #702 from Human-Connection/avoid_to_delete_kubernetes_namespace 
🍰 Avoid deletion of entire namespace by accident
 2019-05-31 13:01:25 +02:00
Robert Schäfer
a027e7599d
Merge pull request #706 from Human-Connection/686-dummy-placeholder-for-empty-avatars 
Add logo as default avatar background image
 2019-05-31 13:00:45 +02:00
Robert Schäfer
4f6e4ec161
Merge pull request #710 from Human-Connection/dependabot/npm_and_yarn/webapp/@nuxtjs/axios-5.5.3 
Bump @nuxtjs/axios from 5.5.2 to 5.5.3 in /webapp
 2019-05-31 12:49:28 +02:00
Robert Schäfer
5c7528dec1
Merge pull request #709 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-2.5.1 
Bump apollo-server from 2.5.0 to 2.5.1 in /backend
 2019-05-31 12:48:44 +02:00
Robert Schäfer
af203057c5
Merge pull request #713 from Human-Connection/dependabot/docker/backend/node-12.3.1-alpine 
Bump node from 10-alpine to 12.3.1-alpine in /backend
 2019-05-31 12:47:05 +02:00
dependabot-preview[bot]
bc173c0dc3
Bump node from 10-alpine to 12.3.1-alpine in /backend 
Bumps node from 10-alpine to 12.3.1-alpine.
 2019-05-31 05:01:59 +00:00
dependabot-preview[bot]
67bce21104
Bump @nuxtjs/axios from 5.5.2 to 5.5.3 in /webapp 
Bumps [@nuxtjs/axios](https://github.com/nuxt-community/axios-module) from 5.5.2 to 5.5.3.
- [Release notes](https://github.com/nuxt-community/axios-module/releases)
- [Changelog](https://github.com/nuxt-community/axios-module/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/nuxt-community/axios-module/compare/v5.5.2...v5.5.3)
 2019-05-31 04:58:50 +00:00
dependabot-preview[bot]
bbbebbc583
Bump apollo-server from 2.5.0 to 2.5.1 in /backend 
Bumps [apollo-server](https://github.com/apollographql/apollo-server) from 2.5.0 to 2.5.1.
- [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.5.0...apollo-server@2.5.1)
 2019-05-31 04:58:49 +00:00
Matt Rider
068f6c2b49 Add logo as default avatar background image 2019-05-30 16:04:16 -03:00
dependabot-preview[bot]
a6112bfe8c
Bump fuse.js from 3.4.4 to 3.4.5 in /webapp 
Bumps [fuse.js](https://github.com/krisk/Fuse) from 3.4.4 to 3.4.5.
- [Release notes](https://github.com/krisk/Fuse/releases)
- [Changelog](https://github.com/krisk/Fuse/blob/master/CHANGELOG.md)
- [Commits](https://github.com/krisk/Fuse/compare/v3.4.4...v3.4.5)
 2019-05-30 05:00:33 +00:00
Robert Schäfer
58224381a8 Add missing environment var to maintenance-worker 2019-05-29 16:12:03 +02:00
Robert Schäfer
a83aad3f60 Fix wrong path in Dockerfile 2019-05-29 16:00:45 +02:00
Matt Rider
f732ff44d0 Merge branch 'master' of github.com:Human-Connection/Human-Connection into dependabot/npm_and_yarn/webapp/prettier-1.17.1-fix_incompatibility 2019-05-29 10:33:43 -03:00
Robert Schäfer
e1a113e7e4 Fix wrong mountpath 
We're saving the files to /uploads. If the maintenance-worker does not
mount the uploads persistent volume there, we don't get persistent
files.
 2019-05-29 15:16:08 +02:00
Robert Schäfer
7cb77c8c8d Increase volume size for uploads 2019-05-29 15:11:05 +02:00
Robert Schäfer
2c8dcaa592 Yet another typo 2019-05-29 15:08:14 +02:00
Robert Schäfer
95fe115198 Fix typo 2019-05-29 15:01:56 +02:00
Matt Rider
ff0b4b6867 Fix lint 2019-05-29 09:47:24 -03:00
Robert Schäfer
5622b1aa30 Avoid deletion of entire namespace by accident 
Yep, that happened to me. I did

```
kubectl delete -f deployment/human-connection
```

 and I forgot about the namespace in that folder. Now everything is gone.
 2019-05-29 14:22:49 +02:00
dependabot-preview[bot]
da0a4eabfc
Bump prettier from 1.14.3 to 1.17.1 in /webapp 
Bumps [prettier](https://github.com/prettier/prettier) from 1.14.3 to 1.17.1.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/prettier/compare/1.14.3...1.17.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-29 11:30:33 +00:00
Robert Schäfer
df519c9828
Merge pull request #664 from Human-Connection/dependabot/npm_and_yarn/backend/prettier-1.17.1 
Bump prettier from 1.14.3 to 1.17.1 in /backend
 2019-05-29 13:28:20 +02:00
Robert Schäfer
ec1a24cbd3 Fix update incompatibility 
It seems that prettier supports vue in version `v1.15` and above.
See: https://github.com/prettier/prettier/releases/tag/1.15.0

So I guess that interferes with the old vue linter rules in place. I
graduated the vlue rule from `recommended` to `essential` and now
running `yarn run lint --fix` is doing fine.
 2019-05-29 13:21:55 +02:00
Robert Schäfer
ffd584ded1 Fix prettier 2019-05-29 12:36:26 +02:00
dependabot-preview[bot]
0003a98fd2 Bump prettier from 1.14.3 to 1.17.1 in /backend 
Bumps [prettier](https://github.com/prettier/prettier) from 1.14.3 to 1.17.1.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/prettier/compare/1.14.3...1.17.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-29 12:35:23 +02:00
Robert Schäfer
66aa744e75
Merge pull request #700 from Human-Connection/685-fix-user-avatar-jumping-on-upload 
Fix user avatar jumping on upload
 2019-05-29 12:33:20 +02:00
Wolfgang Huß
810746f138
Merge pull request #695 from Human-Connection/583-localize-tiptap-placeholder-text 
Fix placeholder text not translating bug
 2019-05-29 08:08:29 +02:00
Matt Rider
b08b29ba8e Fix user avatar jumping on upload 2019-05-28 20:35:47 -03:00
Ulf Gebhardt
860a0d41d0
Merge pull request #697 from Human-Connection/2019/kw22/alpha_data_import 
🍰 2019/kw22/alpha_data_import
 2019-05-29 00:43:10 +02:00
Ulf Gebhardt
4ccfe3822c
added existing data imports 2019-05-29 00:20:43 +02:00
Ulf Gebhardt
7ed22883b0
Merge pull request #662 from Human-Connection/fix_duplicate_tags 
Fix duplicate tags by using the name as the id
 2019-05-28 23:06:33 +02:00
Robert Schäfer
ab7a4ffc3e
Fix duplicate tags by using the name as the id 
@ulfgebhardt: I wondered about the list of tags after importing the
legacy db. It seems, each tag has at most 1 contribution. I guess it's
because we create a unique id for each tag, so two tags with the same
`name` e.g. `#hashtag` and `#hashtag` are not de-duplicated.

I'm currently sitting in the train and cannot run the data import myself, could
you double-check?
 2019-05-28 22:41:51 +02:00
Ulf Gebhardt
8a9d826e46
Merge pull request #696 from Human-Connection/collect_coverage_when_requested 
Run coverage only if requested
 2019-05-28 21:11:50 +02:00
Ulf Gebhardt
014104e055
fixed data import from alpha data: 
- include all collections (commented out)
- refactored neo4j import script
- use of .env file for (additional) configurations / configuration overrides
- lots of fiddeling with neo4j cql files and cypher shell
 2019-05-28 18:53:05 +02:00
Robert Schäfer
3c580c9296
Merge pull request #694 from Human-Connection/2019/kw22/alpha_data_export 
🍰 2019/kw22/alpha_data_export
 2019-05-28 18:41:54 +02:00
Robert Schäfer
13c87ae889 Run coverage only if requested 
I find it annoying to wait for code coverage tools to complete (~3
seconds) and especially to scroll up for every test run. So, this should
run coverage only on our build server *or* if you add `--coverage` on
the command line.
 2019-05-28 18:27:52 +02:00
Robert Schäfer
f9ac22e560 Add executable UNIX permissions to export script 
I encourage @ulfgebhardt to run the following command once:

```
SH_USERNAME=ulf SSH_HOST=***** MONGODB_USERNAME='hc-api' MONGODB_PASSWORD=***** MONGODB_DATABASE=hc_api MONGODB_AUTH_DB=admin UPLOADS_DIRECTORY=/data/api/uploads docker-compose -f docker-compose.maintenance.yml up --build
```

Once you're done with everything. You don't have to run docker for
development, but this procedure would ensure docker environment works
as expected.
 2019-05-28 18:14:21 +02:00
Robert Schäfer
9c53e135c8
Merge pull request #693 from Human-Connection/689-fix_broken_image_urls_after_upload 
689 fix broken image urls after upload
 2019-05-28 17:48:06 +02:00
Matt Rider
97a374fd84 Fix placeholder text not translating bug 
- tiptap-extensions are not reactive
- we must call a method to change them dynamically
- emit changeLanguage event, which is listened for by the Editor component, which then calls a method to set the emptyNodeText of tiptap
 2019-05-28 12:46:52 -03:00
Ulf Gebhardt
4b5138880d
missing default .env file 2019-05-28 17:07:54 +02:00
Ulf Gebhardt
301e7fa60c
fixed data export for alpha: 
- include all collections
- refactored mongodb export script
- renamed to export
- use of .env file for (additional) configurations / configuration overrides
 2019-05-28 17:03:44 +02:00
Robert Schäfer
a07ca22e26 Replace <ds-avatar> on profile page 2019-05-28 15:20:24 +02:00
Robert Schäfer
db9596e276 Replace HcAvatar where possible 
We still have `<ds-avatar>` in the code. It's used for the social media
icons. I'll leave it as it is for now.
 2019-05-28 15:20:24 +02:00
Robert Schäfer
27b8848892
Merge pull request #690 from Human-Connection/582-edit-field-bug-comment-form 
Fix edit field render bug(CommentForm)
 2019-05-28 00:46:05 +02:00
dependabot-preview[bot]
4ab08fb472
Bump prettier from 1.14.3 to 1.17.1 in /webapp 
Bumps [prettier](https://github.com/prettier/prettier) from 1.14.3 to 1.17.1.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/prettier/compare/1.14.3...1.17.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-27 22:20:08 +00:00
mattwr18
50f655173d
Merge pull request #676 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-plugin-import-2.17.3 
Bump eslint-plugin-import from 2.17.2 to 2.17.3 in /backend
 2019-05-27 19:18:03 -03:00
Matt Rider
745a326fbe Test refetching a Post with its comments 2019-05-27 19:16:27 -03:00