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

6566 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wolfgang Huß
a949fce606 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1710-list-and-protocol-moderation 2019-10-25 13:19:19 +02:00
mattwr18
6ea0aa64a5
Merge pull request #2035 from Human-Connection/dependabot/npm_and_yarn/backend/graphql-shield-7.0.0 
build(deps): bump graphql-shield from 6.1.0 to 7.0.0 in /backend
 2019-10-25 10:13:35 +02:00
mattwr18
960cdfe57f
Merge pull request #2034 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-lang-5.7.14 
build(deps): bump metascraper-lang from 5.7.6 to 5.7.14 in /backend
 2019-10-25 10:04:42 +02:00
mattwr18
297875304a
Merge pull request #2030 from Human-Connection/ogerly-patch-2 
change Changes & History to Changes
 2019-10-25 10:04:10 +02:00
mattwr18
55789547db
Merge pull request #2029 from Human-Connection/ogerly-patch-1 
chnage Änderungen & Verlauf zu Änderungen
 2019-10-25 10:03:52 +02:00
mattwr18
88253308d5
Merge pull request #1990 from Human-Connection/dependabot/npm_and_yarn/webapp/nuxtjs/apollo-4.0.0-rc16 
build(deps): bump @nuxtjs/apollo from 4.0.0-rc15 to 4.0.0-rc16 in /webapp
 2019-10-25 09:57:21 +02:00
dependabot-preview[bot]
8562587baa
build(deps): bump graphql-shield from 6.1.0 to 7.0.0 in /backend 
Bumps [graphql-shield](https://github.com/maticzav/graphql-shield) from 6.1.0 to 7.0.0.
- [Release notes](https://github.com/maticzav/graphql-shield/releases)
- [Commits](https://github.com/maticzav/graphql-shield/compare/v6.1.0...v7.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-25 04:24:22 +00:00
dependabot-preview[bot]
52cb91f0f7
build(deps): bump metascraper-lang from 5.7.6 to 5.7.14 in /backend 
Bumps [metascraper-lang](https://github.com/microlinkhq/metascraper) from 5.7.6 to 5.7.14.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.7.6...v5.7.14)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-25 04:23:36 +00:00
Alexander Friedland
fb765ac1d8
change 
Changes & History  to  Changes
 2019-10-24 15:51:07 +02:00
Alexander Friedland
060f8cc747
chnage 
Änderungen & Verlauf zu Änderungen
 2019-10-24 15:48:11 +02:00
mattwr18
ad282b8afe
Merge pull request #2028 from Human-Connection/2026_Add_FAQ 
add FAQ _blank-href in Footer
 2019-10-24 15:15:35 +02:00
ogerly
9308646a56 add FAQ, lint ok 2019-10-24 14:27:53 +02:00
mattwr18
6dfe0ce7af
Merge pull request #2025 from Human-Connection/fix_maintenance_dockerfile 
fix: Don't attempt to save locale if not authenticated
 2019-10-24 14:22:08 +02:00
Robert Schäfer
d3b3d9231e
Merge pull request #2027 from Human-Connection/new-terms-conditions-version-0.0.3 
🍰 New terms and conditions version 0.0.3
 2019-10-24 13:52:29 +02:00
mattwr18
5c12914e02 Add test cases for LocaleSwitch 
- if there is a currentUser then update their locale in the database,
otherwise, do not.
 2019-10-24 13:52:21 +02:00
Wolfgang Huß
d2fd33b102 Fix tests 2019-10-24 12:54:51 +02:00
mattwr18
821ea6d671 Update LocaleSwitch with guard clause 
- return if there is no currentUser
- do not copy graphql directory as there is no need to send messages to
backend
 2019-10-24 12:45:55 +02:00
Wolfgang Huß
114c7531bb Change terms and condition version to 0.0.3 2019-10-24 11:32:45 +02:00
mattwr18
945033a687
Merge pull request #2023 from Human-Connection/2022-fix-pinned-post-appearing-twice-bug 
Remove duplicate pinned post record
 2019-10-24 11:24:15 +02:00
roschaefer
9d522353cc fix: import missing files in maintenance image 
@ogerly the maintenance page needs just two components of the webapp
folder. For that reason we import only these. If you add imports to
`LocaleSwitch` component, you need to copy those files in the
Dockerfile.
 2019-10-24 11:14:22 +02:00
mattwr18
8f3c2610e0
Merge pull request #2018 from Human-Connection/dependabot/npm_and_yarn/cypress-3.5.0 
build(deps-dev): bump cypress from 3.4.1 to 3.5.0
 2019-10-24 11:11:06 +02:00
mattwr18
b81a6a5b72
Merge pull request #2024 from Human-Connection/add_online_backups_to_gitbook 
docs: add missing SUMMARY entry for online backups
 2019-10-24 11:08:43 +02:00
dependabot-preview[bot]
26c21b5b76
build(deps): bump @nuxtjs/apollo in /webapp 
Bumps [@nuxtjs/apollo](https://github.com/nuxt-community/apollo-module) from 4.0.0-rc15 to 4.0.0-rc16.
- [Release notes](https://github.com/nuxt-community/apollo-module/releases)
- [Commits](https://github.com/nuxt-community/apollo-module/compare/v4.0.0-rc.15...v4.0.0-rc.16)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-24 08:51:42 +00:00
mattwr18
69c0247ae5
Merge pull request #2021 from Human-Connection/dependabot/npm_and_yarn/webapp/nuxtjs/axios-5.8.0 
build(deps): bump @nuxtjs/axios from 5.6.0 to 5.8.0 in /webapp
 2019-10-24 10:48:56 +02:00
Wolfgang Huß
78d16fb441 Change appearance of moderators reports list again 2019-10-24 10:17:31 +02:00
roschaefer
62fdb4f8ed docs: add missing SUMMARY entry for online backups 2019-10-24 10:13:00 +02:00
mattwr18
a38731fcae
Merge pull request #1991 from Human-Connection/Locale_save_by_change_LocalSwitch 
Locale save by change local switch
 2019-10-24 10:02:46 +02:00
mattwr18
a923cb2e62 Remove duplicate pinned post record 
- Maintain consistent orderBy for fetchMore
 2019-10-24 09:58:22 +02:00
Alexander Friedland
b584f12bb1
change 
change()  change to updateUserLocale()
 2019-10-24 08:52:24 +02:00
mattwr18
c40d6a80a6
Merge pull request #1983 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/addon-actions-5.2.5 
build(deps-dev): bump @storybook/addon-actions from 5.2.4 to 5.2.5 in /webapp
 2019-10-24 08:52:00 +02:00
mattwr18
cf5405cf62
Merge pull request #2016 from Human-Connection/1995-shouts-hidden-to-other-users 
Hide shout count on user profile unless my profile
 2019-10-24 08:41:32 +02:00
Alexander Friedland
80736f422b
Merge pull request #2017 from Human-Connection/New_AGB_TermsAndConditions 
new terms and conditions
 2019-10-24 07:44:55 +02:00
dependabot-preview[bot]
62d1b1b13f
build(deps): bump @nuxtjs/axios from 5.6.0 to 5.8.0 in /webapp 
Bumps [@nuxtjs/axios](https://github.com/nuxt-community/axios-module) from 5.6.0 to 5.8.0.
- [Release notes](https://github.com/nuxt-community/axios-module/releases)
- [Changelog](https://github.com/nuxt-community/axios-module/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/nuxt-community/axios-module/compare/v5.6.0...v5.8.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-24 04:20:15 +00:00
dependabot-preview[bot]
4972ddbe71
build(deps-dev): bump cypress from 3.4.1 to 3.5.0 
Bumps [cypress](https://github.com/cypress-io/cypress) from 3.4.1 to 3.5.0.
- [Release notes](https://github.com/cypress-io/cypress/releases)
- [Commits](https://github.com/cypress-io/cypress/compare/v3.4.1...v3.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-24 04:18:00 +00:00
dependabot-preview[bot]
7e95d376a3
build(deps-dev): bump @storybook/addon-actions in /webapp 
Bumps [@storybook/addon-actions](https://github.com/storybookjs/storybook/tree/HEAD/addons/actions) from 5.2.4 to 5.2.5.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v5.2.5/addons/actions)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-23 21:04:29 +00:00
mattwr18
d5c4eba607
Merge pull request #1989 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/addon-a11y-5.2.5 
build(deps-dev): bump @storybook/addon-a11y from 5.2.4 to 5.2.5 in /webapp
 2019-10-23 23:01:33 +02:00
dependabot-preview[bot]
ca47471aff
build(deps-dev): bump @storybook/addon-a11y in /webapp 
Bumps [@storybook/addon-a11y](https://github.com/storybookjs/storybook/tree/HEAD/addons/a11y) from 5.2.4 to 5.2.5.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v5.2.5/addons/a11y)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-23 20:22:47 +00:00
mattwr18
acc7ce9564
Merge pull request #2002 from Human-Connection/dependabot/npm_and_yarn/webapp/vue/cli-shared-utils-4.0.5 
build(deps-dev): bump @vue/cli-shared-utils from 4.0.4 to 4.0.5 in /webapp
 2019-10-23 22:20:10 +02:00
ogerly
ff8680ff86 new terms and conditions fixed 2019-10-23 18:58:03 +02:00
Wolfgang Huß
15d28aa8ef Finish redesign of moderators report list 
- It is not perfect, but will do it for now.
 2019-10-23 15:59:34 +02:00
mattwr18
8f365a60ce Hide shout count on user profile unless my profile 
- we were asked to hide the shouts from other users by Dennis Hack, he
believes people will be more likely to shout a post if it is anonymous.
This only works from our UI to our backend... further steps would need
to be taken to truly make it anonymous. Also, we were asked to implement
it in such a way as to give the user the choice to show their shouts to
others.

Co-authored-by: Alina Beck <alina.beck@mail.com>
 2019-10-23 14:07:41 +02:00
mattwr18
6142333423
Merge pull request #2015 from Human-Connection/update-to-version-0.1.7 
Update to version 0.1.7
 2019-10-23 13:15:03 +02:00
Wolfgang Huß
460d02657a Try ds-table in ds-table, but is not really working 2019-10-23 12:50:28 +02:00
mattwr18
94f7a9a09e Update to version 0.1.7 2019-10-23 12:23:51 +02:00
Wolfgang Huß
11341b82e6 Structure reports in moderators list by content, just a beginning 2019-10-23 12:11:51 +02:00
mattwr18
20121d268d
Merge pull request #2012 from Human-Connection/2011-fix-bug-load-more-profile-page 
Update fetchMore functionality on profile page
 2019-10-23 11:23:01 +02:00
mattwr18
44e54372c4 Fix block user workflow 
- need to update all the smart queries naming
 2019-10-23 10:51:41 +02:00
mattwr18
fda6f683d4 Update fetchMore functionality on profile page 
- clean up from pinned Posts PR
 2019-10-23 09:41:31 +02:00
mattwr18
015e9b9009
Merge pull request #2001 from Human-Connection/dependabot/npm_and_yarn/date-fns-2.6.0 
build(deps-dev): bump date-fns from 2.5.1 to 2.6.0
 2019-10-23 09:28:38 +02:00
mattwr18
1144baacae
Merge pull request #2000 from Human-Connection/dependabot/npm_and_yarn/backend/faker-9fd8d7d 
build(deps): bump faker from `10bfb9f` to `9fd8d7d` in /backend
 2019-10-23 09:28:03 +02:00