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

8740 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Schäfer
c963b364e1
Merge pull request #3069 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-date-5.11.1 
build(deps): bump metascraper-date from 5.10.7 to 5.11.1 in /backend
 2020-02-20 13:55:59 +01:00
Robert Schäfer
f85975e48d
Merge pull request #3070 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-author-5.11.1 
build(deps): bump metascraper-author from 5.10.7 to 5.11.1 in /backend
 2020-02-20 13:55:46 +01:00
mattwr18
c8a9db6ee3
Merge pull request #3047 from Human-Connection/dependabot/npm_and_yarn/webapp/xregexp-4.3.0 
build(deps): bump xregexp from 4.2.4 to 4.3.0 in /webapp
 2020-02-20 09:32:24 +01:00
mattwr18
b0bb00f7a5
Merge pull request #3068 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-publisher-5.11.1 
build(deps): bump metascraper-publisher from 5.10.7 to 5.11.1 in /backend
 2020-02-20 09:32:03 +01:00
mattwr18
fb0adebc47
Merge pull request #3113 from Human-Connection/dependabot/npm_and_yarn/backend/sentry/node-5.12.4 
build(deps): bump @sentry/node from 5.12.3 to 5.12.4 in /backend
 2020-02-20 09:31:44 +01:00
dependabot-preview[bot]
312b950590
build(deps): bump @sentry/node from 5.12.3 to 5.12.4 in /backend 
Bumps [@sentry/node](https://github.com/getsentry/sentry-javascript) from 5.12.3 to 5.12.4.
- [Release notes](https://github.com/getsentry/sentry-javascript/releases)
- [Changelog](https://github.com/getsentry/sentry-javascript/blob/master/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-javascript/compare/5.12.3...5.12.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-20 04:18:08 +00:00
dependabot-preview[bot]
43670d5d2b
build(deps): bump xregexp from 4.2.4 to 4.3.0 in /webapp 
Bumps [xregexp](https://github.com/slevithan/xregexp) from 4.2.4 to 4.3.0.
- [Release notes](https://github.com/slevithan/xregexp/releases)
- [Commits](https://github.com/slevithan/xregexp/compare/v4.2.4...v4.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-19 23:12:23 +00:00
dependabot-preview[bot]
196883c23c
build(deps): bump metascraper-publisher in /backend 
Bumps [metascraper-publisher](https://github.com/microlinkhq/metascraper) from 5.10.7 to 5.11.1.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.10.7...v5.11.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-19 23:10:39 +00:00
dependabot-preview[bot]
64c03e13f0
build(deps): bump metascraper-author from 5.10.7 to 5.11.1 in /backend 
Bumps [metascraper-author](https://github.com/microlinkhq/metascraper) from 5.10.7 to 5.11.1.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.10.7...v5.11.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-19 23:10:28 +00:00
dependabot-preview[bot]
eb6a949993
build(deps): bump metascraper-date from 5.10.7 to 5.11.1 in /backend 
Bumps [metascraper-date](https://github.com/microlinkhq/metascraper) from 5.10.7 to 5.11.1.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.10.7...v5.11.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-19 23:10:27 +00:00
Robert Schäfer
0fdddddfbe
Merge pull request #3109 from Human-Connection/lokalise-2020-02-19_10-27-49 
feat: German Translations Update By Andreas Plank
 2020-02-19 23:33:56 +01:00
mattwr18
8a2b1d00b4
Merge pull request #3093 from Human-Connection/3004_Remove_Hover_Menu_from_User_Teaser 
fix(frontend): Remove Hover Menu from User Teaser
 2020-02-19 22:34:10 +01:00
mattwr18
c41adae787
Merge pull request #3030 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-jest-23.7.0 
build(deps-dev): bump eslint-plugin-jest from 23.6.0 to 23.7.0 in /webapp
 2020-02-19 22:33:35 +01:00
mattwr18
36fda479ea
Merge pull request #2981 from Human-Connection/fix_nullpointer_issue_when_post_author_is_anonymous 
fix(frontend): Post page won't crash on anonymous user
 2020-02-19 22:32:25 +01:00
mattwr18
25a3f1963c
Merge pull request #3110 from Human-Connection/another_try_to_fix_hanging_cypress_tests 
chore(cypress): Remove debug statements
 2020-02-19 19:59:24 +01:00
Robert Schäfer
cfd25842c9
Merge pull request #3066 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-audio-5.11.1 
build(deps): bump metascraper-audio from 5.10.7 to 5.11.1 in /backend
 2020-02-19 16:55:42 +01:00
Robert Schäfer
ee6eb06667
Merge pull request #3081 from Human-Connection/dependabot/npm_and_yarn/webapp/nuxtjs/sentry-3.2.4 
build(deps): bump @nuxtjs/sentry from 3.2.3 to 3.2.4 in /webapp
 2020-02-19 16:55:19 +01:00
roschaefer
1a0dd36edd chore(cypress): Remove debug statements 2020-02-19 16:51:49 +01:00
Robert Schäfer
9bc9ccae79
Merge pull request #3078 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-testing-2.10.1 
build(deps-dev): bump apollo-server-testing from 2.10.0 to 2.10.1 in /backend
 2020-02-19 11:26:02 +01:00
roschaefer
f2e2db0bc7 fix(frontend): error when post.author null 2020-02-19 10:49:08 +01:00
dependabot-preview[bot]
283d02a219
build(deps-dev): bump eslint-plugin-jest in /webapp 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 23.6.0 to 23.7.0.
- [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.6.0...v23.7.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-19 09:30:50 +00:00
lokalise-bot
d21881e8eb Lokalise: update of webapp/locales/de.json 2020-02-19 10:27:52 +01:00
dependabot-preview[bot]
b6bca1879f
build(deps-dev): bump apollo-server-testing in /backend 
Bumps [apollo-server-testing](https://github.com/apollographql/apollo-server) from 2.10.0 to 2.10.1.
- [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.10.0...apollo-server-testing@2.10.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-19 08:51:19 +00:00
Robert Schäfer
b7896f9c4e
Merge pull request #3101 from Human-Connection/3088-fix_notificationAdded_is_null 
fix(subscriptions): Don't publish undefined
 2020-02-19 09:47:38 +01:00
mattwr18
90dfe32080
Merge pull request #3077 from Human-Connection/dependabot/npm_and_yarn/webapp/yarn-1.22.0 
build(deps): [security] bump yarn from 1.17.3 to 1.22.0 in /webapp
 2020-02-19 09:35:42 +01:00
dependabot-preview[bot]
132029460a
build(deps): [security] bump yarn from 1.17.3 to 1.22.0 in /webapp 
Bumps [yarn](https://github.com/yarnpkg/yarn) from 1.17.3 to 1.22.0. **This update includes a security fix.**
- [Release notes](https://github.com/yarnpkg/yarn/releases)
- [Changelog](https://github.com/yarnpkg/yarn/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yarnpkg/yarn/compare/v1.17.3...v1.22.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-18 23:41:00 +00:00
Robert Schäfer
65649aa0eb
Merge pull request #3003 from Human-Connection/normalize-locale-files 
feat: Normalize locales/json files
 2020-02-19 00:39:15 +01:00
mattwr18
a346632fff Avoid running cypher statement if not needed 
- it just feels safer to not run a cypher statement if there is no user
  in the idsOfUsers array. Why risk notifications pointing to empty
nodes? It doesn't seem like this happens, but I'm not sure how to write
a test to verify, and why run cypher statements, if there is no need to?
 2020-02-18 23:19:14 +01:00
Robert Schäfer
523f6915de
Merge pull request #2585 from Human-Connection/1188-Delete_teaser_image 
🍰feat: Delete teaser image
 2020-02-18 22:50:33 +01:00
mattwr18
54caaaaa0a Remove unnecessary guard clause 
- filter returns an empty array, and no notification is created if
  idsOfUsers is an empty array
 2020-02-18 22:43:19 +01:00
mattwr18
7fe6fb110b Remove unnecessary negation of negation, refactor 
- tests to use `toMatchObject`, which checks that only one notification
  is indeed created
 2020-02-18 22:21:49 +01:00
Moriz Wahl
05424f49b4 locales are normalized 2020-02-18 19:16:30 +01:00
mattwr18
44652a34a7 Merge in master/refactor 
- Add cypress test for DeleteImage
- remove unnecessary ref and function call
- use tokens
- simplify logic to showDeleteImageButton
- emit event when cropInProgress
 2020-02-18 18:50:02 +01:00
Moriz Wahl
934c9906cc sorting keys, comparing de and en locales, yarn run locales 2020-02-18 18:07:57 +01:00
Moriz Wahl
3a33430298 path set correctly for subfolder of translation scripts 2020-02-18 18:07:57 +01:00
roschaefer
069e67f942 chore(ci): Check missing translations keys 2020-02-18 18:07:57 +01:00
Moriz Wahl
fa906efb1f locales sorted. 2020-02-18 18:07:57 +01:00
roschaefer
9011f922bb refactor(ci): Move translations to scripts/ folder 
And refactor the script a little
 2020-02-18 18:05:28 +01:00
Moriz Wahl
d9fcc9f720 Basic script to normalize the locale files and check if those files are normalized 
To Do: Check if keys in en.json and de.json are the same
Check dependencies (jq must be installed)
Where to place the file?
Add test to travis? How?
 2020-02-18 18:05:28 +01:00
Robert Schäfer
b003fb3f10
Merge pull request #2589 from Human-Connection/2587-geolocation-swap-lng-with-lat 
fix: swap lat and lng
 2020-02-18 17:55:57 +01:00
Alina Beck
a7c9337692
Merge pull request #3102 from Human-Connection/fix-avatar-background 
fix(frontend): avatar image covers full circle
 2020-02-18 17:34:41 +01:00
roschaefer
f32bfc7e36 fix(subscriptions): Don't publish undefined 
Fix #3088
 2020-02-18 16:25:11 +01:00
Alina Beck
cca9ec8e81 avatar image spans 100% width and height 2020-02-18 16:17:27 +01:00
mattwr18
44d503c53c
Merge pull request #3090 from Human-Connection/2202_do_not_encode_the_entire_user_in_bearer_token 
fix(jwt): Whitelist encoded JWT attributes
 2020-02-18 14:37:15 +01:00
mattwr18
708edc06a3
Merge pull request #3056 from Human-Connection/3054-add-e2e-tests-image-uploader 
test: Write cypress tests for ImageUploader
 2020-02-18 14:31:49 +01:00
Moriz Wahl
5b41561cc4 throw error added to template 2020-02-18 14:16:46 +01:00
mattwr18
1b62dc3b2e Remove sequence for slug as it's not needed 2020-02-18 13:40:48 +01:00
mattwr18
6f6b1534df Reload page to add Category button 
- I believe the cypress test is so fast that we visit the post/create
  page before the relationship CATEGORIZED is added, and therefore, we
must refresh the page.
- I am not happy about this solution, but I'm not sure what we can do...
  maybe wait for the post to be succesfully created with all it's
relationships?
 2020-02-18 13:33:34 +01:00
roschaefer
e41a639cf1 fix(jwt): Encode only 3 attributes in JWT 
This will prevent unintentional encoding of users email addresses in the
JWT.

@steffi201028 this might be interesting for you as well.
 2020-02-18 11:23:04 +01:00
Robert Schäfer
e35ca59fbc
Merge pull request #3092 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-vue-6.2.1 
build(deps-dev): bump eslint-plugin-vue from 6.1.2 to 6.2.1 in /webapp
 2020-02-18 11:17:13 +01:00