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

1437 Commits

Author SHA1 Message Date
roschaefer
c129c3fbae Admin page handles loading and error state 2019-09-05 17:22:04 +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
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
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
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
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
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
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
mattwr18
c2c165c362 Fix lint 2019-09-04 18:45:52 +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
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ß
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
dependabot-preview[bot]
58d2a8e996
Bump nodemon from 1.19.1 to 1.19.2 in /webapp 
Bumps [nodemon](https://github.com/remy/nodemon) from 1.19.1 to 1.19.2.
- [Release notes](https://github.com/remy/nodemon/releases)
- [Commits](https://github.com/remy/nodemon/compare/v1.19.1...v1.19.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-04 09:54:56 +00:00
dependabot-preview[bot]
4decb2c60a
Bump eslint-config-prettier from 6.1.0 to 6.2.0 in /webapp 
Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) from 6.1.0 to 6.2.0.
- [Release notes](https://github.com/prettier/eslint-config-prettier/releases)
- [Changelog](https://github.com/prettier/eslint-config-prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/eslint-config-prettier/compare/v6.1.0...v6.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-04 09:53:48 +00:00
mattwr18
25bd96eedf Remove package-lock.json 
- we are using yarn as a package manager
 2019-09-04 10:58:33 +02:00
mattwr18
b3964a1439 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1395-hashtags-imported-with-not-allowed-chars 2019-09-04 10:46:44 +02:00
mattwr18
fdee7efa03 Fix lint 2019-09-04 08:12:11 +02:00
ogerly
643b931167 Merge branch 'C-1187-terms-and-conditions-confirmed-function' of https://github.com/Human-Connection/Human-Connection into C-1187-terms-and-conditions-confirmed-function 2019-09-04 07:04:17 +02:00
ogerly
c64ff67a55 Fixed constant for terms and conditions created in folder for constant 2019-09-04 07:03:56 +02:00
Alexander Friedland
e618ff005d
Merge branch 'master' into C-1187-terms-and-conditions-confirmed-function 2019-09-04 06:42:40 +02:00
dependabot-preview[bot]
7bb52343f1
Bump cross-env from 5.2.0 to 5.2.1 in /webapp 
Bumps [cross-env](https://github.com/kentcdodds/cross-env) from 5.2.0 to 5.2.1.
- [Release notes](https://github.com/kentcdodds/cross-env/releases)
- [Changelog](https://github.com/kentcdodds/cross-env/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kentcdodds/cross-env/compare/v5.2.0...v5.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-03 22:02:27 +00:00
mattwr18
290bdf5ff4
Merge pull request #1440 from Human-Connection/1414-soft_delete 
1414 Implement soft delete
 2019-09-03 23:59:52 +02:00
roschaefer
5f14b4c45f Fix lint 2019-09-03 23:19:55 +02:00
mattwr18
9bb0884f89 Follow @alina-beck's PR suggestions 
- save regex to descriptive variables
 2019-09-03 22:10:02 +02:00
roschaefer
99dd6ea20a Centralize fragments, fix @mattwr18's bugs 
Most of those bugs weren't even introduced in this PR, e.g. the missing
`this.$i18n` for the comments mutations.
 2019-09-03 21:28:29 +02:00
roschaefer
bb3f419532 Refactor graphql queries and fix bug 
It's sometimes unbelievable how many bugs you find when doing
refactoring. This time there was some apparent confusion about
`commentsCount` and `commentedCount`. The counters on the post card were
never showing the correct number.
 2019-09-03 21:28:29 +02:00
roschaefer
933e092549 Fix frontend tests 2019-09-03 21:28:29 +02:00
roschaefer
491a626031 Replace deleteComment with a more KISS solution 2019-09-03 21:28:29 +02:00
mattwr18
31862ad7d8 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1395-hashtags-imported-with-not-allowed-chars 2019-09-03 19:00:28 +02:00
Robert Schäfer
649c51c705
Merge pull request #1452 from Human-Connection/separate-text-at-words 
Use hyphens to separate words properly
 2019-09-03 18:12:02 +02:00
mattwr18
2d9cd96867 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1395-hashtags-imported-with-not-allowed-chars 2019-09-03 17:44:53 +02:00
Alina Beck
f34ff188eb disable scrolling behind popover 2019-09-03 11:44:22 +01:00
Alexander Friedland
41767cc27e
Merge branch 'master' into C-1187-terms-and-conditions-confirmed-function 2019-09-03 09:51:12 +02:00
ogerly
1b9303ceaf Jest tests for the Terms and Conditions in frontend and backend 2019-09-03 09:46:18 +02:00
Alina Beck
0fd0cdbe34 separate post title and content with hyphens 2019-09-02 16:46:41 +01:00
Matt Rider
accb8ae505 Follow @alina-beck's suggestions 
- set items to the full list of hashtags or users to avoid unnecessarily reassigning the items variable based on suggestionType
- refactor tests to trigger onFilter, which calls filterSuggestionList, then check that it returns a maximum of 15 items both for queries and empty queries
- fix description with incorrect type(users, instead of hashtags)
- return 15 items, not 14
 2019-09-02 15:43:18 +02:00
Matt Rider
d1309d2b8f Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1395-hashtags-imported-with-not-allowed-chars 2019-09-02 12:51:11 +02:00
Matt Rider
cf10b650ae Limit suggestions list to 15, add component tests 2019-09-02 10:42:37 +02:00
roschaefer
98194ef54a Follow @mattwr18's suggestions 2019-08-30 16:00:32 +02:00