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

2336 Commits

Author SHA1 Message Date
ogerly
19d183e13a Merge https://github.com/Human-Connection/Human-Connection into 1746-Blur_explicit_Image_Content 2019-12-02 13:22:42 +01:00
mattwr18
35c3219460
Merge pull request #2316 from Human-Connection/2170-Change_of_Terms_of_Service 
Terms of use extended with dot - no commercial use
 2019-12-02 13:10:58 +01:00
mattwr18
e2d443c87f
Merge pull request #2380 from Human-Connection/lokalise-2019-11-29_11-04-05 
Lokalise: Translations update
 2019-12-02 12:08:55 +01:00
mattwr18
6edf169074
Merge pull request #2391 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/addon-a11y-5.2.7 
build(deps-dev): bump @storybook/addon-a11y from 5.2.6 to 5.2.7 in /webapp
 2019-12-02 11:48:10 +01:00
mattwr18
b6cfe087be
Merge pull request #2379 from Human-Connection/dependabot/npm_and_yarn/webapp/vue/server-test-utils-1.0.0-beta.30 
build(deps-dev): bump @vue/server-test-utils from 1.0.0-beta.29 to 1.0.0-beta.30 in /webapp
 2019-12-02 11:46:58 +01:00
dependabot-preview[bot]
6520a64b61
build(deps-dev): bump @storybook/addon-a11y in /webapp 
Bumps [@storybook/addon-a11y](https://github.com/storybookjs/storybook/tree/HEAD/addons/a11y) from 5.2.6 to 5.2.7.
- [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.7/addons/a11y)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-02 04:20:20 +00:00
ogerly
7cdca49b48 Fix lint 2019-11-29 16:04:25 +01:00
mattwr18
b7f0bc7164
Merge pull request #2375 from Human-Connection/keep_dots_in_emails 
Don't remove sub-addresses in emails
 2019-11-29 14:14:25 +01:00
ogerly
06fd8a2ce9 unblur function by contribution 2019-11-29 12:14:54 +01:00
lokalise-bot
8a812aaaee Lokalise: update of webapp/locales/pt.json 2019-11-29 11:04:08 +01:00
dependabot-preview[bot]
0d327a9027
build(deps-dev): bump @vue/server-test-utils in /webapp 
Bumps [@vue/server-test-utils](https://github.com/vuejs/vue-test-utils/tree/HEAD/packages/server-test-utils) from 1.0.0-beta.29 to 1.0.0-beta.30.
- [Release notes](https://github.com/vuejs/vue-test-utils/releases)
- [Changelog](https://github.com/vuejs/vue-test-utils/blob/dev/packages/server-test-utils/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-test-utils/commits/v1.0.0-beta.30/packages/server-test-utils)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-29 04:24:08 +00:00
ogerly
7f3f81822e blur the image ok. 2019-11-28 20:40:35 +01:00
roschaefer
973d3f899a Remove dots of gmail addresses 
I had a chat with our moderator Daniel. He asks us to remove dots from
gmail accounts. He finds it more consistent and he has no problem to
write a mail to a gmail address without dots. He is OK to save the
email address different from how a user memorizes it.
 2019-11-28 14:02:11 +01:00
roschaefer
7146e0a9b2 Fix lint 2019-11-28 13:48:09 +01:00
roschaefer
9e2baf25d2 Don't remove dots in emails 2019-11-28 11:22:09 +01:00
dependabot-preview[bot]
0a5a0668c8
build(deps): bump @nuxtjs/apollo in /webapp 
Bumps [@nuxtjs/apollo](https://github.com/nuxt-community/apollo-module) from 4.0.0-rc17 to 4.0.0-rc18.
- [Release notes](https://github.com/nuxt-community/apollo-module/releases)
- [Commits](https://github.com/nuxt-community/apollo-module/compare/v4.0.0-rc.17...v4.0.0-rc.18)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-28 04:19:49 +00:00
mattwr18
4861ab26dd
Merge pull request #2369 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-jest-23.0.5 
build(deps-dev): bump eslint-plugin-jest from 23.0.4 to 23.0.5 in /webapp
 2019-11-27 18:15:51 +01:00
mattwr18
f42eea15a6
Merge pull request #2323 from Human-Connection/dependabot/npm_and_yarn/webapp/date-fns-2.8.1 
build(deps): bump date-fns from 2.7.0 to 2.8.1 in /webapp
 2019-11-27 18:11:08 +01:00
Moriz Wahl
d47ebb936e use .filter to find items 2019-11-27 14:28:57 +01:00
Moriz Wahl
809ef47a03 only one expect per it block 2019-11-27 14:28:57 +01:00
Moriz Wahl
3d3a121dc5 method tests added 2019-11-27 14:28:57 +01:00
Moriz Wahl
e4883b5175 method tests added 2019-11-27 14:28:57 +01:00
Moriz Wahl
a14b3cb39a spec file added with basic test logic 2019-11-27 14:28:57 +01:00
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
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
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
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
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
roschaefer
ae360f2201 fix #2329: Normalize email on login in the backend 2019-11-22 15:24:27 +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