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
24a2650cf9 Merge remote-tracking branch 'origin/master' into 343_whitelist_all_queries_and_mutations 2019-06-13 23:31:15 +02:00
Robert Schäfer
fc4e9f40b3 Whitelist queries/mutations, fix backend tests 2019-06-13 23:29:29 +02:00
Matt Rider
2db4517900 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 404-delete-user-account-and-data 2019-06-13 17:31:45 -03:00
Matt Rider
8a214a4007 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 781-language-of-contribution 2019-06-13 17:30:24 -03:00
Matt Rider
5266de2c62 Set dropdown with language of post if exists 
follow `PR` review by @Tirokk
 2019-06-13 17:29:33 -03:00
Mike Aono
d12d7471f5
Merge pull request #824 from Human-Connection/remove-cypress-record 
Revert changes to cypress record
 2019-06-13 22:52:49 +03:00
Matt Rider
71c1b5bde9 Revert changes to cypress record 2019-06-13 16:22:59 -03:00
Matt Rider
306da8a4e3 Revert _slug.vue to master 2019-06-13 16:05:20 -03:00
Matt Rider
3c3db87c1b Add back deleted translations 
- mistakenly deleted when working through merge conflict
 2019-06-13 15:34:45 -03:00
Matt Rider
589fb16c51 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 404-delete-user-account-and-data 2019-06-13 14:59:23 -03:00
Wolfgang Huß
482ac1572b Refactored and created the tests of DeletePostCallback 
Created a folder `utils` for PostHelpers.js.
Fixed a new incoming problem of the master with deleting Posts on the User Profile.

Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-06-13 19:23:13 +02:00
Robert Schäfer
b8c5db48a6 Implement prefix of image urls with a filter 
Fix #820

Ok, so after I would have to use the same method in three different
locations (`<ds-card>` expects an `image` attribute but cannot render
entire components) I decided to implement the prefix of image urls with
a filter rather than a component. The downside of this is that we have
to add the filter on a lot of component tests. The benefit is less
components and hopefully less complexity.
 2019-06-13 16:56:41 +02:00
dependabot-preview[bot]
bbe6d63512
Bump apollo-server-testing from 2.6.2 to 2.6.3 in /backend 
Bumps [apollo-server-testing](https://github.com/apollographql/apollo-server) from 2.6.2 to 2.6.3.
- [Release notes](https://github.com/apollographql/apollo-server/releases)
- [Changelog](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-server/compare/apollo-server-testing@2.6.2...apollo-server-testing@2.6.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-13 05:04:29 +00:00
dependabot-preview[bot]
f77aa4ec4e
Bump apollo-server from 2.6.2 to 2.6.3 in /backend 
Bumps [apollo-server](https://github.com/apollographql/apollo-server) from 2.6.2 to 2.6.3.
- [Release notes](https://github.com/apollographql/apollo-server/releases)
- [Changelog](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-server/compare/apollo-server@2.6.2...apollo-server@2.6.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-13 05:04:05 +00:00
dependabot-preview[bot]
6507b97fdf
Bump date-fns from 2.0.0-alpha.31 to 2.0.0-alpha.32 in /backend 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.0.0-alpha.31 to 2.0.0-alpha.32.
- [Release notes](https://github.com/date-fns/date-fns/releases)
- [Changelog](https://github.com/date-fns/date-fns/blob/master/CHANGELOG.md)
- [Commits](https://github.com/date-fns/date-fns/compare/v2.0.0-alpha.31...v2.0.0-alpha.32)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-13 05:03:26 +00:00
dependabot-preview[bot]
e7b42736ca
Bump date-fns from 2.0.0-alpha.31 to 2.0.0-alpha.32 in /webapp 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.0.0-alpha.31 to 2.0.0-alpha.32.
- [Release notes](https://github.com/date-fns/date-fns/releases)
- [Changelog](https://github.com/date-fns/date-fns/blob/master/CHANGELOG.md)
- [Commits](https://github.com/date-fns/date-fns/compare/v2.0.0-alpha.31...v2.0.0-alpha.32)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-13 04:56:18 +00:00
dependabot-preview[bot]
677a0d5404
Bump cypress-file-upload from 3.1.2 to 3.1.3 
Bumps [cypress-file-upload](https://github.com/abramenal/cypress-file-upload) from 3.1.2 to 3.1.3.
- [Release notes](https://github.com/abramenal/cypress-file-upload/releases)
- [Commits](https://github.com/abramenal/cypress-file-upload/compare/v3.1.2...v3.1.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-13 04:53:14 +00:00
mattwr18
d0fd4de079
Merge pull request #809 from Human-Connection/800_fix_broken_image_urls 
Fix #800
 2019-06-12 19:53:18 -03:00
Matt Rider
3ab69b5fde Improve mobile responsiveness 2019-06-12 19:44:09 -03:00
Matt Rider
8d72532098 Fix test, import locales 
Co-authored-by: Robert Schäfer <git@roschaefer.de>
 2019-06-12 19:29:51 -03:00
Robert Schäfer
113cf04c60 Fix build 2019-06-13 00:26:20 +02:00
Robert Schäfer
c2092bf3bc
Merge pull request #810 from Human-Connection/799_fix_badge_urls 
Fix #799
 2019-06-13 00:16:20 +02:00
Robert Schäfer
1ffa3cd046 Fix #799 
For target `production` the badges were simply not copied. It also
explains why we never saw that error in development. For development we
use docker build target `build-and-test`.

FYI: @ulfgebhardt @Tirokk @ogerly
 2019-06-12 23:55:42 +02:00
Robert Schäfer
3ca492801f
Merge pull request #807 from Human-Connection/470_re_enable_cypress_and_fix_builds_on_forks 
Fix #470
 2019-06-12 23:44:08 +02:00
Robert Schäfer
4166936e5f Fix #800 
Ok, so apparently all we have to do is to remove the `/api` prefix from
fixImageUrlMiddleware. I guess that's just a leftover.
 2019-06-12 23:27:43 +02:00
Robert Schäfer
c37f35a7da Fix #470 
Define env variables $BRANCH and $CYPRESS_RETRIES

Source: https://graysonkoonce.com/getting-the-current-branch-name-during-a-pull-request-in-travis-ci/

------

Cypress is looking for a env var by default. See: https://docs.cypress.io/guides/guides/command-line.html#cypress-run

So I guess, all what we have to do is to give the env var another name.
I also added a measure to avoid running out of quota: Disable recording
if dependabot just updates dependencies.
 2019-06-12 23:09:13 +02:00
Matt Rider
97e8fa1af8 Style, update languageOptions to contain all 
- languages we support for translations
 2019-06-12 18:08:20 -03:00
Matt Rider
6e6407b265 Upgrade apollo-cache-inmemory 2019-06-12 17:06:37 -03:00
Matt Rider
40aaa151dd Merge branch 'master' of github.com:Human-Connection/Human-Connection into 781-language-of-contribution 2019-06-12 16:42:40 -03:00
Matt Rider
aa6551e35d Remove comments 2019-06-12 15:59:33 -03:00
Matt Rider
70567857e8 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 404-delete-user-account-and-data 2019-06-12 15:51:38 -03:00
Matt Rider
d15857d240 Set user's posts/comments' delete attribute to true 
- favor over actually deleting the node so that the comments will appear as anonymous and not lose the context of the conversation
- the post will not appear, but for admin it will be accessible
- follow @roschaefer `PR` review
 2019-06-12 15:27:57 -03:00
Matt Rider
83c7773d1b Add checkboxes to delete posts/comments 
- fix tests
- rename files/directory to DeleteData to be more accurate
 2019-06-12 15:07:16 -03:00
Wolfgang Huß
cd0074ec86 Merge remote-tracking branch 'origin/master' into 734-authorization-problem-disabling-post 
# Conflicts:
#	webapp/pages/profile/_id/_slug.spec.js
#	webapp/pages/profile/_id/_slug.vue
 2019-06-12 18:22:50 +02:00
Wolfgang Huß
8bb33f23a9 Forgot to add some files 2019-06-12 18:04:00 +02:00
Wolfgang Huß
1339734281 Rename DeleteModal to ConfirmModel and write some refactor some tests 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-06-12 18:02:50 +02:00
Wolfgang Huß
8eb089d218 Rename event deletePost to removePostFromList 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-06-12 15:58:23 +02:00
senderfm
dba719ea1c english translation changes undone. 2019-06-12 12:54:33 +02:00
Robert Schäfer
ebe951f05b Update tiptap to 1.21.0 2019-06-12 10:43:44 +02:00
Robert Schäfer
fa5b16ddd5
Merge pull request #798 from Human-Connection/dependabot/npm_and_yarn/webapp/tiptap-extensions-1.22.2 
Bump tiptap-extensions from 1.22.1 to 1.22.2 in /webapp
 2019-06-12 10:28:14 +02:00
Robert Schäfer
45fc604c25
Merge pull request #797 from Human-Connection/dependabot/npm_and_yarn/backend/graphql-shield-5.3.8 
Bump graphql-shield from 5.3.7 to 5.3.8 in /backend
 2019-06-12 10:27:45 +02:00
Robert Schäfer
c2bcc9f595
Merge pull request #754 from Human-Connection/402-userprofil-tab-click-function 
402 userprofil tab click function
 2019-06-12 10:24:41 +02:00
Wolfgang Huß
1c6016ddcc Refactored the PostHelpers to an imported lib instead a mixin 2019-06-12 09:05:43 +02:00
dependabot-preview[bot]
1c614cc009
Bump tiptap-extensions from 1.22.1 to 1.22.2 in /webapp 
Bumps [tiptap-extensions](https://github.com/scrumpy/tiptap) from 1.22.1 to 1.22.2.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap-extensions@1.22.1...tiptap-extensions@1.22.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-12 05:00:32 +00:00
dependabot-preview[bot]
78607dfd0e
Bump graphql-shield from 5.3.7 to 5.3.8 in /backend 
Bumps [graphql-shield](https://github.com/maticzav/graphql-shield) from 5.3.7 to 5.3.8.
- [Release notes](https://github.com/maticzav/graphql-shield/releases)
- [Commits](https://github.com/maticzav/graphql-shield/compare/v5.3.7...v5.3.8)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-12 04:56:09 +00:00
Robert Schäfer
90107cfb18
Merge pull request #789 from Human-Connection/dependabot/npm_and_yarn/backend/prettier-1.18.2 
Bump prettier from 1.17.1 to 1.18.2 in /backend
 2019-06-11 23:44:00 +02:00
Robert Schäfer
54c7c204c2 Run yarn run lint --fix 2019-06-11 23:10:26 +02:00
Robert Schäfer
8beba9c8b2 Remove obsolete translations 
@ogerly I saw that you added tooltips to the menu bars. However, it is
not "Your posts" that you see there, it's the posts of the user whose
profile you are looking at.

As a fix, I removed the tooltips in an earlier merge commit, because I think
they don't improve user experience here.
 2019-06-11 23:01:26 +02:00
Matt Rider
fc8792e7af Merge branch 'master' of github.com:Human-Connection/Human-Connection into 404-delete-user-account-and-data 2019-06-11 15:48:43 -03:00
Matt Rider
f80173697c Merge branch 'master' of github.com:Human-Connection/Human-Connection into 781-language-of-contribution 2019-06-11 15:48:00 -03:00