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

1469 Commits

Author SHA1 Message Date
mattwr18
d44b515e92
Merge pull request #1527 from Human-Connection/dependabot/npm_and_yarn/webapp/date-fns-2.1.0 
Bump date-fns from 2.0.1 to 2.1.0 in /webapp
 2019-09-10 08:31:23 +02:00
mattwr18
da359e5e71
Merge pull request #1525 from Human-Connection/dependabot/npm_and_yarn/webapp/babel/core-7.6.0 
Bump @babel/core from 7.5.5 to 7.6.0 in /webapp
 2019-09-10 08:31:08 +02:00
Alexander Friedland
f327cc01dd
Merge pull request #1539 from Human-Connection/1462-Sorting_dropdown_should_be_aligned_with_post_cards 
[WIP] Sorting dropdown is aligned with post cards
 2019-09-09 19:18:12 +02:00
Wolfgang Huß
20b54b050f
Merge pull request #1514 from Human-Connection/fix_css_on_profile_page 
Avatar should be centered on profile page
 2019-09-09 19:16:56 +02:00
Wolfgang Huß
f1b52c7b81
Merge pull request #1536 from Human-Connection/fix-test-set-up 
Fix test by setting value of the mocked hashtag
 2019-09-09 17:17:44 +02:00
ogerly
e278fa4afc Padding remove 2019-09-09 16:45:11 +02:00
Wolfgang Huß
f72bccbebe Fix lint prettier 2019-09-09 16:43:54 +02:00
aonomike
34ddd12948 Fix test by setting value of the mocked hashtag 
- The test wasnt testing anything as the hashtag value was defaulting to null
- Fixed by setting value of hashtag to a string and then testing if the clearSearch works
 2019-09-09 16:22:21 +03:00
roschaefer
28776d7a6a Avatar should be centered on profile page 
This is a fix of e04eedf0d07ff66dba3e881e9ef8bdf5a868619e
 2019-09-09 15:02:56 +02:00
mattwr18
2aef2add3d Add temporarily console.log statements to debug failed API call 
- in production environment, the user locationName is updated, but it is
failing the `createOrUpdateLocations` function in backend/src/middleware/nodes/locations.js
For some reason, it seems like the API call is coming back with
something other than what we are looking for.
Need help debugging... we can remove this code after we figure out
what's wrong
 2019-09-09 12:53:47 +02:00
mattwr18
e819ade8cb Add console.log statement on error to help debug 
- Geolocation is working in development, but not on staging or
production
 2019-09-09 09:54:38 +02:00
mattwr18
3d419c1f21
Merge pull request #1508 from Human-Connection/1505_remove_html_in_moderation_view 
Fix #1505 remove html
 2019-09-09 08:49:00 +02:00
dependabot-preview[bot]
537c5c7c7b
Bump date-fns from 2.0.1 to 2.1.0 in /webapp 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.0.1 to 2.1.0.
- [Release notes](https://github.com/date-fns/date-fns/releases)
- [Changelog](https://github.com/date-fns/date-fns/blob/master/CHANGELOG.md)
- [Commits](https://github.com/date-fns/date-fns/compare/v2.0.1...v2.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-09 04:23:54 +00:00
dependabot-preview[bot]
b4c6963e8e
Bump @babel/core from 7.5.5 to 7.6.0 in /webapp 
Bumps [@babel/core](https://github.com/babel/babel) from 7.5.5 to 7.6.0.
- [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.5.5...v7.6.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-09 04:23:06 +00:00
Wolfgang Huß
80d1e03c03
Merge pull request #1510 from Human-Connection/1506-anonymize_deleted_user 
1506 Anonymize deleted user also for moderators
 2019-09-06 17:12:31 +02:00
roschaefer
1bd57dfeb8 Fix console.errors in test 2019-09-06 16:42:16 +02:00
Wolfgang Huß
f0923ad864 Add hashtag for the comment id to the comments links of the list 2019-09-06 15:55:11 +02:00
Wolfgang Huß
40103e84e7 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1505_remove_html_in_moderation_view 2019-09-06 15:52:47 +02:00
Wolfgang Huß
a82882529c
Merge pull request #1504 from Human-Connection/fix_broken_pagination_on_user_profile 
Fix leftover of #1479
 2019-09-06 14:37:20 +02:00
Robert Schäfer
1932c03b95
Merge pull request #1509 from Human-Connection/1199-fix-preview-image-craziness 
Fix preview image craziness
 2019-09-06 14:02:18 +02:00
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
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
0b464bf596 Fix leftover of #1479 2019-09-06 10:22:11 +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
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]
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
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
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