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

16408 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Schäfer
7272c5002d
Merge pull request #725 from Human-Connection/fix_terrible_middleware_bug_in_production 
Don't remove middlewares in production
 2019-06-03 19:27:33 +02:00
Wolfgang Huß
62993cc3e9 Clean up 2019-06-03 19:05:59 +02:00
Wolfgang Huß
25999a6dfd Bug fix for User can delete Comments of others 
Wrote a Jest test for this.
 2019-06-03 19:04:40 +02:00
Ulf Gebhardt
caa6a65f99
removed dotenv.config calls 2019-06-03 18:47:00 +02:00
Wolfgang Huß
deaf1b4307
Merge pull request #609 from Human-Connection/553-delete-comment 
Delete Comment

I’ll come back to your notices and recommendations @roschaefer …
But merge for now.
 2019-06-03 17:20:23 +02:00
Robert Schäfer
74f4c7b2fe
Merge pull request #718 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-2.6.1 
Bump apollo-server from 2.5.1 to 2.6.1 in /backend
 2019-06-03 14:18:59 +02:00
Robert Schäfer
e1a1403df4
Merge pull request #714 from Human-Connection/deploy_maintenance_worker_to_dockerhub_automatically_with_small_split_size 
Deploy maintenance worker to dockerhub automatically with smaller split size
 2019-06-03 14:18:13 +02:00
Robert Schäfer
5866804fd3 Don't remove middlewares in production 
@ulfgebhardt thank you for pointing out! That was a terrible bug.
 2019-06-03 14:14:57 +02:00
Wolfgang Huß
d365f9368b Lint Fixes 2019-06-03 13:54:50 +02:00
Ulf Gebhardt
4fd2885b26
reference global config 2019-06-03 13:19:08 +02:00
Robert Schäfer
df70ae451c Parameterize split size 
@ulfgebhardt that was a really good suggestion, thanks!
 2019-06-03 13:11:12 +02:00
dependabot-preview[bot]
1b35859861
Bump apollo-server from 2.5.1 to 2.6.1 in /backend 
Bumps [apollo-server](https://github.com/apollographql/apollo-server) from 2.5.1 to 2.6.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.1...apollo-server@2.6.1)
 2019-06-03 11:05:10 +00:00
Robert Schäfer
3c1629ca3f
Merge pull request #719 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-testing-2.6.1 
Bump apollo-server-testing from 2.5.1 to 2.6.1 in /backend
 2019-06-03 13:02:50 +02:00
Wolfgang Huß
948a99d9da Merge remote-tracking branch 'origin/master' into 553-delete-comment 
# Conflicts:
#	webapp/components/Modal/DeleteModal.vue
#	webapp/components/PostCard/index.vue
#	webapp/components/comments/CommentList/index.vue
#	webapp/pages/index.vue
#	webapp/pages/post/_id/_slug/more-info.vue
 2019-06-03 10:39:13 +02:00
dependabot-preview[bot]
86d1e2a4b9
Bump tiptap-extensions from 1.20.1 to 1.20.2 in /webapp 
Bumps [tiptap-extensions](https://github.com/scrumpy/tiptap) from 1.20.1 to 1.20.2.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap-extensions@1.20.1...tiptap-extensions@1.20.2)
 2019-06-03 05:01:54 +00:00
dependabot-preview[bot]
ebdfb028b8
Bump apollo-server-testing from 2.5.1 to 2.6.1 in /backend 
Bumps [apollo-server-testing](https://github.com/apollographql/apollo-server) from 2.5.1 to 2.6.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-testing@2.5.1...apollo-server-testing@2.6.1)
 2019-06-03 04:57:55 +00:00
Ulf Gebhardt
89fa5c2f3b
Merge pull request #698 from Human-Connection/691_handle-large-file-sizes-bug 
Fix upload large file sizes bug
 2019-06-02 04:47:34 +02:00
Matt Rider
e09ef35c4a Merge branch 'master' of github.com:Human-Connection/Human-Connection into 691_handle-large-file-sizes-bug 2019-06-01 16:05:43 -03:00
aonomike
78100bec37 Add tests to upload error bug fix 
Co-authored-by: mattwr18 <mattwr18@gmail.com>
 2019-06-01 20:23:04 +03:00
Robert Schäfer
13a2f771f8
Merge pull request #712 from Human-Connection/dependabot/docker/webapp/node-12.3.1-alpine 
Bump node from 10-alpine to 12.3.1-alpine in /webapp
 2019-05-31 20:15:10 +02:00
Robert Schäfer
f9e9aa47b7 Disable collections without import statement 
Even if the import statement does literally nothing, this slows down the
import. Let's avoid this until we do sth. with the data.
 2019-05-31 20:14:08 +02:00
Robert Schäfer
321ead32fc
Merge pull request #663 from Human-Connection/dependabot/npm_and_yarn/webapp/prettier-1.17.1 
Bump prettier from 1.14.3 to 1.17.1 in /webapp
 2019-05-31 19:33:43 +02:00
Robert Schäfer
1773d136e9 Yarn --ignore-engines, v12.x.x will become LTS 2019-05-31 19:32:36 +02:00
Ulf Gebhardt
f78c54a3e8
refactored backend structure 2019-05-31 19:31:39 +02:00
Robert Schäfer
115022fc2e Decrease split size 
This might take longer but will require less memory. I guess this might
work even on our kubernetes cluster.
 2019-05-31 18:38:58 +02:00
Robert Schäfer
019fd04d44 Auto-push maintenance-worker image to dockerhub 2019-05-31 18:38:58 +02:00
Wolfgang Huß
92ae6375e1 Merge remote-tracking branch 'origin/master' into 553-delete-comment 2019-05-31 17:42:19 +02:00
Wolfgang Huß
e63e4ad890 Written custom mutation and Jest tests for DeleteComment 2019-05-31 17:42:04 +02:00
dependabot-preview[bot]
038e216748
Bump node from 10-alpine to 12.3.1-alpine in /webapp 
Bumps node from 10-alpine to 12.3.1-alpine.
 2019-05-31 15:06:18 +00:00
Ulf Gebhardt
04110866b9
Merge pull request #703 from Human-Connection/2019/kw22/alpha_data_import_status_schema_split 
🍰 2019/kw22/alpha_data_import_status_schema_split
 2019-05-31 16:59:43 +02:00
Ulf Gebhardt
b51b8423e7
fixed fileloader pattern to actually load smth 2019-05-31 16:40:35 +02:00
Robert Schäfer
9a9118c721 Merge remote-tracking branch 'origin/master' into 2019/kw22/alpha_data_import_status_schema_split 2019-05-31 16:26:06 +02:00
Robert Schäfer
58add8fc5f Install envsubst in Dockerfile 
@ulfgebhardt please setup docker on your machine or a remote machine.

Installing `envsubst` on alpine fails with circular dependencies
(awkward). So this repo here has a solution:
https://github.com/cirocosta/alpine-envsubst/blob/master/Dockerfile#L6
 2019-05-31 16:26:00 +02:00
Robert Schäfer
10864e7d18 Remove command line arguments -u and -p 
@ulfgebhardt: The docs at `man cypher-shell` say that you can pass
`NEO4J_USERNAME` and `NEO4J_PASSWORD` per environment variable. So the
command line arguments are obsolete here.
 2019-05-31 16:26:00 +02:00
Ulf Gebhardt
754decd308
also wildcard include resolvers 2019-05-31 16:04:17 +02:00
Ulf Gebhardt
4c758a9083
fixed filename extension check 2019-05-31 15:46:37 +02:00
Wolfgang Huß
5bec0f1d72 Refined list deletion functions and started writing custom mutation for DeleteComment and their tests 2019-05-31 15:46:34 +02:00
Robert Schäfer
cd9d589801 Update lockfile 2019-05-31 14:57:59 +02:00
Wolfgang Huß
b46016203a Started writing Jest tests for Deletion of Comments 2019-05-31 14:57:44 +02:00
Robert Schäfer
284ca34e03
Merge pull request #711 from Human-Connection/dependabot/npm_and_yarn/webapp/nuxt-2.8.0 
Bump nuxt from 2.7.1 to 2.8.0 in /webapp
 2019-05-31 14:26:22 +02:00
Robert Schäfer
d39b5a87ef
Merge pull request #707 from Human-Connection/705-upgrade-axios 
Upgrade @nuxt/axios
 2019-05-31 14:11:21 +02:00
Robert Schäfer
11ea4fa19a
Merge pull request #708 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-testing-2.5.1 
Bump apollo-server-testing from 2.5.0 to 2.5.1 in /backend
 2019-05-31 13:45:41 +02:00
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
Matt Rider
1f0e7bf7d9 Upgrade @nuxt/axios 
- was dependent on axios <= 0.18.0 and there is a high severity security alert from google
 2019-05-31 12:59:38 +02:00
dependabot-preview[bot]
9c06fe71e8
Bump nuxt from 2.7.1 to 2.8.0 in /webapp 
Bumps [nuxt](https://github.com/nuxt/nuxt.js) from 2.7.1 to 2.8.0.
- [Release notes](https://github.com/nuxt/nuxt.js/releases)
- [Changelog](https://github.com/nuxt/nuxt.js/blob/dev/RELEASE_PLAN.md)
- [Commits](https://github.com/nuxt/nuxt.js/compare/v2.7.1...v2.8.0)
 2019-05-31 10:51:43 +00:00