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

5400 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
mattwr18
b04649e1ee Remove duplicate code 
- there was the same methods in user.js and user_management.js except
that the login was not filtering out deleted users, so it was failing
one test. Reverted changes back to the user.js from the master branch...
added back our changes.

Co-authored-by: Tirokk <wolle.huss@pjannto.com>
Co-authored-by: ogerly <fridolin@tutanota.com>
 2019-09-04 19:31:43 +02:00
mattwr18
c2c165c362 Fix lint 2019-09-04 18:45:52 +02:00
mattwr18
c92ba35db6 Remove trailing curly brace, update test 
Co-authored-by: Tirokk <wolle.huss@pjannto.com>
Co-authored-by: ogerly <fridolin@tutanota.com>
 2019-09-04 18:41:48 +02:00
mattwr18
2bf8247ddd Merge branch 'master' of github.com:Human-Connection/Human-Connection into C-1187-terms-and-conditions-confirmed-function 2019-09-04 18:24:02 +02:00
mattwr18
e5198babf0 Update the tests with comment.content 2019-09-04 18:01:47 +02:00
mattwr18
d42baa5160 Hide show more link if the content is shorter than 180 characters 2019-09-04 17:55:02 +02:00
Alina Beck
d1beed50d7 use masonry grid for related posts 2019-09-04 16:51:08 +01:00
Alina Beck
ba82765fa7 set cursor to auto on post card 2019-09-04 16:23:57 +01:00
Alina Beck
3607ce5fd0 set cursor to pointer on header logo 2019-09-04 16:18:44 +01:00
mattwr18
d81bbec00a
Merge pull request #1399 from Human-Connection/1395-hashtags-imported-with-not-allowed-chars 
🍰 Correct the import of tags from the Alpha and refactor editor hashtags
 2019-09-04 17:05:12 +02:00
mattwr18
17941678b1 Update export syntax, update maintenance worker/neo4j config 
- I was getting an error locally  Failed: error parsing query as Extended JSON: invalid JSON input
- updating the syntax to wrap the json in single quotes, and key/values
in double quotes fixed the issue
- update memory limits
 2019-09-04 16:53:13 +02:00
mattwr18
32388549a0 Revert use of variables in cql file 
- breaks the import functionality
 2019-09-04 16:24:48 +02:00
mattwr18
6b9bb4dfbb Merge branch '1395-hashtags-imported-with-not-allowed-chars' of github.com:Human-Connection/Human-Connection into 1395-hashtags-imported-with-not-allowed-chars 2019-09-04 16:19:01 +02:00
Wolfgang Huß
5d69a6fa76 Implemented "wait-on": "~3.3.0" again 
Don't know why this was removed!?
 2019-09-04 15:56:28 +02:00
Wolfgang Huß
0df086e07f Rename variables 2019-09-04 15:38:28 +02:00
mattwr18
538b2b77de Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1395-hashtags-imported-with-not-allowed-chars 2019-09-04 14:21:12 +02:00
Robert Schäfer
a7042c5fbc
Merge pull request #1461 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-config-prettier-6.2.0 
Bump eslint-config-prettier from 6.1.0 to 6.2.0 in /webapp
 2019-09-04 14:12:05 +02:00
Robert Schäfer
1c9d741136
Merge pull request #1458 from Human-Connection/dependabot/npm_and_yarn/webapp/nodemon-1.19.2 
Bump nodemon from 1.19.1 to 1.19.2 in /webapp
 2019-09-04 14:11:42 +02:00
Robert Schäfer
acd1c9604b
Merge pull request #1459 from Human-Connection/dependabot/npm_and_yarn/backend/nodemon-1.19.2 
Bump nodemon from 1.19.1 to 1.19.2 in /backend
 2019-09-04 14:11:25 +02:00
Robert Schäfer
1b0f01fab5
Merge pull request #1460 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-config-prettier-6.2.0 
Bump eslint-config-prettier from 6.1.0 to 6.2.0 in /backend
 2019-09-04 14:11:10 +02:00
Wolfgang Huß
0a86cb6c4d Merge branch '1395-hashtags-imported-with-not-allowed-chars' of https://github.com/Human-Connection/Human-Connection into 1395-hashtags-imported-with-not-allowed-chars 2019-09-04 14:01:28 +02:00