ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,408 Commits 117 Branches 1,511 Tags
Commit Graph

5716 Commits

Author SHA1 Message Date
Moriz Wahl
3b49744b51 directory created a path names changed 2019-11-27 14:28:57 +01:00
Alina Beck
2b1f0b1c4a
Merge pull request #2288 from Human-Connection/migrate-styleguide-icons 
Migrate styleguide icons
 2019-11-27 13:28:56 +03:00
Alina Beck
1dc68cbae8 follow @Roschaefer suggestions 2019-11-27 11:51:30 +03:00
ogerly
d75c02c057 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1746-Blur_explicit_Image_Content 2019-11-27 08:34:59 +01:00
dependabot-preview[bot]
448c29a39b
build(deps-dev): bump eslint-plugin-jest in /webapp 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 23.0.4 to 23.0.5.
- [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.4...v23.0.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-27 04:22:56 +00:00
mattwr18
2f249a73c5 Rename REPORTED Claim to FILED Report 2019-11-26 15:35:48 +01:00
dependabot-preview[bot]
dba23268c7
build(deps): bump date-fns from 2.7.0 to 2.8.1 in /webapp 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.7.0 to 2.8.1.
- [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.7.0...v2.8.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-26 09:20:37 +00:00
mattwr18
700182e29a
Merge pull request #2340 from Human-Connection/dependabot/npm_and_yarn/webapp/babel/core-7.7.4 
build(deps-dev): bump @babel/core from 7.7.2 to 7.7.4 in /webapp
 2019-11-26 10:18:51 +01:00
mattwr18
d9344655a4
Merge pull request #2319 from Human-Connection/dependabot/npm_and_yarn/webapp/validator-12.1.0 
build(deps): bump validator from 12.0.0 to 12.1.0 in /webapp
 2019-11-26 10:17:14 +01:00
ogerly
563cbed346 merge master 2019-11-26 07:57:57 +01:00
mattwr18
ff404e3c37 Fix graphql mutation for returned Claim 2019-11-25 19:02:58 +01:00
mattwr18
6a66176e28
Merge pull request #2350 from Human-Connection/2349-fix-updating-post-image-submit-bug 
Fix updating post by adding/changing image bug submits form
 2019-11-25 15:37:20 +01:00
dependabot-preview[bot]
587fb81599
build(deps): bump validator from 12.0.0 to 12.1.0 in /webapp 
Bumps [validator](https://github.com/chriso/validator.js) from 12.0.0 to 12.1.0.
- [Release notes](https://github.com/chriso/validator.js/releases)
- [Changelog](https://github.com/validatorjs/validator.js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/chriso/validator.js/compare/12.0.0...12.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-25 10:42:16 +00:00
dependabot-preview[bot]
69ea174ac8
build(deps-dev): bump @babel/core from 7.7.2 to 7.7.4 in /webapp 
Bumps [@babel/core](https://github.com/babel/babel) from 7.7.2 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.2...v7.7.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-25 10:41:55 +00:00
Alina Beck
171d876bfd
Update webapp/components/_new/generic/BaseIcon/BaseIcon.vue 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-11-25 13:39:52 +03:00
Robert Schäfer
5c57265e31
Merge pull request #2346 from Human-Connection/dependabot/npm_and_yarn/webapp/babel/preset-env-7.7.4 
build(deps-dev): bump @babel/preset-env from 7.7.1 to 7.7.4 in /webapp
 2019-11-25 11:39:17 +01:00
ogerly
f7aeb3c616 added checkbox for blure Images in contribution form 2019-11-25 11:23:57 +01:00
mattwr18
1667669d12 Fix bug by adding event modifiers stop and prevent 2019-11-25 11:10:21 +01:00
dependabot-preview[bot]
5e04ba0c63
build(deps-dev): bump eslint from 6.6.0 to 6.7.1 in /webapp 
Bumps [eslint](https://github.com/eslint/eslint) from 6.6.0 to 6.7.1.
- [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.6.0...v6.7.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-25 04:19:54 +00:00
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