IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2026-01-20 20:01:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,662 Commits 5 Branches 2 Tags
Commit Graph

3662 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
40aaa151dd Merge branch 'master' of github.com:Human-Connection/Human-Connection into 781-language-of-contribution 2019-06-12 16:42:40 -03: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
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
f80173697c Merge branch 'master' of github.com:Human-Connection/Human-Connection into 781-language-of-contribution 2019-06-11 15:48:00 -03:00
Matt Rider
4407d6648a Add component tests, translations 2019-06-11 15:47:10 -03:00
Robert Schäfer
5eaac8b077 Document loading spinner implementation with test 
Because it's slightly odd how I avoid a duplicate loading spinner, I
 thought this is a good target for a test.
 2019-06-11 18:48:01 +02:00
Robert Schäfer
d1364e4aed Merge remote-tracking branch 'origin/master' into 402-userprofil-tab-click-function 2019-06-11 17:41:17 +02:00
mattwr18
d010b62985
Merge pull request #796 from Human-Connection/dependabot/npm_and_yarn/backend/graphql-shield-5.3.7 
Bump graphql-shield from 5.3.6 to 5.3.7 in /backend
 2019-06-11 08:35:34 -03:00
dependabot-preview[bot]
db37d085f8
Bump graphql-shield from 5.3.6 to 5.3.7 in /backend 
Bumps [graphql-shield](https://github.com/maticzav/graphql-shield) from 5.3.6 to 5.3.7.
- [Release notes](https://github.com/maticzav/graphql-shield/releases)
- [Commits](https://github.com/maticzav/graphql-shield/compare/v5.3.6...v5.3.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-11 04:51:32 +00:00
Matt Rider
5986ab2070 Create Posts with a specified language, or fallback 2019-06-10 17:12:00 -03:00
dependabot-preview[bot]
f18ae14741
Bump prettier from 1.17.1 to 1.18.2 in /backend 
Bumps [prettier](https://github.com/prettier/prettier) from 1.17.1 to 1.18.2.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/prettier/compare/1.17.1...1.18.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-10 11:12:27 +00:00
mattwr18
14041ff396
Merge pull request #794 from Human-Connection/dependabot/npm_and_yarn/webapp/prettier-1.18.2 
Bump prettier from 1.18.0 to 1.18.2 in /webapp
 2019-06-10 08:12:00 -03:00
mattwr18
8c247e1b72
Merge pull request #793 from Human-Connection/dependabot/npm_and_yarn/webapp/tiptap-extensions-1.22.1 
Bump tiptap-extensions from 1.21.0 to 1.22.1 in /webapp
 2019-06-10 08:11:27 -03:00
mattwr18
8f149c9751
Merge pull request #792 from Human-Connection/dependabot/npm_and_yarn/webapp/cookie-universal-nuxt-2.0.16 
Bump cookie-universal-nuxt from 2.0.14 to 2.0.16 in /webapp
 2019-06-10 08:10:50 -03:00
mattwr18
0f78fdcfa5
Merge pull request #790 from Human-Connection/dependabot/npm_and_yarn/webapp/tippy.js-4.3.4 
Bump tippy.js from 4.3.3 to 4.3.4 in /webapp
 2019-06-10 08:10:05 -03:00
dependabot-preview[bot]
d85f63078f
Bump prettier from 1.18.0 to 1.18.2 in /webapp 
Bumps [prettier](https://github.com/prettier/prettier) from 1.18.0 to 1.18.2.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/prettier/compare/1.18.0...1.18.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-10 04:55:09 +00:00
dependabot-preview[bot]
46ccaf6b95
Bump tiptap-extensions from 1.21.0 to 1.22.1 in /webapp 
Bumps [tiptap-extensions](https://github.com/scrumpy/tiptap) from 1.21.0 to 1.22.1.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap-extensions@1.21.0...tiptap-extensions@1.22.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-10 04:54:10 +00:00
dependabot-preview[bot]
3461de56f8
Bump cookie-universal-nuxt from 2.0.14 to 2.0.16 in /webapp 
Bumps [cookie-universal-nuxt](https://github.com/microcipcip/cookie-universal) from 2.0.14 to 2.0.16.
- [Release notes](https://github.com/microcipcip/cookie-universal/releases)
- [Commits](https://github.com/microcipcip/cookie-universal/compare/v2.0.14...v2.0.16)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-10 04:53:37 +00:00
dependabot-preview[bot]
8226c900fd
Bump tippy.js from 4.3.3 to 4.3.4 in /webapp 
Bumps [tippy.js](https://github.com/atomiks/tippyjs) from 4.3.3 to 4.3.4.
- [Release notes](https://github.com/atomiks/tippyjs/releases)
- [Commits](https://github.com/atomiks/tippyjs/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-10 04:52:38 +00:00
mattwr18
0259eeee66
Merge pull request #771 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-cache-inmemory-1.6.2 
Bump apollo-cache-inmemory from 1.6.1 to 1.6.2 in /backend
 2019-06-08 11:48:23 -03:00
mattwr18
75fa7af5d8
Merge pull request #780 from Human-Connection/add_translations_to_user_profile 
Translate network tab on the left profile page
 2019-06-08 11:45:39 -03:00
Robert Schäfer
15b7043d00 Write a test for "load more" button 
The crucial test is still missing: Write a test to check that no more
than one loading spinner is visible all the time.

@Tirokk FYI I wrote a page component test and made sure that the test
will also fail if the implementation is broken.
 2019-06-08 01:50:08 +02:00
mattwr18
d32f577c8c
Update en.json 2019-06-07 19:08:40 -03:00
dependabot-preview[bot]
f0a4149b9e
Bump apollo-cache-inmemory from 1.6.1 to 1.6.2 in /backend 
Bumps [apollo-cache-inmemory](https://github.com/apollographql/apollo-client) from 1.6.1 to 1.6.2.
- [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.1...apollo-cache-inmemory@1.6.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-07 22:07:23 +00:00
mattwr18
a0f9e90ce2
Merge pull request #783 from Human-Connection/remove_unnecessary_dependency_ms 
Replace dependency `ms` completely
 2019-06-07 19:06:11 -03:00
Robert Schäfer
ceaab92d19
Merge pull request #772 from Human-Connection/dependabot/npm_and_yarn/webapp/apollo-client-2.6.2 
Bump apollo-client from 2.6.1 to 2.6.2 in /webapp
 2019-06-08 00:05:12 +02:00
Robert Schäfer
9384f85ebf Use jest's expectation matchers if possible 
@Tirokk jest has a lot of assertion matchers that will give you better
error messages than the default ones:
https://jestjs.io/docs/en/expect.html#tohavelengthnumber
 2019-06-07 16:53:30 +02:00
Robert Schäfer
314b257b45 Replace dependency ms completely 
I have seen this PR here: https://github.com/Human-Connection/Human-Connection/pull/774 and I thought: Never saw that one before, where is it used and what is the purpose? I could find this line only and thought this is not a justification for having the package installed.
 2019-06-07 15:49:18 +02:00
dependabot-preview[bot]
9bccf2b849
Bump apollo-client from 2.6.1 to 2.6.2 in /webapp 
Bumps [apollo-client](https://github.com/apollographql/apollo-client) from 2.6.1 to 2.6.2.
- [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.1...apollo-client@2.6.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-07 12:39:39 +00:00
Robert Schäfer
02dca83358
Merge pull request #768 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-client-2.6.2 
Bump apollo-client from 2.6.1 to 2.6.2 in /backend
 2019-06-07 14:37:21 +02:00