ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,729 Commits 117 Branches 1,511 Tags
Commit Graph

3729 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mattwr18
dd627535e4
Merge pull request #795 from Human-Connection/781-language-of-contribution 
Create Posts with a specified language, or fallback
 2019-06-14 13:53:22 -03:00
mattwr18
b5fb7cb34b
Merge pull request #740 from Human-Connection/404-delete-user-account-and-data 
Delete my User Account functionality
 2019-06-14 13:45:30 -03:00
Matt Rider
1c10e0863f Merge branch 'master' of github.com:Human-Connection/Human-Connection into 781-language-of-contribution 2019-06-14 13:31:39 -03:00
Matt Rider
614a7eebc1 Refactor ContributionForm to deal with posts with no languages 2019-06-14 13:30:00 -03:00
Matt Rider
57b2b6a864 Merge branch '404-delete-user-account-and-data' of github.com:Human-Connection/Human-Connection into 404-delete-user-account-and-data 2019-06-14 11:38:08 -03:00
Matt Rider
664a8b327f Merge branch 'master' of github.com:Human-Connection/Human-Connection into 404-delete-user-account-and-data 2019-06-14 11:37:45 -03:00
Wolfgang Huß
3af6f4e822 Little german approvements … 2019-06-14 14:42:30 +02:00
Robert Schäfer
aee0403cc7
Merge pull request #823 from Human-Connection/343_whitelist_all_queries_and_mutations 
Whitelist queries/mutations, fix tests
 2019-06-14 13:22:00 +02:00
Robert Schäfer
0b9601d382
Merge pull request #825 from Human-Connection/dependabot/npm_and_yarn/backend/date-fns-2.0.0-alpha.33 
Bump date-fns from 2.0.0-alpha.31 to 2.0.0-alpha.33 in /backend
 2019-06-14 11:45:57 +02:00
Robert Schäfer
d8621c6a31
Merge pull request #828 from Human-Connection/821-follow_up 
Follow up on #820
 2019-06-14 11:41:00 +02:00
Robert Schäfer
0fc7061333 Disable broken cucumber tests for now 
@Mastercuber the justification for simply disabling the tests is that
the entire implemntation for the follow activities is wrong. It's still
using the `AddUserFollowedBy` auto-generated mutation. The mutation that
is actually used when you do a follow or unfollow are called `follow`
and `unfollow` - these are custom mutations implemented by ourselves.

So the proper fix for these tests would be to refactor the entire
ActivityPub implementation. Since there is a pending PR already I
decided not to go down the rabbit hole and simply tag the failing
sceario as "work-in-progress" (@wip).
 2019-06-14 11:33:32 +02:00
Robert Schäfer
e602786ef8
Merge pull request #826 from Human-Connection/dependabot/npm_and_yarn/cypress-file-upload-3.1.4 
Bump cypress-file-upload from 3.1.3 to 3.1.4
 2019-06-14 10:28:39 +02:00
Robert Schäfer
eb4b05e431 Add relevant permissions to let cypress tests pass 2019-06-14 10:14:48 +02:00
dependabot-preview[bot]
2bab4d5563
Bump date-fns from 2.0.0-alpha.31 to 2.0.0-alpha.33 in /backend 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.0.0-alpha.31 to 2.0.0-alpha.33.
- [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.33)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-14 08:04:36 +00:00
Robert Schäfer
53f85c6ca4
Merge pull request #827 from Human-Connection/dependabot/npm_and_yarn/webapp/date-fns-2.0.0-alpha.33 
Bump date-fns from 2.0.0-alpha.32 to 2.0.0-alpha.33 in /webapp
 2019-06-14 10:02:30 +02:00
Robert Schäfer
76e0d7ef06 Follow up on #820 
I forgot the most important part: Proxy teaser image urls.
 2019-06-14 09:59:46 +02:00
Robert Schäfer
354d8787b0 Merge remote-tracking branch 'origin/master' into 343_whitelist_all_queries_and_mutations 2019-06-14 09:45:54 +02:00
dependabot-preview[bot]
c394faa898
Bump cypress-file-upload from 3.1.3 to 3.1.4 
Bumps [cypress-file-upload](https://github.com/abramenal/cypress-file-upload) from 3.1.3 to 3.1.4.
- [Release notes](https://github.com/abramenal/cypress-file-upload/releases)
- [Commits](https://github.com/abramenal/cypress-file-upload/compare/v3.1.3...v3.1.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-14 07:45:03 +00:00
Robert Schäfer
638be23d5a
Merge pull request #813 from Human-Connection/dependabot/npm_and_yarn/cypress-cucumber-preprocessor-1.12.0 
Bump cypress-cucumber-preprocessor from 1.11.2 to 1.12.0
 2019-06-14 09:43:14 +02:00
dependabot-preview[bot]
514694a3b2
Bump date-fns from 2.0.0-alpha.32 to 2.0.0-alpha.33 in /webapp 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.0.0-alpha.32 to 2.0.0-alpha.33.
- [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.32...v2.0.0-alpha.33)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-14 05:00:56 +00:00
mattwr18
920234ec2a
Merge pull request #819 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-testing-2.6.3 
Bump apollo-server-testing from 2.6.2 to 2.6.3 in /backend
 2019-06-13 21:18:27 -03:00
mattwr18
3f87b42987
Merge pull request #818 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-2.6.3 
Bump apollo-server from 2.6.2 to 2.6.3 in /backend
 2019-06-13 21:17:58 -03:00
mattwr18
4a515b6bac
Merge pull request #817 from Human-Connection/dependabot/npm_and_yarn/backend/date-fns-2.0.0-alpha.32 
Bump date-fns from 2.0.0-alpha.31 to 2.0.0-alpha.32 in /backend
 2019-06-13 21:17:28 -03:00
mattwr18
82769634c6
Merge pull request #815 from Human-Connection/dependabot/npm_and_yarn/webapp/date-fns-2.0.0-alpha.32 
Bump date-fns from 2.0.0-alpha.31 to 2.0.0-alpha.32 in /webapp
 2019-06-13 21:17:03 -03:00
dependabot-preview[bot]
8f661a19e3
Bump cypress-cucumber-preprocessor from 1.11.2 to 1.12.0 
Bumps [cypress-cucumber-preprocessor](https://github.com/TheBrainFamily/cypress-cucumber-preprocessor) from 1.11.2 to 1.12.0.
- [Release notes](https://github.com/TheBrainFamily/cypress-cucumber-preprocessor/releases)
- [Changelog](https://github.com/TheBrainFamily/cypress-cucumber-preprocessor/blob/master/CHANGELOG.md)
- [Commits](https://github.com/TheBrainFamily/cypress-cucumber-preprocessor/compare/v1.11.2...v1.12.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-14 00:16:16 +00:00
mattwr18
cd960c2c61
Merge pull request #812 from Human-Connection/dependabot/npm_and_yarn/cypress-file-upload-3.1.3 
Bump cypress-file-upload from 3.1.2 to 3.1.3
 2019-06-13 21:14:29 -03:00
mattwr18
fb084f234e
Merge pull request #821 from Human-Connection/820-fix_posts_teaser_images 
Implement prefix of image urls with a filter
 2019-06-13 20:58:52 -03:00
Matt Rider
a099c209a8 Fix cypress tests 2019-06-13 19:54:47 -03:00
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
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