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

3556 Commits

Author SHA1 Message Date
Alina Beck
5a30001db8 rearrange BaseButton stories 2019-12-17 14:46:54 +05:30
Alina Beck
93233a5c76 style button loading state 2019-12-17 14:35:49 +05:30
Moriz Wahl
5657ab3258 Merging changes made by @mattwr18 
Merge branch '1463-search-for-users' of https://github.com/Human-Connection/Human-Connection into 1463-search-for-users
 2019-12-17 09:57:51 +01:00
Alina Beck
69a69ad0c9 migrate loading spinner 2019-12-17 14:02:59 +05:30
Alina Beck
ab9ad46b14 style button variants 2019-12-17 13:29:29 +05:30
Alina Beck
557fa3211d rearrange button stories 2019-12-17 13:01:50 +05:30
Alina Beck
92856afa3c sort storybook stories alphabetically 2019-12-17 12:51:05 +05:30
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
mattwr18
4cd43b68a4 Refactor further search 
- in the end, the error was due to not asking for the id of the author
back of the Post.. grrr.... why couldn't we get better error messages!!

- Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
 2019-12-13 15:56:18 +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
mattwr18
2f4125b5d1 Remove this from clearTimeout 
- inadvertantly added
 2019-12-13 12:53:37 +01:00
mattwr18
1f2216cd4f Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1463-search-for-users 2019-12-13 12:31:14 +01:00
mattwr18
ebc5cf392d Fix search by adding result id 
- Apollo cache requires an id to commit to their store
- add id to each query result
- refactor out the store
- still can use a lot of refactoring
 2019-12-13 12:30:00 +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
ogerly
4c93f65ef4 arrrr* forget to save textfiles :| 2019-12-13 09:17:12 +01:00
ogerly
556adf2e37 final polish :) 2019-12-13 09:02:22 +01:00
dependabot-preview[bot]
b7ed402674
build(deps-dev): bump css-loader from 3.3.0 to 3.3.2 in /webapp 
Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 3.3.0 to 3.3.2.
- [Release notes](https://github.com/webpack-contrib/css-loader/releases)
- [Changelog](https://github.com/webpack-contrib/css-loader/blob/v3.3.2/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/css-loader/compare/v3.3.0...v3.3.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-13 04:19:44 +00:00
Robert Schäfer
8099f717c4
Merge pull request #2491 from Human-Connection/erhardtstiefel-patch-8-1 
Update en.json
 2019-12-13 01:07:08 +01:00
Robert Schäfer
9261f03efb
Merge pull request #2493 from Human-Connection/erhardtstiefel-patch-10 
Update es.json
 2019-12-13 01:06:30 +01:00
Robert Schäfer
7bc8646954
Merge pull request #2494 from Human-Connection/erhardtstiefel-patch-11 
Update fr.json
 2019-12-13 01:05:56 +01:00
Robert Schäfer
7efaa051b4
Merge pull request #2496 from Human-Connection/erhardtstiefel-patch-12 
Update it.json
 2019-12-13 01:04:45 +01:00
mattwr18
fd1e2c91fd Refactor to consolidate UpdateUser mutations 2019-12-12 18:48:56 +01:00
mattwr18
d375ebe7d9 Write test/refactor tests/resolvers/middleware 
- write tests for userMiddleware
- checks the functionality of nodes/locations middleware
- refactor to not allow users to update to remove their name
  debatable whether we want that or not, but we do not allow users to
create accounts with no name, so we should be consistent, before we were
using neode to validate this, but we have are removing neode from
production code, so we must validate ourselves
- collate UpdateUser mutations to one
 2019-12-12 18:14:47 +01:00
Moriz Wahl
c8634f1a10 Adding some space after the Heading for Posts 2019-12-12 11:34:00 +01:00
ogerly
a6cbbbeaf1 DB rename blurImage to imageBlurred 2019-12-12 10:42:52 +01:00
ogerly
a30a7ac8b0 mounted removed and everything put on blurImage 2019-12-12 09:44:45 +01:00
dependabot-preview[bot]
d9ca812750
build(deps): bump @nuxtjs/apollo in /webapp 
Bumps [@nuxtjs/apollo](https://github.com/nuxt-community/apollo-module) from 4.0.0-rc18 to 4.0.0-rc19.
- [Release notes](https://github.com/nuxt-community/apollo-module/releases)
- [Commits](https://github.com/nuxt-community/apollo-module/compare/v4.0.0-rc.18...v4.0.0-rc.19)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-12 04:19:21 +00:00
Alina Beck
5586335ed2 refactor css, fix design issues 2019-12-11 18:54:49 +03:00
Alina Beck
dd89c2655b add button states 2019-12-11 17:06:06 +03:00