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

10382 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mattwr18
27a2ccd9ae Merge branch 'master' of github.com:Human-Connection/Human-Connection into remove-data-test-attributes-in-production 2019-12-10 13:31:10 +01:00
Moriz Wahl
bdbabc2d12 Cleaning up backend, bugfix in frontend 2019-12-10 12:34:12 +01:00
Alina Beck
8f70ce5b31 set up css resets 2019-12-10 13:17:04 +03:00
mattwr18
65cf8e4792
Merge pull request #2443 from Human-Connection/2237-longer-comments 
Fix #2237, Comments 4 times as long before "show more"
 2019-12-10 11:07:24 +01:00
mattwr18
4af63ee0aa
Merge pull request #2404 from Human-Connection/get_rid_of_inconsistency_with_setup_neode 
Get rid of inconsistency with neode setup
 2019-12-10 11:04:35 +01:00
Moriz Wahl
72e4d0abbc Basic Search Is Working For Users And Posts 
The story of SearchInput.vue throws errors because of line 81, dateTime. What must be included to fix this?
The search results shown by the frontend are sometimes differnt from the response of the backend. It shows no results found though there are results incoming.
Tests are not implemented yet.
 2019-12-10 10:36:08 +01:00
Moriz Wahl
fa3d6c6c08 backend basics are working 2019-12-10 10:36:08 +01:00
Moriz Wahl
77cdc34bfd backend still not working 2019-12-10 10:36:08 +01:00
Moriz Wahl
cad527f906 removed unnecessary file 2019-12-10 10:36:08 +01:00
Moriz Wahl
4264bb2af7 Trying to get the backend working 2019-12-10 10:36:08 +01:00
Moriz Wahl
81842592df Simple Implementation In Stroybook Of SearchInput 
By the way, I added *~ to .gitignore, which are the backups of emacs editor.
See the Storybook of SearchInput.
Problems:
* I found no way to separate the heading of the search results from the first item. Do we have to write a complete new component for this?
* The incoming data must by sorted by type before passed to the component. I added keys searchType and firstType, to identify the type (post/user) (may be as a locale) and to know when I have to place the heading.
 2019-12-10 10:36:08 +01:00
Moriz Wahl
3e6124fd92 Add Basic Story For SearchInput 
I had to remove `| dateTime('dd.MM.yyyy')` in line 61 of the vue file due to issues with $i18n which surely can be easyly solved.
The idea is, that `results` is an object which contains the keys `posts` and `users`. The values are arrays with the search results.
 2019-12-10 10:35:25 +01:00
Moriz Wahl
7d17c5c6d7 Created Folder For SearchInput And Changed Paths 2019-12-10 10:35:25 +01:00
Moriz Wahl
646df3e2b0 updated story 2019-12-10 10:34:42 +01:00
Moriz Wahl
3d2c501377 changed data structure 2019-12-10 10:34:42 +01:00
Moriz Wahl
595320dd1b Simple Implementation In Stroybook Of SearchInput 
By the way, I added *~ to .gitignore, which are the backups of emacs editor.
See the Storybook of SearchInput.
Problems:
* I found no way to separate the heading of the search results from the first item. Do we have to write a complete new component for this?
* The incoming data must by sorted by type before passed to the component. I added keys searchType and firstType, to identify the type (post/user) (may be as a locale) and to know when I have to place the heading.
 2019-12-10 10:34:42 +01:00
Moriz Wahl
f9678a7512 Simple Implementation In Stroybook Of SearchInput 
By the way, I added *~ to .gitignore, which are the backups of emacs editor.
See the Storybook of SearchInput.
Problems:
* I found no way to separate the heading of the search results from the first item. Do we have to write a complete new component for this?
* The incoming data must by sorted by type before passed to the component. I added keys searchType and firstType, to identify the type (post/user) (may be as a locale) and to know when I have to place the heading.
 2019-12-10 10:34:42 +01:00
Moriz Wahl
ee1bc67696 Add Basic Story For SearchInput 
I had to remove `| dateTime('dd.MM.yyyy')` in line 61 of the vue file due to issues with $i18n which surely can be easyly solved.
The idea is, that `results` is an object which contains the keys `posts` and `users`. The values are arrays with the search results.
 2019-12-10 10:33:18 +01:00
Moriz Wahl
6b68e18be6 Created Folder For SearchInput And Changed Paths 2019-12-10 10:32:11 +01:00
Moriz Wahl
79596ab375 updated story 2019-12-10 10:31:04 +01:00
Moriz Wahl
433e7d409a changed data structure 2019-12-10 10:31:04 +01:00
Moriz Wahl
8758bc9e42 Simple Implementation In Stroybook Of SearchInput 
By the way, I added *~ to .gitignore, which are the backups of emacs editor.
See the Storybook of SearchInput.
Problems:
* I found no way to separate the heading of the search results from the first item. Do we have to write a complete new component for this?
* The incoming data must by sorted by type before passed to the component. I added keys searchType and firstType, to identify the type (post/user) (may be as a locale) and to know when I have to place the heading.
 2019-12-10 10:28:43 +01:00
Moriz Wahl
6475458fe8 Add Basic Story For SearchInput 
I had to remove `| dateTime('dd.MM.yyyy')` in line 61 of the vue file due to issues with $i18n which surely can be easyly solved.
The idea is, that `results` is an object which contains the keys `posts` and `users`. The values are arrays with the search results.
 2019-12-10 10:28:43 +01:00
Moriz Wahl
9f4702d002 Created Folder For SearchInput And Changed Paths 2019-12-10 10:28:43 +01:00
mattwr18
383ef035c0
Merge pull request #2468 from Human-Connection/bump-styleguide-version 
Bump styleguide to version 0.5.22
 2019-12-10 09:56:35 +01:00
Alina Beck
fef65729a6 update lockfile 2019-12-10 10:21:14 +03:00
dependabot-preview[bot]
eef7eb4b0f
build(deps-dev): bump eslint-plugin-import in /webapp 
Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import) from 2.18.2 to 2.19.1.
- [Release notes](https://github.com/benmosher/eslint-plugin-import/releases)
- [Changelog](https://github.com/benmosher/eslint-plugin-import/blob/master/CHANGELOG.md)
- [Commits](https://github.com/benmosher/eslint-plugin-import/compare/v2.18.2...v2.19.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-10 04:21:35 +00:00
dependabot-preview[bot]
caceb0d83d
build(deps-dev): bump css-loader from 3.2.1 to 3.3.0 in /webapp 
Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 3.2.1 to 3.3.0.
- [Release notes](https://github.com/webpack-contrib/css-loader/releases)
- [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/css-loader/compare/v3.2.1...v3.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-10 04:20:10 +00:00
dependabot-preview[bot]
9d992897f0
build(deps-dev): bump eslint-plugin-import in /backend 
Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import) from 2.18.2 to 2.19.1.
- [Release notes](https://github.com/benmosher/eslint-plugin-import/releases)
- [Changelog](https://github.com/benmosher/eslint-plugin-import/blob/master/CHANGELOG.md)
- [Commits](https://github.com/benmosher/eslint-plugin-import/compare/v2.18.2...v2.19.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-10 04:19:26 +00:00
dependabot-preview[bot]
d112b33577
build(deps): bump @sentry/node from 5.10.1 to 5.10.2 in /backend 
Bumps [@sentry/node](https://github.com/getsentry/sentry-javascript) from 5.10.1 to 5.10.2.
- [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.10.1...5.10.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-10 04:18:54 +00:00
roschaefer
30870d832b Quick fix for null pointer error 
`this.openMenu` is not a function`
 2019-12-10 02:47:19 +01:00
Robert Schäfer
6dd435a4d1
Merge pull request #2456 from Human-Connection/dependabot/npm_and_yarn/backend/nodemailer-6.4.1 
build(deps): bump nodemailer from 6.4.0 to 6.4.1 in /backend
 2019-12-09 22:18:44 +01:00
dependabot-preview[bot]
be8b712bb9
build(deps-dev): bump @babel/preset-env from 7.7.4 to 7.7.6 in /backend 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.7.4 to 7.7.6.
- [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.4...v7.7.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-09 21:18:27 +00:00
Robert Schäfer
1fb442db07
Merge branch 'master' into dependabot/npm_and_yarn/backend/babel/cli-7.7.5 2019-12-09 22:18:15 +01:00
dependabot-preview[bot]
fd82775779
build(deps-dev): bump @babel/preset-env from 7.7.4 to 7.7.6 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.7.4 to 7.7.6.
- [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.4...v7.7.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-09 21:18:13 +00:00
Robert Schäfer
147cc73adb
Merge pull request #2459 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-loader-3.0.3 
build(deps-dev): bump eslint-loader from 3.0.2 to 3.0.3 in /webapp
 2019-12-09 22:17:32 +01:00
Robert Schäfer
e3fcb9adbd
Merge pull request #2460 from Human-Connection/dependabot/npm_and_yarn/backend/babel/core-7.7.5 
build(deps-dev): bump @babel/core from 7.7.4 to 7.7.5 in /backend
 2019-12-09 22:17:16 +01:00
Robert Schäfer
4dd548174d
Merge pull request #2461 from Human-Connection/dependabot/npm_and_yarn/webapp/babel/core-7.7.5 
build(deps-dev): bump @babel/core from 7.7.4 to 7.7.5 in /webapp
 2019-12-09 22:16:39 +01:00
Robert Schäfer
c2924a1886
Merge pull request #2463 from Human-Connection/dependabot/npm_and_yarn/webapp/babel/preset-env-7.7.6 
build(deps-dev): bump @babel/preset-env from 7.7.4 to 7.7.6 in /webapp
 2019-12-09 22:16:15 +01:00
Robert Schäfer
8d2ed484ea
Merge pull request #2464 from Human-Connection/dependabot/npm_and_yarn/webapp/async-validator-3.2.3 
build(deps-dev): bump async-validator from 3.2.2 to 3.2.3 in /webapp
 2019-12-09 22:15:54 +01:00
Robert Schäfer
4ebf7a281f
Merge pull request #2465 from Human-Connection/dependabot/submodules/styleguide-7ef8340 
build(deps): bump styleguide from `808b3c5` to `7ef8340`
 2019-12-09 22:15:25 +01:00
mattwr18
a370c56b0b
Merge pull request #2466 from Human-Connection/2442-paginate-moderation-page 
Paginate moderations page without losing filtering
 2019-12-09 21:23:12 +01:00
roschaefer
5271337b49 Reduce the number of database calls even more 2019-12-09 18:49:27 +01:00
mattwr18
60bf819a56 Remove counts to make less expensive db requests 2019-12-09 17:41:38 +01:00
Alina Beck
b7970e701c
Bump styleguide to version 0.5.22 2019-12-09 18:59:16 +03:00
mattwr18
79c6bd5c20 Paginate moderations page without losing filtering 
Co-authored-by: Tirokk <wolle.huss@pjannto.com>
 2019-12-09 16:37:04 +01:00
Robert Schäfer
f41b52f6e0
Merge pull request #2451 from Human-Connection/erhardtstiefel-patch-8 
Update it.json
 2019-12-09 15:37:23 +01:00
dependabot-preview[bot]
9a9ccc59fa
build(deps): bump styleguide from 808b3c5 to 7ef8340 
Bumps [styleguide](https://github.com/Human-Connection/Nitro-Styleguide) from `808b3c5` to `7ef8340`.
- [Release notes](https://github.com/Human-Connection/Nitro-Styleguide/releases)
- [Commits](808b3c5a95...7ef8340500)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-09 04:45:47 +00:00
dependabot-preview[bot]
65c4b1e43e
build(deps-dev): bump async-validator from 3.2.2 to 3.2.3 in /webapp 
Bumps [async-validator](https://github.com/yiminghe/async-validator) from 3.2.2 to 3.2.3.
- [Release notes](https://github.com/yiminghe/async-validator/releases)
- [Changelog](https://github.com/yiminghe/async-validator/blob/master/HISTORY.md)
- [Commits](https://github.com/yiminghe/async-validator/compare/v3.2.2...v3.2.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-09 04:22:27 +00:00
dependabot-preview[bot]
ca9c73dc53
build(deps-dev): bump @babel/preset-env from 7.7.4 to 7.7.6 in /webapp 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.7.4 to 7.7.6.
- [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.4...v7.7.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-09 04:21:55 +00:00