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

2199 Commits

Author SHA1 Message Date
Robert Schäfer
18ee5b4ac3
Merge pull request #2110 from Human-Connection/2106_unblock_a_user_in_the_user_settings 
2106-unblock a user in the user settings
 2019-11-15 15:51:52 +01:00
Robert Schäfer
fdb454c47a
Merge pull request #2241 from Human-Connection/fix-1936 
Fix 1936
 2019-11-15 15:50:44 +01:00
Robert Schäfer
fd4fee9aee
Merge pull request #2242 from Human-Connection/fix-1937 
fix(editor): Fix hashtags not working after embeded content
 2019-11-15 15:50:11 +01:00
Robert Schäfer
b6ecfa6ebb
Merge pull request #2185 from Human-Connection/dependabot/npm_and_yarn/webapp/prettier-1.19.1 
build(deps-dev): bump prettier from 1.18.2 to 1.19.1 in /webapp
 2019-11-15 15:49:29 +01:00
roschaefer
56a940285b refactor: translations, tests 2019-11-15 14:29:33 +01:00
Alexander Friedland
767b4c8f15 Update webapp/locales/de.json 
Co-Authored-By: Alina Beck <alina.beck@mail.com>
 2019-11-15 14:29:33 +01:00
Alexander Friedland
dcc9889cee Update webapp/locales/en.json 
Co-Authored-By: Alina Beck <alina.beck@mail.com>
 2019-11-15 14:29:33 +01:00
Alexander Friedland
9bd1c59463 change unblk to unblock 2019-11-15 14:29:33 +01:00
Alexander Friedland
4b2da76709 change unblk TO unblock 
unblk TO unblock
 2019-11-15 14:29:33 +01:00
ogerly
e7056dd100 fix lint 2019-11-15 14:29:33 +01:00
ogerly
958b88ceda 2106-unblock a user in the user settings 2019-11-15 14:29:33 +01:00
roschaefer
db25403429 Fix lint 2019-11-15 11:20:50 +01:00
dependabot-preview[bot]
c31238087d
build(deps-dev): bump eslint-plugin-jest in /webapp 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 23.0.2 to 23.0.4.
- [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.0.2...v23.0.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-15 04:21:57 +00:00
roschaefer
9b9b72d528 Fix lint 2019-11-15 00:22:00 +01:00
Marco Bomfim
218faedbd9 Merge branch 'fix-1937' of https://github.com/MarcoBomfim/Human-Connection into fix-1937 2019-11-14 16:16:28 -03:00
Marco Bomfim
2951c3b526 Merge branch 'fix-1936' of https://github.com/MarcoBomfim/Human-Connection into fix-1936 2019-11-14 16:10:23 -03:00
dependabot-preview[bot]
8ec91f46e7
build(deps-dev): bump prettier from 1.18.2 to 1.19.1 in /webapp 
Bumps [prettier](https://github.com/prettier/prettier) from 1.18.2 to 1.19.1.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/prettier/compare/1.18.2...1.19.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-14 09:55:41 +00:00
mattwr18
56f0c1a8e8
Merge pull request #2235 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-vue-6.0.1 
build(deps-dev): bump eslint-plugin-vue from 6.0.0 to 6.0.1 in /webapp
 2019-11-14 10:53:14 +01:00
mattwr18
5305577b69
Merge pull request #2205 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-6.6.0 
build(deps-dev): bump eslint from 5.16.0 to 6.6.0 in /webapp
 2019-11-14 10:26:05 +01:00
dependabot-preview[bot]
45d60b233d
build(deps-dev): bump eslint-plugin-vue from 6.0.0 to 6.0.1 in /webapp 
Bumps [eslint-plugin-vue](https://github.com/vuejs/eslint-plugin-vue) from 6.0.0 to 6.0.1.
- [Release notes](https://github.com/vuejs/eslint-plugin-vue/releases)
- [Commits](https://github.com/vuejs/eslint-plugin-vue/compare/v6.0.0...v6.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-14 04:21:13 +00:00
mattwr18
e971aef3e8 Merge branch 'donation-info' of github.com:Human-Connection/Human-Connection into donation-info 2019-11-12 21:05:09 +01:00
mattwr18
7ce3e25110 Merge branch 'master' of github.com:Human-Connection/Human-Connection into donation-info 2019-11-12 21:04:54 +01:00
Alina Beck
1b16dab554 make font size smaller on tiny screens 2019-11-12 19:26:23 +03:00
Alina Beck
63d223e368
Apply suggestions from code review 
Co-Authored-By: Robert Schäfer <git@roschaefer.de>
 2019-11-12 18:52:38 +03:00
mattwr18
797b8338be
Merge pull request #2197 from Human-Connection/2195-define-missing-getters 
Added Empty Definitions For Missing Getters And Mutations
 2019-11-12 15:54:45 +01:00
mattwr18
8b5cd48d3c Translate success message, guard clause for no Donations 2019-11-12 15:33:21 +01:00
mattwr18
3b5e40efaa Merge branch 'master' of github.com:Human-Connection/Human-Connection into donation-info 2019-11-12 15:18:10 +01:00
dependabot-preview[bot]
2b2aaa04e1
build(deps-dev): bump eslint from 5.16.0 to 6.6.0 in /webapp 
Bumps [eslint](https://github.com/eslint/eslint) from 5.16.0 to 6.6.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/v5.16.0...v6.6.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-12 13:06:14 +00:00
mattwr18
10c932308c
Merge pull request #2204 from Human-Connection/dependabot/npm_and_yarn/webapp/vue-svg-loader-0.15.0 
build(deps-dev): bump vue-svg-loader from 0.14.0 to 0.15.0 in /webapp
 2019-11-12 14:03:49 +01:00
mattwr18
b0dc7ce946
Merge pull request #2203 from Human-Connection/dependabot/npm_and_yarn/webapp/async-validator-3.2.2 
build(deps-dev): bump async-validator from 3.2.1 to 3.2.2 in /webapp
 2019-11-12 14:03:31 +01:00
mattwr18
e19990a58b Fix lint 2019-11-12 13:43:51 +01:00
mattwr18
a215093bc3 Make Donations reactive 
Co-authored-by: @alina-beck <alina.beck@mail.com>
 2019-11-12 13:26:30 +01:00
Alina Beck
982a02fc4f query donations data in donation info component 2019-11-12 14:24:46 +03:00
mattwr18
71bcf814db Fix incorrect destructuring, parseInt 
- graphql schema expects an integer
 2019-11-12 12:08:19 +01:00
Moriz Wahl
d7397f5e46 posts/currentPosts now return empty array 2019-11-12 11:20:56 +01:00
Alexander Friedland
8bb8bb220d
Merge pull request #2193 from Human-Connection/Delete_BlockButton_in_MainPage_PostCard 
Fix: Delete Block Button in MainPage PostCards
 2019-11-12 11:18:42 +01:00
Alina Beck
bdeb208556 pre-fill donation input fields with data from query 2019-11-12 12:45:59 +03:00
mattwr18
cbab34e83c Update test with mock $18n.locale 
Co-authored-by: @alina-beck <alina.beck@mail.com>
 2019-11-12 10:35:02 +01:00
dependabot-preview[bot]
f79aa2c185
build(deps-dev): bump vue-svg-loader from 0.14.0 to 0.15.0 in /webapp 
Bumps [vue-svg-loader](https://github.com/visualfanatic/vue-svg-loader) from 0.14.0 to 0.15.0.
- [Release notes](https://github.com/visualfanatic/vue-svg-loader/releases)
- [Commits](https://github.com/visualfanatic/vue-svg-loader/compare/0.14.0...0.15.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-12 04:22:57 +00:00
dependabot-preview[bot]
05566cf6b8
build(deps-dev): bump async-validator from 3.2.1 to 3.2.2 in /webapp 
Bumps [async-validator](https://github.com/yiminghe/async-validator) from 3.2.1 to 3.2.2.
- [Release notes](https://github.com/yiminghe/async-validator/releases)
- [Changelog](https://github.com/yiminghe/async-validator/blob/master/HISTORY.md)
- [Commits](https://github.com/yiminghe/async-validator/compare/v3.2.1...v3.2.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-12 04:22:19 +00:00
mattwr18
ad01c9925f
Merge pull request #2201 from Human-Connection/2161-fix 
console.error in Hashtag.spec.js #2161
 2019-11-12 00:56:45 +01:00
mattwr18
d360acd7f9
Merge pull request #2186 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/addon-actions-5.2.6 
build(deps-dev): bump @storybook/addon-actions from 5.2.5 to 5.2.6 in /webapp
 2019-11-12 00:40:43 +01:00
Mo Zargham
34fb529147 console.error in Hashtag.spec.js #2161 2019-11-11 18:15:26 -05:00
Moriz Wahl
163825e562 Added Empty Definitions For Missing Getters And Mutations 2019-11-11 21:20:53 +01:00
dependabot-preview[bot]
44defc57eb
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.5 to 5.2.6.
- [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.6/addons/actions)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-11 19:41:16 +00:00
mattwr18
ce5d67235c
Merge pull request #2188 from Human-Connection/dependabot/npm_and_yarn/webapp/style-resources-loader-1.3.2 
build(deps-dev): bump style-resources-loader from 1.2.1 to 1.3.2 in /webapp
 2019-11-11 20:39:20 +01:00
mattwr18
9c21d8978a
Merge pull request #2183 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/vue-5.2.6 
build(deps-dev): bump @storybook/vue from 5.2.5 to 5.2.6 in /webapp
 2019-11-11 20:38:53 +01:00
mattwr18
48ae541330
Merge pull request #2176 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/addon-a11y-5.2.6 
build(deps-dev): bump @storybook/addon-a11y from 5.2.5 to 5.2.6 in /webapp
 2019-11-11 20:38:34 +01:00
mattwr18
d036a57414
Merge pull request #2164 from Human-Connection/dependabot/npm_and_yarn/webapp/date-fns-2.7.0 
build(deps): bump date-fns from 2.6.0 to 2.7.0 in /webapp
 2019-11-11 20:36:30 +01:00
mattwr18
ce3867a717
Merge pull request #2192 from Human-Connection/fix-invalid-json 
Remove unintended comma
 2019-11-11 19:21:37 +01:00