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

4172 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matt Rider
2e97af074c Remove duplicate code 
- was silly for writing so much duplicate code to change the index of the array
- woke up with inspiration
 2019-07-11 07:10:57 -03:00
Matt Rider
79930dcdc4 Refetch posts when a user clicks on the HC logo 2019-07-10 18:44:07 -03:00
Matt Rider
6536574a3b Refactor FilterPosts 
- extract FilterPostsMenuItems to its own component
- update tests accordingly
- add _.chunk from lodash to dry out code
 2019-07-10 17:10:01 -03:00
Matt Rider
0113751003 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 967-filter-post-by-category 2019-07-10 07:09:58 -03:00
Robert Schäfer
e6e9b1b7d7
Merge pull request #994 from Human-Connection/signup_as_admin 
Signup new users as admin
 2019-07-10 11:46:50 +02:00
Robert Schäfer
808f703a4f
Merge pull request #1009 from Human-Connection/dependabot/npm_and_yarn/backend/babel/preset-env-7.5.4 
Bump @babel/preset-env from 7.5.2 to 7.5.4 in /backend
 2019-07-10 11:05:21 +02:00
Robert Schäfer
238d6b98de
Merge pull request #1013 from Human-Connection/dependabot/npm_and_yarn/webapp/babel/preset-env-7.5.4 
Bump @babel/preset-env from 7.4.5 to 7.5.4 in /webapp
 2019-07-10 11:04:50 +02:00
Robert Schäfer
b7b47e4dde
Merge pull request #1007 from Human-Connection/remove_right_padding 
Follow up of #958
 2019-07-10 11:04:23 +02:00
Robert Schäfer
0d3f48e258
Merge pull request #1014 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-2.6.8 
Bump apollo-server from 2.6.6 to 2.6.8 in /backend
 2019-07-10 09:34:58 +02:00
Robert Schäfer
6f4e1b6f30 Fix cypress 2019-07-10 09:01:57 +02:00
Robert Schäfer
6f011b3421
Merge pull request #1008 from Human-Connection/dependabot/npm_and_yarn/cypress-3.4.0 
Bump cypress from 3.3.2 to 3.4.0
 2019-07-10 08:51:07 +02:00
dependabot-preview[bot]
7a2eb2a026
Bump @babel/preset-env from 7.4.5 to 7.5.4 in /webapp 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.4.5 to 7.5.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.4.5...v7.5.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-10 06:50:37 +00:00
dependabot-preview[bot]
ede3d7bc72
Bump @babel/preset-env from 7.5.2 to 7.5.4 in /backend 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.5.2 to 7.5.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.5.2...v7.5.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-10 06:50:33 +00:00
Robert Schäfer
9096af75b0
Merge pull request #1012 from Human-Connection/dependabot/npm_and_yarn/backend/babel/core-7.5.4 
Bump @babel/core from 7.5.0 to 7.5.4 in /backend
 2019-07-10 08:49:19 +02:00
Robert Schäfer
049f19043f
Merge pull request #1010 from Human-Connection/dependabot/npm_and_yarn/webapp/babel/core-7.5.4 
Bump @babel/core from 7.5.0 to 7.5.4 in /webapp
 2019-07-10 08:48:15 +02:00
dependabot-preview[bot]
7f68fd6c9b
Bump apollo-server from 2.6.6 to 2.6.8 in /backend 
Bumps [apollo-server](https://github.com/apollographql/apollo-server) from 2.6.6 to 2.6.8.
- [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.6...apollo-server@2.6.8)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-10 06:44:08 +00:00
Robert Schäfer
a2021d857e
Merge pull request #1011 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-testing-2.6.8 
Bump apollo-server-testing from 2.6.7 to 2.6.8 in /backend
 2019-07-10 08:41:53 +02:00
Robert Schäfer
6c7ce73c5d
Merge pull request #1015 from Human-Connection/dependabot/npm_and_yarn/backend/lodash-4.17.13 
Bump lodash from 4.17.11 to 4.17.13 in /backend
 2019-07-10 08:40:39 +02:00
Alexander Friedland
6703b54b0e
Merge pull request #999 from Human-Connection/381-footer 
footer created imprint and all language ok
 2019-07-10 06:40:36 +02:00
dependabot-preview[bot]
e0d8e4a008
Bump lodash from 4.17.11 to 4.17.13 in /backend 
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.11 to 4.17.13.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.11...4.17.13)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-10 04:26:43 +00:00
dependabot-preview[bot]
a6de369277
Bump @babel/core from 7.5.0 to 7.5.4 in /backend 
Bumps [@babel/core](https://github.com/babel/babel) from 7.5.0 to 7.5.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.5.0...v7.5.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-10 04:25:20 +00:00
dependabot-preview[bot]
a0d9c6dbaa
Bump apollo-server-testing from 2.6.7 to 2.6.8 in /backend 
Bumps [apollo-server-testing](https://github.com/apollographql/apollo-server) from 2.6.7 to 2.6.8.
- [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.7...apollo-server-testing@2.6.8)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-10 04:24:40 +00:00
dependabot-preview[bot]
db4122da09
Bump @babel/core from 7.5.0 to 7.5.4 in /webapp 
Bumps [@babel/core](https://github.com/babel/babel) from 7.5.0 to 7.5.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.5.0...v7.5.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-10 04:24:01 +00:00
dependabot-preview[bot]
133012145c
Bump cypress from 3.3.2 to 3.4.0 
Bumps [cypress](https://github.com/cypress-io/cypress) from 3.3.2 to 3.4.0.
- [Release notes](https://github.com/cypress-io/cypress/releases)
- [Commits](https://github.com/cypress-io/cypress/compare/v3.3.2...v3.4.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-10 04:23:04 +00:00
Robert Schäfer
d90bb90d0c Follow up of #958 
I think I deleted the styling by using bot `:width` and `style`
property. I'm not quite sure if this resolves our problem. Anyways
I don't see a reason for having a right padding so I just removed it.
 2019-07-10 02:11:12 +02:00
Robert Schäfer
54947b113d
Merge pull request #958 from Human-Connection/984-minimum-size-of-body 
🐛 [Bug]  full ads width use with small devices
 2019-07-10 02:00:29 +02:00
Robert Schäfer
65679d417d Move page components into single file 
+ Spice it up a little by translating the page component's title.
 2019-07-10 01:25:34 +02:00
Robert Schäfer
310cc52ddf Don't remove the previous styling 2019-07-10 01:23:36 +02:00
Robert Schäfer
ce397b6746 Fix English locale 2019-07-10 00:03:26 +02:00
Robert Schäfer
17743043ca Always prefer <nuxt-link> over <a> 
@ogerly, if we link into another page of our application, we should
always use `nuxt-link`. It is a feature of NuxtJs and it does
prefetching, among other things. So it improves the performance of
our site!
 2019-07-09 23:35:34 +02:00
Matt Rider
1399da8b70 Add router callback, clear searches on logo click 2019-07-09 18:35:27 -03:00
Matt Rider
0d4617399b Fix/add tests 2019-07-09 18:29:31 -03:00
Robert Schäfer
4b308886ff
Merge pull request #976 from Human-Connection/961-thumbnail-for-the-contributions-must-get-a-maximum-height 
large images are set to maximum height
 2019-07-09 23:21:27 +02:00
Robert Schäfer
4b09284011 Merge remote-tracking branch 'origin_https/master' into 984-minimum-size-of-body 2019-07-09 22:52:58 +02:00
Robert Schäfer
4207aee09d DRY up password validations 2019-07-09 22:12:40 +02:00
Robert Schäfer
47a9d38790 Consistency for email success messages 2019-07-09 22:12:40 +02:00
Robert Schäfer
90aa1822b5 Disable the form button with a slot scope 2019-07-09 22:12:40 +02:00
Robert Schäfer
813a6b5c50 Subpages of registration/ must be unauthenticated 2019-07-09 22:12:40 +02:00
Robert Schäfer
29bbeaa0fa Fix tests by calling wrapper.html() once more 
I really don't understand why, but apparently `wrapper.html()` does some
re-rendering which in our cases fixes the tests, because we reach the
new sub component in the DOM tree.
 2019-07-09 22:12:40 +02:00
Robert Schäfer
d76923c471 Copy all relevant files changed from branch signup 2019-07-09 22:12:40 +02:00
Alexander Friedland
a4a875c2e1
Merge pull request #993 from Human-Connection/user_role_not_nullable 
User role not nullable
 2019-07-09 20:50:03 +02:00
Matt Rider
fdde050f17 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 967-filter-post-by-category 2019-07-09 13:29:23 -03:00
Matt Rider
c7959dadb7 Refactor code 
- Remove vuex as we don't need with vue-apollo and watch
- Use chunk[i] instead of firstGroup, etc...
- Extract Category query to its own file
- Mobile responsive categories dropdown
 2019-07-09 13:00:08 -03:00
Wolfgang Huß
458229eb77
Merge pull request #848 from Human-Connection/779-tags-of-contribution-in-text 
Tags in the Text of a Contribution like Mentions
 2019-07-09 16:47:17 +02:00
Matt Rider
e541d88e72 Add force true to userprofile upload 
- It was being covered by another element:
<div class="v-popover avatar-menu">...</div>
 2019-07-09 10:52:39 -03:00
Robert Schäfer
a5f655058e
Merge pull request #989 from Human-Connection/fix_env_var_name 
Neo4j uses a different name for its env vars
 2019-07-09 15:21:22 +02:00
Robert Schäfer
5342f0d435
Merge pull request #995 from alina-beck/update-docs 
Update docs
 2019-07-09 15:19:52 +02:00
Robert Schäfer
c811461157
Merge pull request #998 from Human-Connection/dependabot/npm_and_yarn/backend/graphql-shield-6.0.3 
Bump graphql-shield from 6.0.2 to 6.0.3 in /backend
 2019-07-09 15:17:01 +02:00
Robert Schäfer
34f923ad97 Merge remote-tracking branch 'origin/master' into 779-tags-of-contribution-in-text 2019-07-09 14:40:59 +02:00
Robert Schäfer
6f24f066d6 Revert "Get rid of obsolete /search/hashtag page" 
This reverts commit ec19c732e5678544d8dfd50c25f2c33e5aeb217e.

Ok, native module URL cannot parse relative URLs. It ensures that all parts
of the URL are present. So I'll revert this to get the ball rolling. We
can refactor out the obsolete page later on.

FYI @Tirokk
 2019-07-09 14:39:28 +02:00