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

7796 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Schäfer
47688fd5b0
Merge pull request #2537 from Human-Connection/dependabot/npm_and_yarn/webapp/tiptap-1.26.6 
build(deps): bump tiptap from 1.26.5 to 1.26.6 in /webapp
 2019-12-17 10:17:38 +01:00
Robert Schäfer
f69ed7e92b
Merge pull request #2538 from Human-Connection/dependabot/npm_and_yarn/webapp/vue-loader-15.8.3 
build(deps-dev): bump vue-loader from 15.7.2 to 15.8.3 in /webapp
 2019-12-17 10:17:14 +01:00
Alexander Friedland
ed617f8c83
Merge branch 'master' into 1746-Blur_explicit_Image_Content 2019-12-17 07:39:26 +01:00
dependabot-preview[bot]
b552bfd349
build(deps-dev): bump vue-loader from 15.7.2 to 15.8.3 in /webapp 
Bumps [vue-loader](https://github.com/vuejs/vue-loader) from 15.7.2 to 15.8.3.
- [Release notes](https://github.com/vuejs/vue-loader/releases)
- [Changelog](https://github.com/vuejs/vue-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-loader/compare/v15.7.2...v15.8.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-17 04:21:48 +00:00
dependabot-preview[bot]
ddd11d1621
build(deps): bump tiptap from 1.26.5 to 1.26.6 in /webapp 
Bumps [tiptap](https://github.com/scrumpy/tiptap) from 1.26.5 to 1.26.6.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap@1.26.5...tiptap@1.26.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-17 04:21:00 +00:00
dependabot-preview[bot]
c60a367956
build(deps): bump metascraper-video from 5.8.9 to 5.8.10 in /backend 
Bumps [metascraper-video](https://github.com/microlinkhq/metascraper) from 5.8.9 to 5.8.10.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.8.9...v5.8.10)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-17 04:20:32 +00:00
dependabot-preview[bot]
f1d8e08adc
build(deps): bump apollo-cache-inmemory from 1.6.3 to 1.6.5 in /backend 
Bumps [apollo-cache-inmemory](https://github.com/apollographql/apollo-client) from 1.6.3 to 1.6.5.
- [Release notes](https://github.com/apollographql/apollo-client/releases)
- [Changelog](https://github.com/apollographql/apollo-client/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-client/compare/apollo-cache-inmemory@1.6.3...apollo-cache-inmemory@1.6.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-17 04:20:11 +00:00
dependabot-preview[bot]
0c83096757
build(deps): bump metascraper-image from 5.8.7 to 5.8.10 in /backend 
Bumps [metascraper-image](https://github.com/microlinkhq/metascraper) from 5.8.7 to 5.8.10.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.8.7...v5.8.10)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-17 04:19:05 +00:00
dependabot-preview[bot]
8738fd9386
build(deps): bump neo4j-graphql-js from 2.10.1 to 2.10.2 in /backend 
Bumps [neo4j-graphql-js](https://github.com/neo4j-graphql/neo4j-graphql-js) from 2.10.1 to 2.10.2.
- [Release notes](https://github.com/neo4j-graphql/neo4j-graphql-js/releases)
- [Changelog](https://github.com/neo4j-graphql/neo4j-graphql-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/neo4j-graphql/neo4j-graphql-js/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-17 04:17:58 +00:00
mattwr18
c2bb406502
Merge pull request #2512 from Human-Connection/refactor_content_menu 
Refactor: content menu
 2019-12-16 16:13:45 +01:00
dependabot-preview[bot]
b6cfb2ccb3
build(deps-dev): bump eslint-plugin-prettier in /webapp 
Bumps [eslint-plugin-prettier](https://github.com/prettier/eslint-plugin-prettier) from 3.1.1 to 3.1.2.
- [Release notes](https://github.com/prettier/eslint-plugin-prettier/releases)
- [Changelog](https://github.com/prettier/eslint-plugin-prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/eslint-plugin-prettier/compare/v3.1.1...v3.1.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-16 15:12:32 +00:00
dependabot-preview[bot]
ffb6fc3135
build(deps): bump apollo-cache-inmemory from 1.6.3 to 1.6.5 in /webapp 
Bumps [apollo-cache-inmemory](https://github.com/apollographql/apollo-client) from 1.6.3 to 1.6.5.
- [Release notes](https://github.com/apollographql/apollo-client/releases)
- [Changelog](https://github.com/apollographql/apollo-client/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-client/compare/apollo-cache-inmemory@1.6.3...apollo-cache-inmemory@1.6.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-16 15:12:18 +00:00
mattwr18
b1f1547ebf
Merge pull request #2524 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-audio-5.8.10 
build(deps): bump metascraper-audio from 5.8.7 to 5.8.10 in /backend
 2019-12-16 16:10:29 +01:00
mattwr18
5520915a57
Merge pull request #2518 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-description-5.8.10 
build(deps): bump metascraper-description from 5.8.7 to 5.8.10 in /backend
 2019-12-16 16:10:09 +01:00
mattwr18
55eed8e622
Merge pull request #2517 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-plugin-prettier-3.1.2 
build(deps-dev): bump eslint-plugin-prettier from 3.1.1 to 3.1.2 in /backend
 2019-12-16 16:09:52 +01:00
mattwr18
b8640c61d5
Merge pull request #2516 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-client-2.6.8 
build(deps): bump apollo-client from 2.6.4 to 2.6.8 in /backend
 2019-12-16 16:09:25 +01:00
mattwr18
02867236cb
Merge pull request #2515 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-logo-5.8.10 
build(deps): bump metascraper-logo from 5.8.7 to 5.8.10 in /backend
 2019-12-16 16:08:46 +01:00
mattwr18
928689affa
Merge pull request #2511 from Human-Connection/fix_unique_fragment_issue 
Fix duplicate fragment `user` issue
 2019-12-16 16:08:20 +01:00
mattwr18
c7b7cac275
Merge pull request #2513 from Human-Connection/fix_editor_only_visible_after_click 
fix: editor not visible in server-side-rendering
 2019-12-16 13:06:44 +01:00
mattwr18
e8c4624250 Remove string-hash package 2019-12-16 11:48:28 +01:00
mattwr18
83ab648e93 Add back @roschaefer changes 
- maintain reactive placeholders
 2019-12-16 11:42:37 +01:00
Alexander Friedland
3a98767707
change link to FAQ 
link FAQ Blur: https://support.human-connection.org/kb/faq.php?id=113
 2019-12-16 11:12:30 +01:00
mattwr18
70c63297d4 Revert unrelated changes 
- @roschaefer, I reverted the changes you made that were unrelated to
the server-side rendering issue with the editor... maybe we can put in a
separate PR with them, or a subset of them that doesn't remove the
reactivity of the editor placholder(?)
 2019-12-16 11:06:47 +01:00
mattwr18
65b92786b7 Revert unrelated changes 2019-12-16 11:00:55 +01:00
dependabot-preview[bot]
fc47701064
build(deps): bump metascraper-audio from 5.8.7 to 5.8.10 in /backend 
Bumps [metascraper-audio](https://github.com/microlinkhq/metascraper) from 5.8.7 to 5.8.10.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.8.7...v5.8.10)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-16 04:21:41 +00:00
dependabot-preview[bot]
0e9087d536
build(deps): bump metascraper-description in /backend 
Bumps [metascraper-description](https://github.com/microlinkhq/metascraper) from 5.8.7 to 5.8.10.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.8.7...v5.8.10)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-16 04:20:20 +00:00
dependabot-preview[bot]
1c1ae9355a
build(deps-dev): bump eslint-plugin-prettier in /backend 
Bumps [eslint-plugin-prettier](https://github.com/prettier/eslint-plugin-prettier) from 3.1.1 to 3.1.2.
- [Release notes](https://github.com/prettier/eslint-plugin-prettier/releases)
- [Changelog](https://github.com/prettier/eslint-plugin-prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/eslint-plugin-prettier/compare/v3.1.1...v3.1.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-16 04:19:51 +00:00
dependabot-preview[bot]
628cb85944
build(deps): bump apollo-client from 2.6.4 to 2.6.8 in /backend 
Bumps [apollo-client](https://github.com/apollographql/apollo-client) from 2.6.4 to 2.6.8.
- [Release notes](https://github.com/apollographql/apollo-client/releases)
- [Changelog](https://github.com/apollographql/apollo-client/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-client/compare/apollo-client@2.6.4...v2.6.8)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-16 04:19:30 +00:00
dependabot-preview[bot]
1e3c67867f
build(deps): bump metascraper-logo from 5.8.7 to 5.8.10 in /backend 
Bumps [metascraper-logo](https://github.com/microlinkhq/metascraper) from 5.8.7 to 5.8.10.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.8.7...v5.8.10)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-16 04:18:59 +00:00
roschaefer
71b2eac175 refactor: content menu 
I hoped this would fix the bug with the editor sometimes not being shown
when clicking "Edit Post" but it does not.
 2019-12-14 20:16:09 +01:00
roschaefer
a7a1e4affc fix: editor not visible in server-side-rendering 
This is fixing a bug where sometimes the editor would not get displayed
until you click into the title text fields. This commit also removes
some obscure optimizations.

I'm really annoyed by the cruft that we still carry around until this
very day.

Every single line of untested code, which you left because you thought:
"Well sure this is going to improve performance!" is going to bite you.
 2019-12-14 01:36:59 +01:00
roschaefer
107409ecee Fix duplicate fragment user issue 
This is refactoring all our fragments and fixing the warning about an
existing name `user`. Apparently, fragments should have a unique name
globally.

I decided to call `userFragment`, `postFragment` the fragments for one
object and use different names to query for related objects.

I would be glad to learn a better way to handle this.
 2019-12-14 00:37:42 +01:00
Robert Schäfer
b94a477bb1
Merge pull request #2507 from Human-Connection/erhardtstiefel-patch-9 
Update it.json
 2019-12-13 19:51:29 +01:00
mattwr18
04ce19dd63
Merge pull request #2510 from Human-Connection/fix-null-pointer-error-username-build-please 
Fix: User.name is not non-nullable
 2019-12-13 19:46:58 +01:00
mattwr18
f876021ec6 Fix: User.name is not non-nullable 2019-12-13 17:48:19 +01:00
mattwr18
c3071518fc
Merge pull request #2506 from Human-Connection/update-to-version-0.1.13 
Update to version 0.1.13
 2019-12-13 15:31:45 +01:00
Erhardt Stiefel
92548344ca
Update it.json 
I added the missing italian verbs just for the display of "donations" but I see a lot more verbs missing. Does it make sense to translate and  fill in everything which is to be found in en.json ?
 2019-12-13 15:04:09 +01:00
Alexander Friedland
792ae8d598
change line 152 
".ds-card-imag" TO ".ds-card-image"
 2019-12-13 13:39:51 +01:00
mattwr18
5b1b33eb7a Update to version 0.1.13 2019-12-13 13:39:34 +01:00
mattwr18
a677cb1c21 v0.1.13 2019-12-13 13:37:52 +01:00
Robert Schäfer
6a2ae77b60
Merge pull request #2492 from Human-Connection/erhardtstiefel-patch-9 
Update de.json
 2019-12-13 13:26:48 +01:00
mattwr18
2d8fef1edc
Merge pull request #2487 from Human-Connection/fix_cannot_read_post_of_undefined_once_and_for_all 
Fix broken scroll behaviour on index and profile page
 2019-12-13 13:24:19 +01:00
mattwr18
3f6edf8c01
Merge pull request #2503 from Human-Connection/lokalise-2019-12-12_21-23-19 
Lokalise: Translations update
 2019-12-13 13:23:38 +01:00
mattwr18
9a20565e52
Merge pull request #2454 from Human-Connection/dependabot/docker/webapp/node-13.3.0-alpine 
build(deps): bump node from 13.1.0-alpine to 13.3.0-alpine in /webapp
 2019-12-13 13:22:35 +01:00
mattwr18
6815592a3a
Merge pull request #2485 from Human-Connection/lokalise-2019-12-10_21-55-12 
Lokalise: Translations update
 2019-12-13 13:22:21 +01:00
mattwr18
243086b8cb
Merge pull request #2505 from Human-Connection/dependabot/npm_and_yarn/webapp/css-loader-3.3.2 
build(deps-dev): bump css-loader from 3.3.0 to 3.3.2 in /webapp
 2019-12-13 13:21:59 +01:00
mattwr18
996ff51999
Merge pull request #2504 from Human-Connection/dependabot/npm_and_yarn/cypress-3.8.0 
build(deps-dev): bump cypress from 3.7.0 to 3.8.0
 2019-12-13 13:21:39 +01:00
mattwr18
56c5f4a384
Merge pull request #2433 from Human-Connection/2412-favor-transaction-function 
Favor transaction functions
 2019-12-13 13:20:43 +01:00
mattwr18
307076771c Fix lint 2019-12-13 10:45:58 +01:00
mattwr18
dfd30cbaac Remove check for setting name to null or undefined 
- this was making things more likely to fail from the frontend, we would
need to consider doing a db manipulation for users from the old alpha
who have user.name as null.
- it only protects against someone who bypasses our UI and sends a
message directly to the backend, but if they can do that we have bigger
problems.
 2019-12-13 10:17:19 +01:00