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

2602 Commits

Author SHA1 Message Date
mattwr18
a33cb1e6fc Make tests accurate 2019-12-20 01:14:43 +01:00
mattwr18
730da2029c Fix imageAspectRatio set to null UpdatePost 
- we were not setting the form.imageAspectRatio to the value of the
post's imageAspectRatio, so when a user updated their post, but did not
update their imageAspectRatio it would set it to null
 2019-12-20 00:59:29 +01:00
mattwr18
efd4d1f2af
Merge pull request #2563 from Human-Connection/lokalise-2019-12-18_10-06-16 
Lokalise: Translations update
 2019-12-19 12:27:04 +01:00
mattwr18
a5542c5b4c
Merge pull request #2580 from Human-Connection/dependabot/npm_and_yarn/webapp/style-resources-loader-1.3.3 
build(deps-dev): bump style-resources-loader from 1.3.2 to 1.3.3 in /webapp
 2019-12-19 12:13:52 +01:00
mattwr18
8f5dbe60c0
Merge pull request #2577 from Human-Connection/dependabot/docker/webapp/node-13.4.0-alpine 
build(deps): bump node from 13.3.0-alpine to 13.4.0-alpine in /webapp
 2019-12-19 11:49:38 +01:00
Wolfgang Huß
377f2eecd2
Merge pull request #2351 from Human-Connection/1746-Blur_explicit_Image_Content 
Blur Images
 2019-12-19 11:46:38 +01:00
dependabot-preview[bot]
ffa6825f06
build(deps-dev): bump style-resources-loader in /webapp 
Bumps [style-resources-loader](https://github.com/yenshih/style-resources-loader) from 1.3.2 to 1.3.3.
- [Release notes](https://github.com/yenshih/style-resources-loader/releases)
- [Changelog](https://github.com/yenshih/style-resources-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yenshih/style-resources-loader/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-19 04:21:36 +00:00
dependabot-preview[bot]
3816e79b6d
build(deps): bump node from 13.3.0-alpine to 13.4.0-alpine in /webapp 
Bumps node from 13.3.0-alpine to 13.4.0-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-19 04:20:21 +00:00
mattwr18
57a4309b30
Merge pull request #2544 from Human-Connection/2543-add-back-layout-changes 
Add back layout changes/update db_manipulation
 2019-12-18 16:16:00 +01:00
mattwr18
e002ed0b49 Add back layout changes/update db_manipulation 
- we had removed these changes till we could deploy them by themselves
and run the db_manipulation

Co-authored-by: Alina Beck <alina.beck@mail.com>
 2019-12-18 15:39:42 +01:00
Alina Beck
2e26e3f3f9
Apply suggestions from code review 
change FAQ link text
 2019-12-18 17:36:24 +05:30
Alina Beck
c74bfde652 refactor to use only one value for the blurImage status 2019-12-18 15:26:45 +05:30
Alina Beck
edaac117eb remove code related to imageAspectRatio 2019-12-18 15:26:45 +05:30
lokalise-bot
b70ff73bba Lokalise: update of webapp/locales/ru.json 2019-12-18 10:06:18 +01:00
ogerly
0213d64ba5 change const height = Math.min, remove 2000 2019-12-18 07:56:36 +01:00
dependabot-preview[bot]
bff3cfe2d7
build(deps-dev): bump css-loader from 3.3.2 to 3.4.0 in /webapp 
Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 3.3.2 to 3.4.0.
- [Release notes](https://github.com/webpack-contrib/css-loader/releases)
- [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/css-loader/compare/v3.3.2...v3.4.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-18 04:19:40 +00:00
Robert Schäfer
c1969ac12b
Merge pull request #2535 from Human-Connection/dependabot/npm_and_yarn/webapp/tiptap-extensions-1.28.6 
build(deps): bump tiptap-extensions from 1.28.5 to 1.28.6 in /webapp
 2019-12-17 21:47:56 +01:00
Robert Schäfer
71e9090833
Merge pull request #2542 from Human-Connection/2541-fix-master-build-add-explicit-query 
Fix maintenance service/LocaleSwitch import
 2019-12-17 19:11:15 +01:00
dependabot-preview[bot]
947db53990
build(deps): bump tiptap-extensions from 1.28.5 to 1.28.6 in /webapp 
Bumps [tiptap-extensions](https://github.com/scrumpy/tiptap) from 1.28.5 to 1.28.6.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap-extensions@1.28.5...tiptap-extensions@1.28.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-17 16:23:22 +00:00
mattwr18
e15b7c8d03
Merge pull request #2523 from Human-Connection/dependabot/npm_and_yarn/webapp/apollo-client-2.6.8 
build(deps): bump apollo-client from 2.6.4 to 2.6.8 in /webapp
 2019-12-17 17:21:00 +01:00
mattwr18
52cd5ac332
Merge pull request #2521 from Human-Connection/dependabot/npm_and_yarn/webapp/stack-utils-2.0.1 
build(deps): bump stack-utils from 1.0.2 to 2.0.1 in /webapp
 2019-12-17 17:20:42 +01:00
mattwr18
3abfe13dcc Fix maintenance service/LocaleSwitch import 2019-12-17 16:15:11 +01:00
dependabot-preview[bot]
565c58224d
build(deps): bump apollo-client from 2.6.4 to 2.6.8 in /webapp 
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-17 09:24:48 +00:00
Robert Schäfer
360078f023
Merge pull request #2519 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-prettier-3.1.2 
build(deps-dev): bump eslint-plugin-prettier from 3.1.1 to 3.1.2 in /webapp
 2019-12-17 10:23:00 +01:00
Robert Schäfer
15b762507b
Merge pull request #2527 from Human-Connection/dependabot/npm_and_yarn/webapp/apollo-cache-inmemory-1.6.5 
build(deps): bump apollo-cache-inmemory from 1.6.3 to 1.6.5 in /webapp
 2019-12-17 10:20:52 +01:00
dependabot-preview[bot]
2e0a488345
build(deps): bump stack-utils from 1.0.2 to 2.0.1 in /webapp 
Bumps [stack-utils](https://github.com/tapjs/stack-utils) from 1.0.2 to 2.0.1.
- [Release notes](https://github.com/tapjs/stack-utils/releases)
- [Commits](https://github.com/tapjs/stack-utils/compare/v1.0.2...v2.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-17 09:20:33 +00:00
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
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
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
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
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
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
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
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
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
56c5f4a384
Merge pull request #2433 from Human-Connection/2412-favor-transaction-function 
Favor transaction functions
 2019-12-13 13:20:43 +01:00