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
dependabot-preview[bot]
0b93a9b7c6
Bump apollo-server-testing from 2.5.0 to 2.5.1 in /backend 
Bumps [apollo-server-testing](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-testing@2.5.0...apollo-server-testing@2.5.1)
 2019-05-31 10:51:06 +00: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
Wolfgang Huß
52a430fc91 Merge remote-tracking branch 'origin/master' into 553-delete-comment 2019-05-31 11:36:50 +02:00
Wolfgang Huß
76469df059 Getting Jest Tests to run again. 2019-05-31 11:36:27 +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
ALau2088
a5f6390f97 552-update_comment 2019-05-30 15:47:55 -07: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
Ulf Gebhardt
630e895f6c
Merge remote-tracking branch 'origin/master' into 2019/kw22/alpha_data_import_status_schema_split 2019-05-29 20:44:14 +02:00
Ulf Gebhardt
37be5481c0
remaining legacy table descriptions and dummy import scripts 2019-05-29 20:43:58 +02:00
Ulf Gebhardt
355205028f
removed debug output 2019-05-29 20:04:03 +02:00
Ulf Gebhardt
271af7dde2
keep index file for already imported files, do not reimport already imported file, invites, notifications, emotions and organisations scripts and descriptions 2019-05-29 20:02:30 +02:00
Wolfgang Huß
542e281450 Fixed lint 2019-05-29 18:30:53 +02:00
Wolfgang Huß
ad7627fe05 Fixed the missing ds-flexin the PostCard 2019-05-29 18:18:58 +02:00
Wolfgang Huß
3e3e447bc5 Refactored three quater of the tests 2019-05-29 17:59:07 +02:00
Ulf Gebhardt
968578f10a
delete cql files 2019-05-29 17:30:46 +02:00
Ulf Gebhardt
816fbdf7cd
fixed slug required - it was not in Nitro 2019-05-29 16:41:27 +02: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
Ulf Gebhardt
67595f6400
missing change for windows comment 2019-05-29 15:45:32 +02:00
Ulf Gebhardt
7e44667dd1
modified .env file for neo4j import since its had problems with file locks on windows (cypher-shell) 2019-05-29 15:45:02 +02:00
Ulf Gebhardt
6f0447515a
- fixed several errors handling import 
- split graphql schema into parts
- which data is imported which is not - a list
 2019-05-29 15:37:28 +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
aonomike
0111e60f1d Resolve Upload image rerender and double submit 
- Make Upload component re-render on failed upload
- Resolve double submit of uploaded to the backend when uploading with drag and drop

Co-authored-by: @mattWr18
Co-authored-by: @tirrok
 2019-05-29 16:09:34 +03: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
aonomike
7def0b4c20 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 691_handle-large-file-sizes-bug 2019-05-29 15:35:12 +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ß
19771a342e First approach to test '_slug.spec.js' 2019-05-29 12:19:51 +02:00
Wolfgang Huß
7807831e0e Merge remote-tracking branch 'origin/master' into 553-delete-comment 2019-05-29 12:17:24 +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
aonomike
154b6a6f78 Fix large file sizes bug 2019-05-28 23:31:57 +03:00