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

7150 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wolfgang Huß
8cc05ab910 More complex report and review seeding 2019-11-23 08:58:43 +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
6cf60e6ae1
Merge pull request #2324 from Human-Connection/update-to-version-0.1.11 
Update to version 0.1.11
 2019-11-22 21:09:25 +01:00
mattwr18
453480f805 Update to version 0.1.11 2019-11-22 20:23:48 +01:00
mattwr18
19e429f952 v0.1.11 2019-11-22 20:19:02 +01:00
Wolfgang Huß
b2db3118f2 Add dubios vanished code again 2019-11-22 19:32:13 +01:00
Wolfgang Huß
d5afb6c790 Add old script again as template 2019-11-22 19:31:19 +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
e4d04c22c0
Merge pull request #2309 from Human-Connection/fix-incorrect-link-to-test-environment 
Fix incorrect link to development environment
 2019-11-22 16:33:01 +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
Wolfgang Huß
0de778e743 Correct mutations report and review to overtake the resource disabled 2019-11-22 16:14:45 +01:00
Wolfgang Huß
7de34d3d55 Fix tests by first report before review 2019-11-22 15:56:21 +01:00
Wolfgang Huß
59f53a07c6 Clean up 2019-11-22 15:24:50 +01:00
roschaefer
ae360f2201 fix #2329: Normalize email on login in the backend 2019-11-22 15:24:27 +01:00
Wolfgang Huß
9a7774ce86 Implement review validation with validateReview 2019-11-22 15:19:49 +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
9dce86358b
Merge pull request #2327 from Human-Connection/lokalise-2019-11-22_12-55-23 
Lokalise: Translations update
 2019-11-22 14:50:34 +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
Wolfgang Huß
a7aaee98c1 No new review if a reviewer changes their opinion 2019-11-22 10:39:55 +01:00
mattwr18
08d78a2005
Merge pull request #2318 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-testing-2.9.12 
build(deps-dev): bump apollo-server-testing from 2.9.9 to 2.9.12 in /backend
 2019-11-22 10:14:13 +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
9a6da009ff
Merge pull request #2302 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-config-prettier-6.7.0 
build(deps-dev): bump eslint-config-prettier from 6.6.0 to 6.7.0 in /webapp
 2019-11-22 10:13:21 +01:00
mattwr18
95b500be05
Merge pull request #2301 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-lang-5.8.9 
build(deps): bump metascraper-lang from 5.8.7 to 5.8.9 in /backend
 2019-11-22 10:13:05 +01:00
mattwr18
0aea441e2b
Merge pull request #2298 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-soundcloud-5.8.9 
build(deps): bump metascraper-soundcloud from 5.8.7 to 5.8.9 in /backend
 2019-11-22 10:12:44 +01:00
mattwr18
489e6cc476
Merge pull request #2297 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-youtube-5.8.9 
build(deps): bump metascraper-youtube from 5.8.7 to 5.8.9 in /backend
 2019-11-22 10:12:32 +01:00
mattwr18
c453fd1207
Merge pull request #2296 from Human-Connection/dependabot/npm_and_yarn/date-fns-2.8.0 
build(deps-dev): bump date-fns from 2.7.0 to 2.8.0
 2019-11-22 10:12:16 +01:00
Wolfgang Huß
eaafac30c7 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1710-list-and-protocol-moderation 2019-11-22 08:46:13 +01:00
Wolfgang Huß
a5689e2f67 Get implementing 'reviewedByModerator' further 2019-11-22 08:44:40 +01:00
dependabot-preview[bot]
b3cbe8ac9b
build(deps-dev): bump apollo-server-testing in /backend 
Bumps [apollo-server-testing](https://github.com/apollographql/apollo-server) from 2.9.9 to 2.9.12.
- [Release notes](https://github.com/apollographql/apollo-server/releases)
- [Changelog](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-server/compare/apollo-server-testing@2.9.9...apollo-server-testing@2.9.12)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-22 04:20:12 +00:00
Wolfgang Huß
c0fb53c2b5 Get frontend running by start implementing 'reviewedByModerator' right 2019-11-21 13:35:12 +01:00
Moriz Wahl
7be79ddcf8 Same translation as in cypress test 2019-11-21 11:45:25 +01:00
mattwr18
b859102275
Merge pull request #2311 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-2.9.11 
build(deps): bump apollo-server from 2.9.9 to 2.9.11 in /backend
 2019-11-21 11:37:59 +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
dependabot-preview[bot]
3ecd1d6b24
build(deps): bump apollo-server from 2.9.9 to 2.9.11 in /backend 
Bumps [apollo-server](https://github.com/apollographql/apollo-server) from 2.9.9 to 2.9.11.
- [Release notes](https://github.com/apollographql/apollo-server/releases)
- [Changelog](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-server/compare/apollo-server@2.9.9...apollo-server@2.9.11)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-21 04:19:41 +00:00
Moriz Wahl
a39a040e91 Changed translation must change test :( 2019-11-20 19:48:04 +01:00
steffi
e8e78a62b0 Fixed the link to development environment and text 2019-11-20 19:27:07 +01:00