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

893 Commits

Author SHA1 Message Date
Matt Rider
2dca04523d Remove key request in badge queries 
- clean up from `PR` which uses id, not key
 2019-07-15 15:04:19 -03:00
Matt Rider
a91ddd22b7 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 967-filter-post-by-category 2019-07-15 14:47:36 -03:00
Robert Schäfer
417500eb3e
Merge pull request #1043 from Human-Connection/silence_codecov 
Silence codecov
 2019-07-15 17:38:42 +02:00
Robert Schäfer
9199458cbb
Merge pull request #1047 from Human-Connection/dependabot/npm_and_yarn/webapp/linkify-it-2.2.0 
Bump linkify-it from 2.1.0 to 2.2.0 in /webapp
 2019-07-15 17:36:50 +02:00
Matt Rider
cf6ace59aa Merge branch 'master' of github.com:Human-Connection/Human-Connection into 967-filter-post-by-category 2019-07-15 11:34:42 -03:00
Matt Rider
bb4532827a Refactor search input, navbar 
- fix search input width on desktop
- removed adding removing classes on focus/blur search input
- fix notifications dropdown on mobile

Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
 2019-07-15 11:20:28 -03:00
Matt Rider
b0f999ac05 Fix styling of navbar 
- Follow @Tirokk suggestions

Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
 2019-07-15 11:06:56 -03:00
Matt Rider
d42083a32e Move header to left, add border left 
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
 2019-07-15 09:55:09 -03:00
Robert Schäfer
fa024ac47a Sledgehammer the file permission problem on docker 
NuxtJS wants to write into .nuxt. If the docker container writes into
.nuxt it will have the file permissions of the docker container user
even on the host system. So on the host system you cannot remove the
folder .nuxt anymore. This gets in the way of running NuxtJS on the host
system.
 2019-07-15 13:14:40 +02:00
dependabot-preview[bot]
5360038ac0
Bump linkify-it from 2.1.0 to 2.2.0 in /webapp 
Bumps [linkify-it](https://github.com/markdown-it/linkify-it) from 2.1.0 to 2.2.0.
- [Release notes](https://github.com/markdown-it/linkify-it/releases)
- [Changelog](https://github.com/markdown-it/linkify-it/blob/master/CHANGELOG.md)
- [Commits](https://github.com/markdown-it/linkify-it/compare/2.1.0...2.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-15 04:26:52 +00:00
Robert Schäfer
5bde0ab036 No global codecov install, less verbose CI output 2019-07-14 01:45:38 +02:00
Robert Schäfer
1ec26ccdb5
Merge pull request #968 from Human-Connection/878-Update-of-polish-locales 
polish language on current status
 2019-07-14 00:00:14 +02:00
mattwr18
4c91d8fbc5
Merge pull request #1016 from Human-Connection/277_reward_badges 
Refactor reward/unreward Badges in backend
 2019-07-13 10:08:52 -03:00
Robert Schäfer
99740e6ad6 Follow @Tirokk's suggestion and rename key=>id 2019-07-13 14:27:19 +02:00
Matt Rider
cc61dac818 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 967-filter-post-by-category 2019-07-12 10:50:14 -03:00
Matt Rider
c7094d82b8 Fix styling, follow @Tirokk suggestions 2019-07-12 10:37:27 -03:00
dependabot-preview[bot]
c648d62288
[Security] Bump lodash from 4.17.11 to 4.17.14 in /webapp 
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.11 to 4.17.14. **This update includes security fixes.**
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.11...4.17.14)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-11 10:32:28 +00:00
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
dependabot-preview[bot]
6fd166deca
[Security] Bump lodash.template from 4.4.0 to 4.5.0 in /webapp 
Bumps [lodash.template](https://github.com/lodash/lodash) from 4.4.0 to 4.5.0. **This update includes security fixes.**
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.4.0...4.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-11 01:42:34 +00:00
Matt Rider
b6dcafcc2b Fix linting 2019-07-10 18:52:23 -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
Robert Schäfer
9a72e7b9e6 Proper null handling 
FYI @mattwr18
 2019-07-10 18:01:18 +02:00
Alexander Friedland
4fd47bc258
Merge branch 'master' into 878-Update-of-polish-locales 2019-07-10 15:54:59 +02:00
Robert Schäfer
95a06a8344 Refactor all badges resolvers to use neode 
FYI: @Tirokk I think we'll never remove or add new badges through
graphql. Instead, we will seed them manually with direct access to the
database. Therefore I removed the respective mutations and also your
tests regarding permissions.
 2019-07-10 14:36:42 +02: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
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
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
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
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]
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
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
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