dependabot-preview[bot]
a756892b7f
build(deps-dev): bump @babel/preset-env from 7.7.1 to 7.7.4 in /webapp
...
Bumps [@babel/preset-env](https://github.com/babel/babel ) from 7.7.1 to 7.7.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.7.1...v7.7.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-25 04:19:19 +00:00
Alexander Friedland
dd0f629691
Merge branch 'master' into 2170-Change_of_Terms_of_Service
2019-11-24 21:52:41 +01:00
Wolfgang Huß
4d645ebc04
Correct mutation to display the comment disabling right
2019-11-23 13:11:09 +01:00
Wolfgang Huß
043b951459
Try avoid modal to show success on error, but not successful
2019-11-23 11:42:46 +01:00
Wolfgang Huß
4c91675838
Fix lint
2019-11-23 11:41:48 +01:00
Wolfgang Huß
8a4ca956e8
Rename variable
2019-11-23 11:20:16 +01:00
Wolfgang Huß
116d597d24
Cleaned SCSS
2019-11-23 11:11:00 +01:00
Wolfgang Huß
a8a99e763c
Fix client-side rendered virtual DOM warnings
2019-11-23 11:05:41 +01:00
Wolfgang Huß
67a5a00704
Clean up
2019-11-23 10:58:16 +01:00
Wolfgang Huß
2f07d528e4
View status icon under type icon
2019-11-23 10:49:34 +01:00
Wolfgang Huß
6890ef25be
Add sorting to resource claims and reports lists
2019-11-23 10:34:55 +01:00
Wolfgang Huß
c757386f26
Better layout
2019-11-23 08:59:04 +01:00
Wolfgang Huß
0b7a0496a2
Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1710-list-and-protocol-moderation
...
# Conflicts:
# webapp/locales/de.json
2019-11-23 08:07:53 +01:00
mattwr18
2e559f22a6
Merge pull request #2328 from Human-Connection/2259-embeds-not-displayed
...
Add LegacyEmbeds component to fix bug
2019-11-22 19:23:06 +01:00
Wolfgang Huß
99af6cbf8a
Implement displaying multiple claims in the frontend
2019-11-22 18:40:51 +01:00
mattwr18
0a96f3ed6f
Merge pull request #2330 from Human-Connection/2329-normalize_emails_in_login_form
...
2329 normalize emails in login form
2019-11-22 16:30:56 +01:00
Wolfgang Huß
0bf8bcf1c6
Change watch to apollo reports update
2019-11-22 16:22:11 +01:00
roschaefer
ae360f2201
fix #2329 : Normalize email on login in the backend
2019-11-22 15:24:27 +01:00
Wolfgang Huß
ec8910d6eb
Rename decide mutation to review
2019-11-22 15:12:00 +01:00
mattwr18
c78a4189b9
Update component test
2019-11-22 15:08:54 +01:00
roschaefer
145b6727b1
Fix 2329 in the frontend
2019-11-22 15:08:25 +01:00
roschaefer
e9dcfd04fd
Expose #2329
2019-11-22 15:04:06 +01:00
mattwr18
aeac1edb32
Add LegacyEmbeds component to fix bug
2019-11-22 12:58:57 +01:00
lokalise-bot
3e52ee090c
Lokalise: update of webapp/locales/ru.json
2019-11-22 12:55:34 +01:00
lokalise-bot
bcd9f0ec93
Lokalise: update of webapp/locales/pt.json
2019-11-22 12:55:32 +01:00
lokalise-bot
32942e1346
Lokalise: update of webapp/locales/it.json
2019-11-22 12:55:30 +01:00
lokalise-bot
7ab1686caa
Lokalise: update of webapp/locales/fr.json
2019-11-22 12:55:29 +01:00
lokalise-bot
b5f0e83cb7
Lokalise: update of webapp/locales/es.json
2019-11-22 12:55:27 +01:00
lokalise-bot
d2b3396e9b
Lokalise: update of webapp/locales/de.json
2019-11-22 12:55:25 +01:00
mattwr18
5007520749
Merge pull request #2310 from Human-Connection/make-cypress-work-for-i18n-again
...
Changed translation must change test :(
2019-11-22 12:52:29 +01:00
Wolfgang Huß
02bdc5ea5d
Rename node CaseFolder to Claim and relation FLAGGED to BELONGS_TO
2019-11-22 12:18:43 +01:00
mattwr18
b2119c1a07
Merge pull request #2314 from Human-Connection/dependabot/npm_and_yarn/webapp/fuse.js-3.4.6
...
build(deps-dev): bump fuse.js from 3.4.5 to 3.4.6 in /webapp
2019-11-22 10:13:44 +01:00
mattwr18
33fb439e18
Update component tests for imageAspectRatio
2019-11-21 13:54:05 +01:00
Moriz Wahl
7be79ddcf8
Same translation as in cypress test
2019-11-21 11:45:25 +01:00
mattwr18
b9d28e5a69
Set up frontend/backend to add imageAspectRatio
...
- on create and update
2019-11-21 11:32:42 +01:00
ogerly
b360f71112
Terms of use extended with dot - no commercial use
2019-11-21 10:16:10 +01:00
Wolfgang Huß
ef84e9991f
Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1710-list-and-protocol-moderation
...
# Conflicts:
# backend/src/schema/index.js
2019-11-21 08:09:50 +01:00
dependabot-preview[bot]
ab511138a6
build(deps-dev): bump fuse.js from 3.4.5 to 3.4.6 in /webapp
...
Bumps [fuse.js](https://github.com/krisk/Fuse ) from 3.4.5 to 3.4.6.
- [Release notes](https://github.com/krisk/Fuse/releases )
- [Changelog](https://github.com/krisk/Fuse/blob/master/CHANGELOG.md )
- [Commits](https://github.com/krisk/Fuse/compare/v3.4.5...v3.4.6 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-21 04:22:01 +00:00
Alina Beck
a158a88044
fix lint errors after merge
2019-11-20 19:36:47 +03:00
Alina Beck
a210dd599d
Merge branch 'master' into migrate-styleguide-icons
2019-11-20 19:35:03 +03:00
Alina Beck
1f3159db47
add BaseIcon stories
2019-11-20 19:19:30 +03:00
mattwr18
95be6eaee6
Initial commit to add placeholder image for Post
2019-11-20 16:52:20 +01:00
Alina Beck
03eb32131c
configure storybook to load BaseComponents and svgs
2019-11-20 18:19:36 +03:00
Wolfgang Huß
cf02ca4506
Refactor decide mutation to new CaseFolder structure
2019-11-20 15:17:37 +01:00
Alina Beck
0727c3314d
move styles from view folder to assets
2019-11-20 16:13:07 +03:00
Alina Beck
70bfd9d70c
fix console warnings and failing tests
2019-11-20 15:43:53 +03:00
Alina Beck
9bd4dbbd81
mock svg files in component tests
2019-11-20 15:27:30 +03:00
Alina Beck
4347bdd1ed
replace require.context babel plugin
2019-11-20 15:12:51 +03:00
Alina Beck
77f4810ddc
set up global localVue
...
by setting up localVue with all required plugins (such as styleguide and vuex)
in a separate testSetup file we can avoid doing this individually in all component tests
the testSetup is executed before each test suite, so each test file gets a fresh
instance of localVue
2019-11-20 12:31:40 +03:00
dependabot-preview[bot]
6f3bd47654
build(deps-dev): bump eslint-config-prettier in /webapp
...
Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier ) from 6.6.0 to 6.7.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 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-20 04:23:25 +00:00