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

2325 Commits

Author SHA1 Message Date
mattwr18
2f249a73c5 Rename REPORTED Claim to FILED Report 2019-11-26 15:35:48 +01:00
mattwr18
ff404e3c37 Fix graphql mutation for returned Claim 2019-11-25 19:02:58 +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
Moriz Wahl
7be79ddcf8 Same translation as in cypress test 2019-11-21 11:45:25 +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
Wolfgang Huß
cf02ca4506 Refactor decide mutation to new CaseFolder structure 2019-11-20 15:17:37 +01: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
Robert Schäfer
694fb52381
Merge pull request #2293 from Human-Connection/2230-fix-typo 
Fix Typo Of Issue 2230
 2019-11-20 00:19:48 +01:00
Moriz Wahl
37b71b5e9a Fix Typo Of Issue 2230 2019-11-19 18:35:13 +01:00
mattwr18
c3d8cb68e0
Merge pull request #2076 from Human-Connection/1851-make-hashtags-clickable 
[Systems-Development-and-Frameworks] Clickable hashtags
 2019-11-19 14:00:28 +01:00
Mogge
f7a072a64e
Merge pull request #2277 from Human-Connection/lokalise-2019-11-18_23-21-50 
Lokalise: Translations update
 2019-11-19 10:12:19 +01:00
mattwr18
48beeecaea
Merge pull request #2266 from Human-Connection/dependabot/npm_and_yarn/webapp/vue/eslint-config-prettier-6.0.0 
build(deps-dev): bump @vue/eslint-config-prettier from 5.0.0 to 6.0.0 in /webapp
 2019-11-19 08:34:15 +01:00
mattwr18
c775884c59
Merge pull request #2160 from Human-Connection/2119_Create_Post_consistent_form_input_validation 
🍰 2119-Fix Contribution  consistent form input validation
 2019-11-19 00:27:48 +01:00
lokalise-bot
906e8518bf Lokalise: update of webapp/locales/ru.json 2019-11-18 23:21:52 +01:00
roschaefer
32b93d1ff3 docs: add storybook story for hashtag component 2019-11-18 22:50:21 +01:00
dependabot-preview[bot]
83c46a3de3
build(deps-dev): bump @vue/eslint-config-prettier in /webapp 
Bumps [@vue/eslint-config-prettier](https://github.com/vuejs/eslint-config-prettier) from 5.0.0 to 6.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/compare/v5.0.0...v6.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-18 21:33:55 +00:00
Robert Schäfer
00fd014dc1
Merge pull request #2265 from Human-Connection/dependabot/npm_and_yarn/webapp/cookie-universal-nuxt-2.0.19 
build(deps): bump cookie-universal-nuxt from 2.0.18 to 2.0.19 in /webapp
 2019-11-18 22:30:32 +01:00
mattwr18
123fc2f666 Fix lint with updated linter 2019-11-18 21:54:24 +01:00
mattwr18
399e13360e Update tests to test new validations 2019-11-18 21:23:12 +01:00
mattwr18
5450eba1b9 Update validations for a Post's content 
- we were asked to remove a minimum of three characters since it's not
more substantive than a link.
 2019-11-18 18:23:41 +01:00