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

2686 Commits

Author SHA1 Message Date
roschaefer
966cdc9574 fix #2229 
I have to agree with @vbelolapotkov here. First of all the translation
for German an English does not match and second it does not make an awful
lot of sense to have "Report these actions" twice in the list. The
English translation "Advocacy or encouragement to these behaviors."
probably belongs into the section before.
 2020-01-12 17:35:31 +01:00
roschaefer
3781ba5d2e Fix LoginForm test and lints 2020-01-11 01:48:19 +01:00
roschaefer
6a0bdc02aa Update vue-template-compiler in package.json 
This will make https://github.com/Human-Connection/Human-Connection/pull/2526
obsolete.
 2020-01-10 19:57:29 +01:00
roschaefer
6087f8a63a Run yarn upgrade vue-template-compiler 
@mattwr18 apparently `nuxt` and `vue-template-compiler` need to be
updated simultaneously.
 2020-01-10 19:54:02 +01:00
dependabot-preview[bot]
3d6ab8384b build(deps): bump nuxt from 2.10.2 to 2.11.0 in /webapp 
Bumps [nuxt](https://github.com/nuxt/nuxt.js) from 2.10.2 to 2.11.0.
- [Release notes](https://github.com/nuxt/nuxt.js/releases)
- [Changelog](https://github.com/nuxt/nuxt.js/blob/dev/RELEASE_PLAN.md)
- [Commits](https://github.com/nuxt/nuxt.js/compare/v2.10.2...v2.11.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-10 19:52:34 +01:00
mattwr18
2e3fad7d27
Merge pull request #2657 from Human-Connection/dependabot/npm_and_yarn/webapp/nuxtjs/axios-5.9.2 
build(deps): bump @nuxtjs/axios from 5.8.0 to 5.9.2 in /webapp
 2020-01-10 19:08:54 +01:00
mattwr18
1f06a862e7
Merge pull request #2262 from Human-Connection/1463-search-for-users 
🍰 Search For Users
 2020-01-10 13:59:44 +01:00
mattwr18
84780013f4 Fix cypress tests/start refactor search story 
- Cannot use data-test in cypress tests as we use production image and
data-test are removed to minimize the image. Select based on styleguide
input's class

- Story is still not working because of filter dateTime and
$i18n.locale(), we can fix this later.

- Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
 2020-01-10 12:52:54 +01:00
mattwr18
b2db5e6057 Skip tests for DonationsInfo 
- the functionality it's testing has been suspended. If we add back that
functionality, we should refactor the tests/stop skipping.
- Or maybe we can remove them in a separate PR??
 2020-01-10 10:35:12 +01:00
Moriz Wahl
8c7079cf81 changes requested by reviews 2020-01-10 09:23:56 +01:00
mattwr18
dae1062ad0 Use node LTS in production 2020-01-09 13:33:05 +01:00
mattwr18
36dadfb4c1
Merge pull request #2711 from Human-Connection/dependabot/npm_and_yarn/webapp/date-fns-2.9.0 
build(deps): bump date-fns from 2.8.1 to 2.9.0 in /webapp
 2020-01-09 13:22:56 +01:00
dependabot-preview[bot]
61e6868c18
build(deps): bump date-fns from 2.8.1 to 2.9.0 in /webapp 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.8.1 to 2.9.0.
- [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.8.1...v2.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-09 09:09:42 +00:00
dependabot-preview[bot]
1a15dd4db5
build(deps): bump node from 13.5.0-alpine to 13.6.0-alpine in /webapp 
Bumps node from 13.5.0-alpine to 13.6.0-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-09 04:19:10 +00:00
Alexander Friedland
25ac9b6cef
Merge pull request #2678 from Human-Connection/2659-text-change-for-signup 
Changes Text For SignUp
 2020-01-07 21:47:20 +01:00
Alexander Friedland
9c3f0f3d29
Merge pull request #2655 from Human-Connection/erhardtstiefel-patch-10-1 
Update de.json
 2020-01-07 21:45:26 +01:00
Moriz Wahl
3f37b007d7 improved specs 2020-01-07 15:35:04 +01:00
Moriz Wahl
57ab9128ea removed Hashtag search 2020-01-07 09:16:34 +01:00
Moriz Wahl
d4b3afb07f fixes #2659 2020-01-06 17:23:50 +01:00
Moriz Wahl
d2088a3a92 Missing SearchTag.vue added 2020-01-06 16:59:55 +01:00
Moriz Wahl
71c9d92aea query string for searches changed and basics for Hashtag search added 2020-01-06 16:46:43 +01:00
Moriz Wahl
bc3aa519d0 Specs for Searches 2020-01-06 16:10:28 +01:00
mattwr18
965b9a8c41
Merge pull request #2671 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-jest-23.3.0 
build(deps-dev): bump eslint-plugin-jest from 23.2.0 to 23.3.0 in /webapp
 2020-01-06 12:33:16 +01:00
dependabot-preview[bot]
3e925b5931
build(deps-dev): bump eslint-plugin-jest in /webapp 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 23.2.0 to 23.3.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/v23.2.0...v23.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-06 10:23:32 +00:00
dependabot-preview[bot]
b8b8d950fb
build(deps-dev): bump css-loader from 3.4.0 to 3.4.1 in /webapp 
Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 3.4.0 to 3.4.1.
- [Release notes](https://github.com/webpack-contrib/css-loader/releases)
- [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/css-loader/compare/v3.4.0...v3.4.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-06 04:21:35 +00:00
Robert Schäfer
e4d5c21ea4
Merge pull request #2632 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-config-prettier-6.9.0 
build(deps-dev): bump eslint-config-prettier from 6.7.0 to 6.9.0 in /webapp
 2020-01-05 15:58:52 +01:00
dependabot-preview[bot]
cb4eca63d4
build(deps-dev): bump eslint-config-prettier in /webapp 
Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) from 6.7.0 to 6.9.0.
- [Release notes](https://github.com/prettier/eslint-config-prettier/releases)
- [Changelog](https://github.com/prettier/eslint-config-prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/eslint-config-prettier/commits/v6.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-03 18:21:42 +00:00
dependabot-preview[bot]
304e843a42
build(deps): bump @nuxtjs/axios from 5.8.0 to 5.9.2 in /webapp 
Bumps [@nuxtjs/axios](https://github.com/nuxt-community/axios-module) from 5.8.0 to 5.9.2.
- [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.8.0...v5.9.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-03 04:21:13 +00:00
Erhardt Stiefel
711675d674
Update de.json 
Is it ok, if I do the same change for the other languages?
 2020-01-01 14:29:48 +01:00
Robert Schäfer
e1b89d34f5
Merge branch 'master' into dependabot/npm_and_yarn/webapp/eslint-plugin-jest-23.2.0 2019-12-31 15:50:49 +01:00
Robert Schäfer
98dfa0f711
Merge pull request #2643 from Human-Connection/dependabot/npm_and_yarn/webapp/vue/cli-shared-utils-4.1.2 
build(deps-dev): bump @vue/cli-shared-utils from 4.1.1 to 4.1.2 in /webapp
 2019-12-31 15:50:06 +01:00
Robert Schäfer
0ef8d4d72c
Merge pull request #2644 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-vue-6.1.2 
build(deps-dev): bump eslint-plugin-vue from 6.1.1 to 6.1.2 in /webapp
 2019-12-31 15:49:53 +01:00
dependabot-preview[bot]
5c07b9dbb2
build(deps-dev): bump eslint-plugin-node in /webapp 
Bumps [eslint-plugin-node](https://github.com/mysticatea/eslint-plugin-node) from 10.0.0 to 11.0.0.
- [Release notes](https://github.com/mysticatea/eslint-plugin-node/releases)
- [Commits](https://github.com/mysticatea/eslint-plugin-node/compare/v10.0.0...v11.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-31 04:23:14 +00:00
dependabot-preview[bot]
98cbed6b1d
build(deps-dev): bump eslint-plugin-vue from 6.1.1 to 6.1.2 in /webapp 
Bumps [eslint-plugin-vue](https://github.com/vuejs/eslint-plugin-vue) from 6.1.1 to 6.1.2.
- [Release notes](https://github.com/vuejs/eslint-plugin-vue/releases)
- [Commits](https://github.com/vuejs/eslint-plugin-vue/compare/v6.1.1...v6.1.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-31 04:22:39 +00:00
dependabot-preview[bot]
777d70ec7c
build(deps-dev): bump @vue/cli-shared-utils in /webapp 
Bumps [@vue/cli-shared-utils](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-shared-utils) from 4.1.1 to 4.1.2.
- [Release notes](https://github.com/vuejs/vue-cli/releases)
- [Changelog](https://github.com/vuejs/vue-cli/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-cli/commits/v4.1.2/packages/@vue/cli-shared-utils)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-31 04:21:43 +00:00
dependabot-preview[bot]
93cbd96cff
build(deps-dev): bump eslint-plugin-jest in /webapp 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 23.1.1 to 23.2.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/v23.1.1...v23.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-31 04:21:10 +00:00
Robert Schäfer
a5511cf00d
Merge pull request #2579 from Human-Connection/dependabot/npm_and_yarn/webapp/babel/preset-env-7.7.7 
build(deps-dev): bump @babel/preset-env from 7.7.6 to 7.7.7 in /webapp
 2019-12-30 19:18:50 +01:00
Robert Schäfer
dfedf6e97b
Merge pull request #2617 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-6.8.0 
build(deps-dev): bump eslint from 6.7.2 to 6.8.0 in /webapp
 2019-12-30 19:16:01 +01:00
Robert Schäfer
180f2746d4
Merge pull request #2627 from Human-Connection/2239-show-language-on-post-page 
🍰 Added Language Tag For Posts
 2019-12-30 15:38:58 +01:00
dependabot-preview[bot]
9fddaba8cc
build(deps-dev): bump eslint from 6.7.2 to 6.8.0 in /webapp 
Bumps [eslint](https://github.com/eslint/eslint) from 6.7.2 to 6.8.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v6.7.2...v6.8.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-30 13:04:58 +00:00
Robert Schäfer
74a0447d45
Merge pull request #2619 from Human-Connection/2603-following-count-shows-0 
Fixes 2603
 2019-12-30 13:31:08 +01:00
dependabot-preview[bot]
f5ada74bca
build(deps-dev): bump @babel/preset-env from 7.7.6 to 7.7.7 in /webapp 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.7.6 to 7.7.7.
- [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.7.6...v7.7.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-30 12:27:56 +00:00
Robert Schäfer
7882b28c96
Merge pull request #2581 from Human-Connection/dependabot/npm_and_yarn/webapp/babel/core-7.7.7 
build(deps-dev): bump @babel/core from 7.7.5 to 7.7.7 in /webapp
 2019-12-30 13:25:28 +01:00
Robert Schäfer
2d5084df15
Merge pull request #2624 from Human-Connection/dependabot/npm_and_yarn/webapp/handlebars-4.5.3 
build(deps): [security] bump handlebars from 4.1.2 to 4.5.3 in /webapp
 2019-12-30 13:22:27 +01:00
dependabot-preview[bot]
12b1eaad99
build(deps-dev): bump eslint-plugin-vue from 6.0.1 to 6.1.1 in /webapp 
Bumps [eslint-plugin-vue](https://github.com/vuejs/eslint-plugin-vue) from 6.0.1 to 6.1.1.
- [Release notes](https://github.com/vuejs/eslint-plugin-vue/releases)
- [Commits](https://github.com/vuejs/eslint-plugin-vue/compare/v6.0.1...v6.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-30 04:23:45 +00:00
Mo Zargham
e0b6f82878 removed typo! 2019-12-29 14:09:20 -05:00
Mo Zargham
4b9040a8a7 fixed format 2019-12-29 14:06:53 -05:00
Mo Zargham
3db3cb1171 removed ternary added v-if 2019-12-27 15:17:13 -05:00
Mo Zargham
3234c2e861 added language tag for posts 2019-12-27 15:02:51 -05:00
dependabot-preview[bot]
8a051610de
build(deps): [security] bump handlebars from 4.1.2 to 4.5.3 in /webapp 
Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.1.2 to 4.5.3. **This update includes a security fix.**
- [Release notes](https://github.com/wycats/handlebars.js/releases)
- [Changelog](https://github.com/wycats/handlebars.js/blob/master/release-notes.md)
- [Commits](https://github.com/wycats/handlebars.js/compare/v4.1.2...v4.5.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-26 18:37:54 +00:00