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

5571 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Schäfer
3aafddca02
Merge pull request #1492 from Human-Connection/1487-fix_admin_page 
1487 fix admin page
 2019-09-06 13:45:14 +02:00
roschaefer
1a1f73e53e Fix specs 
Destructuring `isModerator` and calling it in `displayAnonymous` lets
`Notification.spec.js` fail. Adding the getter fixes it.
 2019-09-06 13:43:01 +02:00
roschaefer
e04eedf0d0 Fix and DRY hc-avatar stylings 2019-09-06 13:36:11 +02:00
roschaefer
a053181334 Fix #1506 2019-09-06 13:29:53 +02:00
roschaefer
160552734d Move softDeleteMiddleware into its own folder 2019-09-06 13:12:30 +02:00
mattwr18
daf1ae864c Reuse css from ds-card-image, consistent width 
- the width of the contribution form is now the same as the post card
 2019-09-06 13:08:28 +02:00
mattwr18
d3ad06a5f0 Fix preview image craziness 
- depending on the size of the image, the preview looked really blurry
Also, the preview image differed from the image on the PostCard
 2019-09-06 12:17:09 +02:00
roschaefer
4005d2fb01 Fix #1505 remove html 2019-09-06 12:10:41 +02:00
roschaefer
f58c1c7cf0 Refactor registration.spec.js 
Only 7 specs left that still use GraphQLClient
 2019-09-06 11:37:40 +02:00
roschaefer
0b464bf596 Fix leftover of #1479 2019-09-06 10:22:11 +02:00
Robert Schäfer
345a4952b9
Merge pull request #1497 from Human-Connection/dependabot/docker/neo4j/neo4j-3.5.9 
Bump neo4j from 3.5.8 to 3.5.9 in /neo4j
 2019-09-06 09:23:22 +02:00
Robert Schäfer
a95c115212
Merge pull request #1498 from Human-Connection/dependabot/docker/backend/node-12.10.0-alpine 
Bump node from 12.9-alpine to 12.10.0-alpine in /backend
 2019-09-06 09:20:39 +02:00
Robert Schäfer
b8b2d511b5
Merge pull request #1499 from Human-Connection/dependabot/docker/webapp/node-12.10.0-alpine 
Bump node from 12.9-alpine to 12.10.0-alpine in /webapp
 2019-09-06 09:20:22 +02:00
Robert Schäfer
cc9c2d33e6
Merge pull request #1495 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-plugin-jest-22.17.0 
Bump eslint-plugin-jest from 22.16.0 to 22.17.0 in /backend
 2019-09-06 09:18:59 +02:00
Robert Schäfer
20b8be26b2
Merge pull request #1496 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-jest-22.17.0 
Bump eslint-plugin-jest from 22.16.0 to 22.17.0 in /webapp
 2019-09-06 09:18:33 +02:00
dependabot-preview[bot]
a646b0d19e
Bump node from 12.9-alpine to 12.10.0-alpine in /webapp 
Bumps node from 12.9-alpine to 12.10.0-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-06 04:25:23 +00:00
dependabot-preview[bot]
8d4874effb
Bump node from 12.9-alpine to 12.10.0-alpine in /backend 
Bumps node from 12.9-alpine to 12.10.0-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-06 04:25:14 +00:00
dependabot-preview[bot]
0568f049bd
Bump neo4j from 3.5.8 to 3.5.9 in /neo4j 
Bumps neo4j from 3.5.8 to 3.5.9.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-06 04:23:18 +00:00
dependabot-preview[bot]
8362e4c94f
Bump eslint-plugin-jest from 22.16.0 to 22.17.0 in /webapp 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.16.0 to 22.17.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/v22.16.0...v22.17.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-06 04:22:36 +00:00
dependabot-preview[bot]
c963dee8d9
Bump eslint-plugin-jest from 22.16.0 to 22.17.0 in /backend 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.16.0 to 22.17.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/v22.16.0...v22.17.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-06 04:22:27 +00:00
roschaefer
c61b03483e Failed to write a test for admin/index.vue 
I am not able to properly mock the data for ApolloQuery. However I find
it valuable to push this particular piece of dead code. Maybe people find
it helpful.
 2019-09-05 19:07:12 +02:00
roschaefer
c129c3fbae Admin page handles loading and error state 2019-09-05 17:22:04 +02:00
mattwr18
37f281b441
Merge pull request #1479 from Human-Connection/1394-proper_pagination_implementation 
Fix #1394
 2019-09-05 14:23:57 +02:00
mattwr18
5af960e2eb
Merge pull request #1484 from Human-Connection/update_maintenace_worker_image 
Update maintenace worker image
 2019-09-05 14:18:39 +02:00
roschaefer
0fca14a29e Fix nullpointer issues 
It seems that `this.$apollo.queries.Post` can be undefined sometimes.
Honestly I don't know why but I could imagine that it might happen on
subpages and when the cypress test triggers the infinite loader, we
face this bug.
 2019-09-05 13:07:22 +02:00
roschaefer
cce4ce07df Increase default split size a little 2019-09-05 12:52:20 +02:00
roschaefer
ab96e30bf4 Always pull down the maintenance-worker image 2019-09-05 12:50:47 +02:00
roschaefer
da57e9391c Fix #1394 
It seems that we weren't using the API of `vue-apollo` in the right way.
The `update` callback is to transform the results (e.g. to map between
the server response and a `data` attribute with a different name). For
pagination there is a dedicated procedure called `fetchMore`. See:

* https://vue-apollo.netlify.com/guide/apollo/pagination.html
* https://vue-apollo.netlify.com/guide/components/query.html#query-operations
 2019-09-05 11:30:37 +02:00
Robert Schäfer
2fa8658beb
Merge pull request #1481 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-node-10.0.0 
Bump eslint-plugin-node from 9.2.0 to 10.0.0 in /webapp
 2019-09-05 11:14:59 +02:00
Robert Schäfer
c9e9f1bc4c
Merge pull request #1482 from Human-Connection/dependabot/npm_and_yarn/backend/helmet-3.21.0 
Bump helmet from 3.20.1 to 3.21.0 in /backend
 2019-09-05 11:14:42 +02:00
Robert Schäfer
8177fff5af
Merge pull request #1483 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-plugin-node-10.0.0 
Bump eslint-plugin-node from 9.2.0 to 10.0.0 in /backend
 2019-09-05 11:14:17 +02:00
Wolfgang Huß
2f99a3956f
Merge pull request #1473 from Human-Connection/update-legacy-migration-config 
Update export syntax, update maintenance worker/neo4j config
 2019-09-05 09:39:28 +02:00
Wolfgang Huß
016e60b14c
Merge pull request #1476 from Human-Connection/1393-fix-show-less-bugginess 
1393 fix show less bugginess
 2019-09-05 08:44:40 +02:00
mattwr18
60659626c8 Merge branch 'master' of github.com:Human-Connection/Human-Connection into update-legacy-migration-config 2019-09-05 08:11:01 +02:00
mattwr18
4e065325d1
Merge pull request #1480 from Human-Connection/cleanup_unused_code 
Remove a lot of unused code, reduce graphql schema
 2019-09-05 08:03:39 +02:00
mattwr18
e1dc3f7e1e
Merge pull request #1478 from Human-Connection/remove_sorting_options 
Remove slow sorting options
 2019-09-05 08:00:41 +02:00
mattwr18
02e53494f5
Merge pull request #1477 from Human-Connection/return_null_for_missing_tac_version 
If TAC version is missing, return `null`
 2019-09-05 08:00:09 +02:00
dependabot-preview[bot]
c69e1e836d
Bump eslint-plugin-node from 9.2.0 to 10.0.0 in /backend 
Bumps [eslint-plugin-node](https://github.com/mysticatea/eslint-plugin-node) from 9.2.0 to 10.0.0.
- [Release notes](https://github.com/mysticatea/eslint-plugin-node/releases)
- [Commits](https://github.com/mysticatea/eslint-plugin-node/compare/v9.2.0...v10.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-05 04:22:25 +00:00
dependabot-preview[bot]
63ea447ef9
Bump helmet from 3.20.1 to 3.21.0 in /backend 
Bumps [helmet](https://github.com/helmetjs/helmet) from 3.20.1 to 3.21.0.
- [Release notes](https://github.com/helmetjs/helmet/releases)
- [Changelog](https://github.com/helmetjs/helmet/blob/master/CHANGELOG.md)
- [Commits](https://github.com/helmetjs/helmet/compare/v3.20.1...v3.21.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-05 04:21:40 +00:00
dependabot-preview[bot]
251ff89fda
Bump eslint-plugin-node from 9.2.0 to 10.0.0 in /webapp 
Bumps [eslint-plugin-node](https://github.com/mysticatea/eslint-plugin-node) from 9.2.0 to 10.0.0.
- [Release notes](https://github.com/mysticatea/eslint-plugin-node/releases)
- [Commits](https://github.com/mysticatea/eslint-plugin-node/compare/v9.2.0...v10.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-05 04:21:19 +00:00
roschaefer
66ed78e19b Remove a lot of unused code, reduce graphql schema 2019-09-05 03:20:32 +02:00
roschaefer
38ea74379a If TAC version is missing, return null 2019-09-05 01:24:51 +02:00
roschaefer
aea9caee80 Remove slow sorting options 
Sadly, I think this the only way for now. As I explained in
https://github.com/Human-Connection/Human-Connection/issues/1272#issuecomment-527864948
I think we cannot do anything about it on our side for now.
 2019-09-04 23:46:18 +02:00
Robert Schäfer
127d98c475
Merge pull request #1446 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-soundcloud-5.6.7 
Bump metascraper-soundcloud from 5.6.6 to 5.6.7 in /backend
 2019-09-04 23:23:58 +02:00
Robert Schäfer
467c8b7549
Merge pull request #1447 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-youtube-5.6.7 
Bump metascraper-youtube from 5.6.6 to 5.6.7 in /backend
 2019-09-04 23:23:49 +02:00
Robert Schäfer
8d2ea9c4c0
Merge pull request #1474 from Human-Connection/cursor-fixes 
Cursor fixes
 2019-09-04 23:20:57 +02:00
mattwr18
4ca84ee04a
Merge pull request #1334 from Human-Connection/C-1187-terms-and-conditions-confirmed-function 
Check if user has agreed to the current terms and conditions
 2019-09-04 20:55:09 +02:00
Alina Beck
b50f18b340 steal better solution from @roschaefer commit f0cde51 2019-09-04 19:20:15 +01:00
Wolfgang Huß
7bdc6b52d2 Fixed Cypress tests 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
Co-Authored-By: ogerly <fridolin@tutanota.com>
 2019-09-04 20:19:45 +02:00
Robert Schäfer
b19601122b
Merge pull request #1475 from Human-Connection/fix-more-info-posts 
Fix related posts section in 'More Info'
 2019-09-04 19:41:26 +02:00