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

3028 Commits

Author SHA1 Message Date
ogerly
6472cec0c6 terms-and-condition: the point -no political use - added 2020-02-22 14:38:32 +01:00
mattwr18
2f99207760 Update to v0.4.0 2020-02-21 19:04:53 +01:00
Robert Schäfer
c81de16be0
Merge pull request #3115 from Human-Connection/avoid-async-await-in-cypress 
fix: Favor Cypress.Promise over async/await in e2e tests
 2020-02-21 13:43:36 +01:00
Robert Schäfer
e164104791
Merge pull request #3075 from Human-Connection/3074-don’t-expose-all-properties-of-report 
feat: 🍰 Expose sensitive report type to moderators only
 2020-02-21 12:43:28 +01:00
Robert Schäfer
fa32c5789b
Merge pull request #2870 from Human-Connection/migrate-styleguide-card 
refactor: migrate card component
 2020-02-21 11:59:52 +01:00
mattwr18
f67a000c11 Stub Websockets, remove vue-loader 
- no reason we need websockets to try connect endlessly
- vue-loader was stopping the cypress tests in debugger at webpack:///./node_modules/vue-style-loader/lib/addStylesClient.js?499e
and we are not using anywhere.
 2020-02-20 18:24:31 +01:00
roschaefer
9b2175786e Fix client-only warning 2020-02-20 15:47:47 +01:00
roschaefer
9241305d43 fix: Prever FileReader over URL.createObjectUrl 
Apparently, URL.createObjectUrl is not supported in JSDom, see:
https://github.com/jsdom/jsdom/issues/1721

With FileReader we have the option to avoid it altogether.
 2020-02-20 15:42:47 +01:00
roschaefer
9c98e30bb8 Fix console.errors 
@mattwr18 @alina-beck there seems to be no switch or configuration to
let vue-test-utils or jest fail whenever there is a call to
`console.error`. The only way to test it for very specific tests is
this. I took it from here:

https://geedew.com/catching-prop-validation-in-vue-with-Jest/
 2020-02-20 14:20:57 +01:00
Wolfgang Huß
82f3eb2a29 Delete comments 2020-02-20 11:09:43 +01:00
Wolfgang Huß
4bd7f61fcc Refactor GQL schema, resolvers and moderators report list 
- Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2020-02-20 10:35:37 +01:00
Wolfgang Huß
a84d78e3ee Fix key doubling error in ReportTable.vue 
- Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2020-02-20 10:23:24 +01:00
Alina Beck
701564c708 Merge branch 'master' into migrate-styleguide-card 2020-02-20 00:37:07 +01:00
Alina Beck
f564126e13 fix disabled content styles 2020-02-20 00:32:18 +01: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
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
Alina Beck
46616f5e6b update cypress tests 2020-02-19 20:50:40 +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
Alina Beck
4a17cf0e07 move deleteImage logic to ImageUploader 2020-02-19 15:55:10 +01:00
Alina Beck
888051a6ae simplify formData in ContributionForm 2020-02-19 14:18:54 +01:00
Wolfgang Huß
3421afe4e0 Refactor tests, next step 2020-02-19 13:33:00 +01:00
Alina Beck
e38b6f9625 rename TeaserImage component to ImageUploader 2020-02-19 10:51:04 +01:00
roschaefer
f2e2db0bc7 fix(frontend): error when post.author null 2020-02-19 10:49:08 +01:00
Alina Beck
7d7b35d069 combine duplicate image uploader methods after merge 2020-02-19 10:46:27 +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
Alina Beck
6aecbd6c6d Merge branch 'master' into migrate-styleguide-card 2020-02-19 10:25:37 +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
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
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
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
Alina Beck
cca9ec8e81 avatar image spans 100% width and height 2020-02-18 16:17:27 +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
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
Alina Beck
e68b53eda2 add title to counter icons on PostTeaser 2020-02-18 10:25:42 +01:00
mattwr18
ee3a85f70f Merge branch 'master' of github.com:Human-Connection/Human-Connection into 3054-add-e2e-tests-image-uploader 2020-02-18 09:38:56 +01:00
dependabot-preview[bot]
ea6856310f
build(deps-dev): bump eslint-plugin-vue from 6.1.2 to 6.2.1 in /webapp 
Bumps [eslint-plugin-vue](https://github.com/vuejs/eslint-plugin-vue) from 6.1.2 to 6.2.1.
- [Release notes](https://github.com/vuejs/eslint-plugin-vue/releases)
- [Commits](https://github.com/vuejs/eslint-plugin-vue/compare/v6.1.2...v6.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-18 04:20:05 +00:00
roschaefer
2e19cf6592 fix(nuxt-env): Configuration issue with websockets 
After some intensive debugging I found out that `req` (on the server)
and `nuxtState` (on the client) have access to the configurations
changed at runtime.

How did I debug it:
```
yarn run build
env WEBSOCKET_URI=whatever yarn run start
```
I also put a `console.log` into `plugins/apollo-client.js`.
 2020-02-17 23:30:50 +01:00
mattwr18
3398c2c12a Merge branch 'master' of github.com:Human-Connection/Human-Connection into 3054-add-e2e-tests-image-uploader 2020-02-17 18:38:09 +01:00
abdellani
e3c95cbbf5 fixes linter error 2020-02-17 15:04:16 +01:00
Alina Beck
2510643361 improve mobile-responsiveness of BaseCard, following @mattwr18 suggestions 2020-02-17 10:56:07 +01:00
Alina Beck
ad385490bc follow @mattwr18 PR review 
- replace magic numbers with tokens
- remove unused name attribute
- use slot shorthand (for the slots added in this PR)
 2020-02-17 10:44:52 +01:00