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

5454 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mattwr18
ba3e0ca941 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1488-filter-posts-by-emotion 2019-09-09 16:59:35 +02:00
mattwr18
31a3f09caf Merge branch '1488-filter-posts-by-emotion' of github.com:Human-Connection/Human-Connection into 1488-filter-posts-by-emotion 2019-09-09 16:59:23 +02:00
mattwr18
3b056aacc1 Fix weird indentation issue with VS Code 2019-09-09 16:58:49 +02:00
aonomike
f23c9375f1 Merge branch '1488-filter-posts-by-emotion' of github.com:Human-Connection/Human-Connection into 1488-filter-posts-by-emotion 2019-09-09 17:52:00 +03:00
mattwr18
86d80c689c Fix indentation issue on EMOTED 2019-09-09 16:51:24 +02:00
aonomike
f1a5d215e3 Merge branch '1488-filter-posts-by-emotion' of github.com:Human-Connection/Human-Connection into 1488-filter-posts-by-emotion 2019-09-09 17:51:02 +03:00
mattwr18
919dc1924f Fix indent issue 2019-09-09 16:46:51 +02:00
mattwr18
b89043166b Add backend tests for filtering posts by emotions 
- Co-authored-by: Mike Aono <aonomike@gmail.com>
 2019-09-09 16:35:11 +02:00
Robert Schäfer
cbcb6e6aea
Merge pull request #1534 from Human-Connection/add-console-log-for-erros-geolocation 
Add console log for erros geolocation
 2019-09-09 15:45:23 +02:00
aonomike
9a6a3a6bea Test clicks on the emotions buttons 
- Add tests for clicks on the emotion button
- Refactor name of TOGGLE_EMOTIONS
 2019-09-09 15:42:10 +03:00
mattwr18
d3952e2ada Use debug npm package over console.log 
- @roschaefer `PR` review
- better because we can leave in the code base and show only when/if we
want to
 2019-09-09 14:32:01 +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
aonomike
11dd61c430 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1488-filter-posts-by-emotion 2019-09-09 12:29:57 +03: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
mattwr18
48e696dde4 Fix lint 2019-09-09 08:24:33 +02:00
mattwr18
079864a7a9 Add emotions buttons, get it filtering 2019-09-07 12:44:36 +02:00
mattwr18
3b5c02e276 Extract FollowsFilterMenuItems 
- remove now unnecessary FilterPostsMenuItems
 2019-09-07 12:41:19 +02:00
mattwr18
a63e132b41 Extract categories filter into own component 
- Co-authored-by: Brent Vardy <brent.vardy@challengelogic.net>
- Co-authored-by: Mike Aono <aonomike@gmail.com>
- Co-authored-by: Harald <harald.reingruber@gmx.at>
 2019-09-07 12:38:24 +02:00
mattwr18
30ea892aa1 Allow filter by multiple emotions, test getters 
- Co-authored-by: vardyb <brent.vardy@challengelogic.net>
- Co-aurhored-by: mike aono <aonomike@gmail.com>
 2019-09-07 12:37:03 +02:00
mattwr18
07c58fc03e Add emotions buttons, get it filtering 2019-09-07 12:37:03 +02:00
mattwr18
e81942c6f5 Extract FollowsFilterMenuItems 
- remove now unnecessary FilterPostsMenuItems
 2019-09-07 12:37:03 +02:00
mattwr18
8a3bd6b770 Extract categories filter into own component 
- Co-authored-by: Brent Vardy <brent.vardy@challengelogic.net>
- Co-authored-by: Mike Aono <aonomike@gmail.com>
- Co-authored-by: Harald <harald.reingruber@gmx.at>
 2019-09-07 12:37:03 +02: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
Wolfgang Huß
53be6d41ee
Merge pull request #1507 from Human-Connection/refactor_registration_spec 
Refactor registration.spec.js
 2019-09-06 16:47:21 +02:00
roschaefer
1bd57dfeb8 Fix console.errors in test 2019-09-06 16:42:16 +02:00
roschaefer
4358d5bb8f Follow @Tirokk's suggestion 
https://github.com/Human-Connection/Human-Connection/pull/1507#pullrequestreview-284841447
 2019-09-06 16:03:46 +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ß
9b4fa4721e
Merge pull request #1493 from Human-Connection/implement_better_statistics_resolver 
Implement better statistics resolver
 2019-09-06 14:55:18 +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
roschaefer
5b24a91d45 Implement better statistics resolver 2019-09-06 13:52:56 +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
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