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
9,605 Commits 117 Branches 1,511 Tags
Commit Graph

3342 Commits

Author SHA1 Message Date
Mogge
fd6b770e75
Merge pull request #3965 from Ocelot-Social-Community/dependabot/npm_and_yarn/webapp/dot-prop-4.2.1 
[Security] Bump dot-prop from 4.2.0 to 4.2.1 in /webapp
 2020-11-20 20:29:33 +01:00
Mogge
cb014e0766
Merge pull request #3973 from Ocelot-Social-Community/dependabot/npm_and_yarn/webapp/eslint-plugin-prettier-3.1.4 
Bump eslint-plugin-prettier from 3.1.2 to 3.1.4 in /webapp
 2020-11-20 20:20:31 +01:00
Mogge
caa7636dd6
Merge pull request #3963 from Ocelot-Social-Community/dependabot/npm_and_yarn/webapp/storybook-design-token-0.8.1 
Bump storybook-design-token from 0.7.2 to 0.8.1 in /webapp
 2020-11-20 19:41:57 +01:00
Mogge
48a5d770a6
Merge pull request #3964 from Ocelot-Social-Community/dependabot/npm_and_yarn/webapp/http-proxy-1.18.1 
[Security] Bump http-proxy from 1.17.0 to 1.18.1 in /webapp
 2020-11-20 19:41:03 +01:00
dependabot-preview[bot]
65d04eba96
Bump eslint-plugin-prettier from 3.1.2 to 3.1.4 in /webapp 
Bumps [eslint-plugin-prettier](https://github.com/prettier/eslint-plugin-prettier) from 3.1.2 to 3.1.4.
- [Release notes](https://github.com/prettier/eslint-plugin-prettier/releases)
- [Changelog](https://github.com/prettier/eslint-plugin-prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/eslint-plugin-prettier/compare/v3.1.2...v3.1.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-11-20 18:39:45 +00:00
Mogge
bc7100071d
Merge pull request #3970 from Ocelot-Social-Community/dependabot/npm_and_yarn/webapp/babel/core-7.12.3 
Bump @babel/core from 7.9.0 to 7.12.3 in /webapp
 2020-11-20 19:38:24 +01:00
dependabot-preview[bot]
5e45f3aaa4
[Security] Bump dot-prop from 4.2.0 to 4.2.1 in /webapp 
Bumps [dot-prop](https://github.com/sindresorhus/dot-prop) from 4.2.0 to 4.2.1. **This update includes a security fix.**
- [Release notes](https://github.com/sindresorhus/dot-prop/releases)
- [Commits](https://github.com/sindresorhus/dot-prop/compare/v4.2.0...v4.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-11-20 18:34:36 +00:00
dependabot-preview[bot]
2168eaf819
Bump eslint-plugin-jest from 23.8.2 to 24.1.3 in /webapp 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 23.8.2 to 24.1.3.
- [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.8.2...v24.1.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-11-20 15:01:43 +00:00
dependabot-preview[bot]
9206ad4b02
Bump @babel/core from 7.9.0 to 7.12.3 in /webapp 
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.9.0 to 7.12.3.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.12.3/packages/babel-core)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-11-20 15:01:42 +00:00
dependabot-preview[bot]
edfa56069e
[Security] Bump http-proxy from 1.17.0 to 1.18.1 in /webapp 
Bumps [http-proxy](https://github.com/http-party/node-http-proxy) from 1.17.0 to 1.18.1. **This update includes a security fix.**
- [Release notes](https://github.com/http-party/node-http-proxy/releases)
- [Changelog](https://github.com/http-party/node-http-proxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/http-party/node-http-proxy/compare/1.17.0...1.18.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-11-20 15:01:30 +00:00
dependabot-preview[bot]
be2551e617
Bump storybook-design-token from 0.7.2 to 0.8.1 in /webapp 
Bumps [storybook-design-token](https://github.com/UX-and-I/storybook-design-token) from 0.7.2 to 0.8.1.
- [Release notes](https://github.com/UX-and-I/storybook-design-token/releases)
- [Commits](https://github.com/UX-and-I/storybook-design-token/compare/v0.7.2...v0.8.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-11-20 15:01:29 +00:00
ogerly
f498ba8c65 fix: new mapbox token 2020-11-05 15:38:13 +01:00
Wolfgang Huß
844da649f0 Fix node version to 'node:12.19.0-alpine3.10' 
- Changed from 'node:lts-alpine' to 'node:12.19.0-alpine3.10'.
 2020-11-03 13:02:24 +01:00
Wolfgang Huß
b6c8acab36 Change docker repository to develop-webapp 
- nitro-web  —>  develop-webapp
 2020-10-28 10:52:07 +01:00
Wolfgang Huß
dab21933af
Merge pull request #3925 from Ocelot-Social-Community/supported-img-formats 
feat: 🍰 Show Supported Image Formats Implemented
 2020-10-27 12:12:32 +01:00
dasari810
84f69fe8f8 updated the translation for Deutsch 2020-10-27 13:29:22 +05:30
dasari810
f784f25192 changes made for portugal translation 2020-10-26 23:02:35 +05:30
dasari810
df4347f07c added translations for text 2020-10-26 19:13:51 +05:30
dasari810
ae681ccad3 show supported img formats implemented 2020-10-26 16:35:06 +05:30
Moriz Wahl
f7b60f5928 linting 2020-10-26 11:19:03 +01:00
Moriz Wahl
c4b436f6cb spinner added to download button, only the posts written by the user are exported 2020-10-26 10:43:22 +01:00
Wolfgang Huß
c99cb16a6b v0.6.3 2020-10-16 12:42:43 +02:00
Wolfgang Huß
3f453c6888
Merge pull request #3954 from Human-Connection/export-user-data 
feat: Export User Data Update
 2020-10-16 11:31:41 +02:00
Moriz Wahl
14de48ecd7 deleted or disabled post are not available for user data download. 2020-10-16 11:00:58 +02:00
Wolfgang Huß
63207320b4 v0.6.2 2020-10-15 17:00:46 +02:00
Moriz Wahl
f9518619fe id for author added 2020-10-14 16:35:47 +02:00
Moriz Wahl
3ba72526b9 filename of downloaded image changed 2020-10-14 12:19:53 +02:00
Moriz Wahl
6ff02b41c8 name of downloaded image is the same as the url in the exported json 2020-10-14 12:03:35 +02:00
Moriz Wahl
a6f87a394a improved German, download images on click 2020-10-14 11:49:06 +02:00
Moriz Wahl
8e527a83f1 post categories added for data export 2020-10-14 00:14:56 +02:00
Moriz Wahl
4a79fffa5b Removed XML download. Added image download and description 2020-10-13 17:36:53 +02:00
Moriz Wahl
f0354c337f Export of user data as XML 2020-09-29 15:54:21 +02:00
Moriz Wahl
0e678a5559 basic json download of user data 2020-09-29 13:35:47 +02:00
Wolfgang Huß
36d26ebca2 Fix sign up page on safari 
- Added 'width' and 'height' properties in the SVG 'webapp/static/img/sign-up/nicetomeetyou.svg'.
- Have found that this are present on other SVGs. For example 'webapp/static/img/sign-up/humanconnection.svg'.
- Couldn't find an other way …
 2020-09-17 10:37:46 +02:00
ogerly
fde69a3b21 fix: review from wolle, fix lint 2020-08-27 09:49:54 +02:00
Alexander Friedland
635b7e0d23
Update webapp/locales/en.json 
ok

Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
 2020-08-27 09:14:01 +02:00
ogerly
b2f3b02422 fix: DeleteDate vue and specs 2020-08-19 10:01:59 +02:00
ogerly
6a68bb8f83 fix: location map box USA 2020-08-18 11:50:32 +02:00
Alexander Friedland
6d856a3edc
Merge branch 'master' into 17-Admin-Remove-user-profile 2020-08-14 17:23:16 +02:00
ogerly
045500102c fix: translate delete from single to multiple entries 2020-08-14 17:15:37 +02:00
ogerly
3d69ebbb1c fix: tests ok, lint ok 2020-08-14 11:39:38 +02:00
Mogge
907b3214aa
Merge pull request #3769 from Human-Connection/Elweyn/issue2112 
fix: 🍰 Comment Counters Are Now Equal
 2020-08-11 21:30:59 +02:00
Hannes Heine
823056b59e Added the user that writes the comment to the authentication. Test reply to comment edited. Test update comment added. Test delete comment pending. 2020-08-11 16:01:42 +02:00
Hannes Heine
34ba9d8c0b Lint over the frontend code. 2020-08-07 14:07:53 +02:00
Hannes Heine
def6a9d444 Changed the class to use this.post.comments instead of the computed postComments so that issue are fixed. 2020-08-07 13:17:14 +02:00
Hannes Heine
7f8be5deab fix: #3357 now the comment deletion and comment updates are seen directly after the event is triggered. 2020-08-06 16:18:27 +02:00
Hannes Heine
d513fec7fe Added test comment that is disabled and changes the test name so that we see that the test checks the comment count to ignore disabled and deleted comments. 2020-08-06 16:12:36 +02:00
Wolfgang Huß
f0b29d9808
Merge pull request #3780 from Human-Connection/feat-3657-redesign-data-privacy-warning-box 
feat: 🍰 Redesign Data Privacy Warning Box
 2020-08-06 11:28:18 +02:00
Thiru
270a150db4
Update webapp/locales/en.json 
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
 2020-08-05 16:57:20 +02:00
Wolfgang Huß
7106fa8ada
Merge pull request #3506 from Human-Connection/3498-Checkboxes_missing_on_delete_user_account_page 
fix: 🍰 Checkboxes Not Missing Anymore On Delete User Account Page
 2020-08-05 15:06:51 +02:00