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

3916 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Schäfer
56c0f8dfdc Create private SSH key from base64 encoded env 2019-04-23 23:12:16 +02:00
Robert Schäfer
abc17b2adc Fix import_legacy_uploads 2019-04-23 23:12:16 +02:00
Robert Schäfer
a5f8426325 Add missing env, import mongo collections to neo4j 2019-04-23 23:12:16 +02:00
Robert Schäfer
af4f391e28 Simplify migration script 2019-04-23 23:12:16 +02:00
Robert Schäfer
542c37a32b Make maintenance-worker independent of backend 2019-04-23 23:12:16 +02:00
Robert Schäfer
45c0dbd5a8 Provision maintenance-worker to seed/reset db 2019-04-23 23:12:16 +02:00
Robert Schäfer
be9980f2aa Tag maintenance image consitently 2019-04-23 23:12:16 +02:00
Robert Schäfer
c7a08b792e Move maintenance & neo4j in dedicated folders 2019-04-23 23:12:16 +02:00
Robert Schäfer
0352154742 Removing unused docker-compose.yml in backend/ 2019-04-23 23:12:00 +02:00
Robert Schäfer
77ac0ce7a6 Rename db-migration-worker to maintenance-worker 2019-04-23 23:12:00 +02:00
Robert Schäfer
aea6e72f2b
Merge pull request #496 from Human-Connection/dependabot/npm_and_yarn/webapp/tiptap-extensions-1.16.2 
Bump tiptap-extensions from 1.15.0 to 1.16.2 in /webapp
 2019-04-23 23:01:25 +02:00
Robert Schäfer
69254e6b5b
Merge pull request #498 from Human-Connection/dependabot/npm_and_yarn/backend/jquery-3.4.0 
[Security] Bump jquery from 3.3.1 to 3.4.0 in /backend
 2019-04-23 23:00:55 +02:00
mattwr18
76b2a21f49
Merge pull request #492 from Human-Connection/docs-neo4j_backup_in_kubernetes 
Add documentation for neo4j backups in kubernetes
 2019-04-23 17:44:03 -03:00
Robert Schäfer
5978adff68 Sketch a test for a custom image component 
@tansaku @aonomike I hope this clarifies the task.

When you're done, feel free to use this component wherever we use
`<img>` in `/webapp/`.
 2019-04-23 19:35:41 +02:00
Robert Schäfer
98ad101549 Delete badge images from /webapp/ 
@tansaku @aonomike I don't know that we had those badges stored in the
webapp. That's certainly not the place where they're supposed to be.

Sorry for the confusion.
 2019-04-23 19:16:24 +02:00
dependabot[bot]
84f672ed2d
[Security] Bump jquery from 3.3.1 to 3.4.0 in /backend 
Bumps [jquery](https://github.com/jquery/jquery) from 3.3.1 to 3.4.0. **This update includes security fixes.**
- [Release notes](https://github.com/jquery/jquery/releases)
- [Commits](https://github.com/jquery/jquery/compare/3.3.1...3.4.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-23 16:06:44 +00:00
mattwr18
500221314a
Update backup.md 2019-04-23 12:29:34 -03:00
Matt Rider
20112bdd9b Add back asyncData, use CommentByPost query 2019-04-23 12:24:27 -03:00
Matt Rider
43d6254f3e Add custom CommentByPost query 2019-04-23 12:23:21 -03:00
Robert Schäfer
718b2da6e7 Improve the docs with @datenbrei 2019-04-23 17:21:45 +02:00
dependabot[bot]
074155da73
Bump tiptap-extensions from 1.15.0 to 1.16.2 in /webapp 
Bumps [tiptap-extensions](https://github.com/scrumpy/tiptap) from 1.15.0 to 1.16.2.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap-extensions@1.15.0...tiptap-extensions@1.16.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-23 15:08:08 +00:00
Robert Schäfer
f3e559d58f
Merge pull request #497 from Human-Connection/dependabot/npm_and_yarn/webapp/tiptap-1.16.2 
Bump tiptap from 1.15.0 to 1.16.2 in /webapp
 2019-04-23 17:06:02 +02:00
Matt Rider
c6b11319fe Clear editor, write cypress test 
- the editor only clears once, also there are some other bugs associated with clearing it this way
- according to https://github.com/scrumpy/tiptap/issues/21 there should be a clearContent(), but haven't been able to get it to work
- cypress test for some reason is with a weird bug where I need to submit the form, then click on the submit button, otherwise it doesn't call the handleSubmit method
 2019-04-22 11:51:29 -03:00
Matt Rider
a360a688b9 Merge branch '260-add-comment-form' of github.com:Human-Connection/Human-Connection into 260-add-comment-form 2019-04-22 08:12:59 -03:00
Matt Rider
a9f720753a Merge branch 'master' of github.com:Human-Connection/Human-Connection into 260-add-comment-form 2019-04-22 08:10:06 -03:00
dependabot[bot]
54fe7e0029
Bump tiptap from 1.15.0 to 1.16.2 in /webapp 
Bumps [tiptap](https://github.com/scrumpy/tiptap) from 1.15.0 to 1.16.2.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap@1.15.0...tiptap@1.16.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-22 04:46:05 +00:00
aonomike
8e2a7ec5e5 Merge branch '260-add-comment-form' of github.com:Human-Connection/Human-Connection into 260-add-comment-form 2019-04-20 17:02:17 +03:00
aonomike
52e82d277e Add Post Comment feature file 2019-04-20 16:59:47 +03:00
Matt Rider
49c03c92c8 Extract PostQuery/convert to js, try to get clear working 
Co-authored-by: Mike Aono <aonomike@gmail.com>
 2019-04-20 10:49:02 -03:00
Robert Schäfer
980fab01b3 Add documentation for neo4j backups in kubernetes 2019-04-20 13:55:32 +02:00
Robert Schäfer
1cd8a4d1a0
Merge pull request #486 from Human-Connection/dependabot/npm_and_yarn/backend/graphql-shield-5.3.4 
Bump graphql-shield from 5.3.3 to 5.3.4 in /backend
 2019-04-20 13:50:13 +02:00
Matt Rider
4d8148297e Fix styling of hc-editor, localize toast message 
- validations are not working for hc-editor, neither in this PR nor in ContributionForm
 2019-04-19 12:53:59 -03:00
Matt Rider
9ff194f3d6 Refetch the post to update the comments 
- I'm not happy with this as it is expensive, but seems to be used in other places in the code base, where I found the idea, @appinteractive left a comment suggesting a better approach would be to use subscriptions, but I haven't had time to research/try this option

Co-authored-by: Mike Aono <aonomike@gmail.com>
Co-authored-by: Joseph Ngugi <jngugi88@gmail.com>
 2019-04-19 09:48:17 -03:00
Ulf Gebhardt
d8546da116
fixed new mixins folder 2019-04-19 12:12:01 +02:00
Ulf Gebhardt
6de253fd32
Merge branch 'master' into 2019/kw15/User_can_change_its_username_to_emptystring 
# Conflicts:
#	webapp/components/_mixins/seo.js
#	webapp/components/mixins/seo.js
#	webapp/layouts/blank.vue
#	webapp/layouts/default.vue
#	webapp/mixins/seo.js
 2019-04-19 12:09:24 +02:00
Ulf Gebhardt
55c1ac276d
use truncate instead of substring 2019-04-19 11:52:01 +02:00
Ulf Gebhardt
d986e086c4
use mixins instead of duplicate methods 2019-04-19 11:47:07 +02:00
dependabot[bot]
d1bc3847af
Bump graphql-shield from 5.3.3 to 5.3.4 in /backend 
Bumps [graphql-shield](https://github.com/maticzav/graphql-shield) from 5.3.3 to 5.3.4.
- [Release notes](https://github.com/maticzav/graphql-shield/releases)
- [Commits](https://github.com/maticzav/graphql-shield/compare/v5.3.3...v5.3.4)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-19 04:47:45 +00:00
Matt Rider
3d2a982d3f Attempt to updated comments 
- by pushing to the post.comments array, which updates the array, but doesn't rerender the comments component
- by updating the apollo store as seen here https://akryum.github.io/vue-apollo/guide/apollo/mutations.html#server-side-example and https://github.com/Akryum/vue-apollo-todos
 2019-04-18 22:14:23 -03:00
Matt Rider
fc496aec51 Merge github.com:Human-Connection/Human-Connection into 260-add-comment-form 2019-04-18 19:00:05 -03:00
Robert Schäfer
4f7d5ee24f Fix? flaky cypress by waiting for <no-ssr> content 
Content menu is a client-side rendered component. Maybe an extra
assertion will wait for it? That's how you can flix flaky cucumbers if
you use capybara.
 2019-04-18 19:05:36 +02:00
Robert Schäfer
6cd8a4ef21
Merge pull request #439 from Human-Connection/347-display_notifications 
[WIP] Frontend implementation for notifications
 2019-04-18 18:50:13 +02:00
Robert Schäfer
6c37f525c5 Grey out a read notification + test it 2019-04-18 17:11:22 +02:00
Robert Schäfer
a1744d363c Click away iziToast message after login 
Sometimes, the popup was covering the create-post button thus failing
some cypress tests locally.
 2019-04-18 16:54:05 +02:00
Robert Schäfer
57a53a44b2 Fix seeded notifications 2019-04-18 16:43:06 +02:00
Robert Schäfer
0811ca8248 Massive refactoring of factories 
cc @mattwr18 @tirokk @ulfgebhardt @appinteractive

The factories don't use string interpolation now but they use variables.
This resolves some errors of escaping strings when you send html along
with `post.content`. It is much cleaner, too.
 2019-04-18 16:41:34 +02:00
Robert Schäfer
a4de87318d Merge remote-tracking branch 'origin/master' into 347-display_notifications 2019-04-18 12:31:31 +02:00
Robert Schäfer
f733efcd86
Merge pull request #462 from Human-Connection/447-generate_mentioning_link_in_editor 
[WIP] Generate a link for @-Mentionings
 2019-04-18 12:19:15 +02:00
Matt Rider
0149f30f5f Fix failing tests, refactor 
- due to changes made to comments factories, which caused failures
- to use new custom CreateComment resolver syntax to relate a comment to post by passing in the postId
 2019-04-17 20:27:35 -03:00
Matt Rider
f4744fa513 Remove unused import, variables, set debug to false 2019-04-17 18:37:44 -03:00