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

11194 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wolfgang Huß
fa80716f6b Merge branch '260-add-comment-form' of https://github.com/Human-Connection/Human-Connection into 260-add-comment-form 2019-04-24 16:42:39 +02:00
Robert Schäfer
783d34f53a Fix README for minikube 2019-04-24 14:30:35 +02:00
Matt Rider
546e2c99ad Localise text, remove frontend validations 
- validations are not working for the editor, they only work for our ds-input
 2019-04-24 09:15:41 -03:00
Matt Rider
0078b743fe Validate comments length, presence/test 
- Co-authored-by: Wolfgang Huss <wolle.huss@pjannto.com>
- Co-authored-by: Mike Aono <aonomike@gmail.com>
 2019-04-24 09:11:33 -03:00
Wolfgang Huß
3fa064986e Merge branch '260-add-comment-form' of https://github.com/Human-Connection/Human-Connection into 260-add-comment-form 2019-04-24 14:09:41 +02:00
Robert Schäfer
7f2df14ef3 Update human connection specific configuration 2019-04-24 12:52:10 +02:00
Matt Rider
23b0bbfbbe Merge branch 'master' of github.com:Human-Connection/Human-Connection into 260-add-comment-form 2019-04-24 07:41:25 -03:00
Robert Schäfer
31cff10206 Clean up kubernetes config for maintenance-worker 
We're going into the direction of removing the backend and database
deployments, accessing `/uploads` and `/data` through the maintenance
worker pod and carrying out tasks from there.
 2019-04-24 01:10:35 +02:00
Robert Schäfer
6ed5ad58d5 Merge maintenance with deployment 2019-04-24 00:27:58 +02:00
Robert Schäfer
f1c28ee0cc Further structuring in https + dashboard chapters 2019-04-24 00:15:08 +02:00
Robert Schäfer
8b83a27da1 Structure DO and minikube into separate pages 2019-04-23 23:56:35 +02:00
Matt Rider
11a1f7991e Remove PostQuery.js 
- to be added in a separate ticket(?)
 2019-04-23 18:19:48 -03:00
Matt Rider
3b00a34199 Add cypress step to check the editor is cleared 2019-04-23 18:19:11 -03:00
Robert Schäfer
543b7c6888 Configure neo4j deployment to have 1 pod max 2019-04-23 23:12:16 +02:00
Robert Schäfer
c50394630c Simplify maintenance-worker once again 
After learning how to restore a neo4j database in kubernetes I believe
the best way to seed is to seed locally, create a backup and then
restore the backup to the kubernetes cluster.
 2019-04-23 23:12:16 +02:00
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