ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-12 23:35:58 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,450 Commits 113 Branches 1,511 Tags
Commit Graph

947 Commits

Author SHA1 Message Date
dependabot-preview[bot]
f344abaf9a
Bump date-fns from 2.0.0-beta.2 to 2.0.0-beta.3 in /webapp 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.0.0-beta.2 to 2.0.0-beta.3.
- [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-beta.2...v2.0.0-beta.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-24 04:33:59 +00:00
mattwr18
f65a167531
Merge pull request #1098 from Human-Connection/dependabot/npm_and_yarn/webapp/vue/eslint-config-prettier-5.0.0 
Bump @vue/eslint-config-prettier from 4.0.1 to 5.0.0 in /webapp
 2019-07-23 05:27:57 -03:00
dependabot-preview[bot]
4d7c1367f1
Bump @vue/eslint-config-prettier from 4.0.1 to 5.0.0 in /webapp 
Bumps [@vue/eslint-config-prettier](https://github.com/vuejs/eslint-config-prettier) from 4.0.1 to 5.0.0.
- [Release notes](https://github.com/vuejs/eslint-config-prettier/releases)
- [Changelog](https://github.com/vuejs/eslint-config-prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vuejs/eslint-config-prettier/commits/v5.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-23 04:29:33 +00:00
dependabot-preview[bot]
511edfd4bd
Bump eslint-plugin-jest from 22.11.1 to 22.13.6 in /webapp 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.11.1 to 22.13.6.
- [Release notes](https://github.com/jest-community/eslint-plugin-jest/releases)
- [Changelog](https://github.com/jest-community/eslint-plugin-jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jest-community/eslint-plugin-jest/compare/v22.11.1...v22.13.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-23 04:29:02 +00:00
Wolfgang Huß
00879fc2fa Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 256-editor-embeds-merge-in-nitro-embed 
# Conflicts:
#	backend/package.json
#	backend/yarn.lock
 2019-07-22 10:51:23 +02:00
dependabot-preview[bot]
b9eae65b8b
Bump eslint-plugin-import from 2.18.0 to 2.18.2 in /webapp 
Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import) from 2.18.0 to 2.18.2.
- [Release notes](https://github.com/benmosher/eslint-plugin-import/releases)
- [Changelog](https://github.com/benmosher/eslint-plugin-import/blob/master/CHANGELOG.md)
- [Commits](https://github.com/benmosher/eslint-plugin-import/compare/v2.18.0...v2.18.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-22 04:51:16 +00:00
Robert Schäfer
7a9d9339f8 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 256-editor-embeds-merge-in-nitro-embed 2019-07-20 14:45:41 +02:00
Robert Schäfer
b3712d9e11 Merge remote-tracking branch 'origin/master' into 256-editor-embeds-merge-in-nitro-embed 2019-07-19 20:18:10 +02:00
dependabot-preview[bot]
b29a15db7f
Bump @babel/preset-env from 7.5.4 to 7.5.5 in /webapp 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.5.4 to 7.5.5.
- [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.4...v7.5.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-19 18:14:44 +00:00
Robert Schäfer
a56dded667
Merge pull request #1080 from Human-Connection/1003-Page-for-Imprint 
Created imprint page, added English translations
 2019-07-19 15:25:20 +02:00
Robert Schäfer
949b839a9f
Merge pull request #1076 from Human-Connection/dependabot/npm_and_yarn/webapp/babel/core-7.5.5 
Bump @babel/core from 7.5.4 to 7.5.5 in /webapp
 2019-07-19 15:19:45 +02:00
ogerly
66ea9f7a55 English adapted, lint ok 2019-07-19 06:55:18 +02:00
dependabot-preview[bot]
847c2f90f6
Bump eslint-plugin-jest from 22.9.0 to 22.11.1 in /webapp 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.9.0 to 22.11.1.
- [Release notes](https://github.com/jest-community/eslint-plugin-jest/releases)
- [Changelog](https://github.com/jest-community/eslint-plugin-jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jest-community/eslint-plugin-jest/compare/v22.9.0...v22.11.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-19 04:30:34 +00:00
dependabot-preview[bot]
c183401bb4
Bump @babel/core from 7.5.4 to 7.5.5 in /webapp 
Bumps [@babel/core](https://github.com/babel/babel) from 7.5.4 to 7.5.5.
- [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.4...v7.5.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-18 15:57:36 +00:00
mattwr18
e4d4be448a
Merge pull request #1057 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-jest-22.9.0 
Bump eslint-plugin-jest from 22.8.0 to 22.9.0 in /webapp
 2019-07-17 07:06:43 -03:00
dependabot-preview[bot]
d4a054a5e2
Bump eslint-plugin-jest from 22.8.0 to 22.9.0 in /webapp 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.8.0 to 22.9.0.
- [Release notes](https://github.com/jest-community/eslint-plugin-jest/releases)
- [Changelog](https://github.com/jest-community/eslint-plugin-jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jest-community/eslint-plugin-jest/compare/v22.8.0...v22.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-17 04:26:22 +00:00
Robert Schäfer
b74590821c Merge remote-tracking branch 'origin/master' into 256-editor-embeds-merge-in-nitro-embed 2019-07-16 21:33:46 +02:00
Wolfgang Huß
3b88c47206 Update the contentExcerpt 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-07-16 15:48:38 +02:00
Wolfgang Huß
e4fd7f4cf7 Merge branch '552-update_comment' of https://github.com/Human-Connection/Human-Connection into 552-update_comment 2019-07-16 15:11:41 +02:00
Wolfgang Huß
fae5b11607 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 552-update_comment 2019-07-16 15:09:50 +02:00
Matt Rider
a019c8c311 Revert unintended changes, refactor 
- rename some variables in comments.spec.js while dealing with merge conflicts
- rename EditCommentForm/index.vue with new naming convention
- add comment to explain absense of <no-ssr>
- use a comments content for edit comment form content, not excerpt
 2019-07-16 07:53:57 -03:00
Matt Rider
7de337f96d Merge branch 'master' of github.com:Human-Connection/Human-Connection into 552-update_comment 2019-07-16 07:24:23 -03:00
Robert Schäfer
cc34a74b60
Merge pull request #1050 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-jest-22.8.0 
Bump eslint-plugin-jest from 22.7.2 to 22.8.0 in /webapp
 2019-07-16 12:02:20 +02:00
Wolfgang Huß
9203f7310d Edit Comment content not contentExcerpt 
Comment button now only active, if the comment has changed.
Remove `console.log`.
 2019-07-16 11:48:33 +02:00
Wolfgang Huß
75758ab2e7 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 552-update_comment 2019-07-16 09:29:22 +02:00
Wolfgang Huß
b5bd77b539 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1000_find_users_by_email_address 
# Conflicts:
#	webapp/layouts/default.vue
 2019-07-16 08:44:42 +02:00
dependabot-preview[bot]
033ff572ee
Bump eslint-plugin-jest from 22.7.2 to 22.8.0 in /webapp 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.7.2 to 22.8.0.
- [Release notes](https://github.com/jest-community/eslint-plugin-jest/releases)
- [Changelog](https://github.com/jest-community/eslint-plugin-jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jest-community/eslint-plugin-jest/compare/v22.7.2...v22.8.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-16 04:23:35 +00:00
Robert Schäfer
b97f7e464f
Merge pull request #969 from Human-Connection/967-filter-post-by-category 
Filter posts by category
 2019-07-16 00:50:56 +02:00
Robert Schäfer
3f00140220
Merge pull request #1041 from Human-Connection/822_fix_load_more_button 
Fix #822 by updating the counts of the user
 2019-07-16 00:45:01 +02:00
Matt Rider
c7dc2f6a5c Hide CommentForm when an edit is in progress 
- Follow @Tirokk PR review
 2019-07-15 19:09:33 -03:00
Matt Rider
36c4a22b76 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 552-update_comment 2019-07-15 18:29:26 -03:00
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
2736738c36 Fix @Tirokk's suggestions 
Wow @Tirokk that was a good catch! I thought that the emitting side
knows the `index`, but no, it only emits `removePostFromList` and that's
it. In order to delete the right post, we have to pass in the `index`
ourselves. So, the caller of the function is the page component itself.

I didn't see the error myself, because in Javascript if you parse
`undefined` or `null` as Integer, you get 0 and it does not raise an
error.
 2019-07-15 18:26:23 +02: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
Robert Schäfer
585e798dc0 Fix #822 by updating the counts of the user 
The load more button depends on the total of the posts available.
Removing posts changes the total counts, so we have to manually update
it.
 2019-07-13 23:57: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
Robert Schäfer
5da5b8658e Display creation date in user view 2019-07-13 14:14:21 +02:00
Robert Schäfer
f9969b964c Implement conditional filtering 2019-07-13 14:07:51 +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