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

1495 Commits

Author SHA1 Message Date
Robert Schäfer
5586a2b5ea
Merge pull request #1512 from Human-Connection/refactor_email_middleware 
Refactor email middleware
 2019-09-11 01:58:37 +02:00
mattwr18
3712a5d2cf
Merge pull request #1513 from Human-Connection/bugfix_about_me_not_saved_on_signup_verification 
Bugfix: `about me` not saved on signup
 2019-09-10 17:37:22 +02:00
Robert Schäfer
6cebb61d0f
Merge pull request #1490 from Human-Connection/1488-filter-posts-by-emotion 
Filter posts by emotions
 2019-09-10 15:53:05 +02:00
roschaefer
b656b5aeb9 Check that about actually gets saved 2019-09-10 15:39:34 +02:00
mattwr18
1fda99e198
Merge pull request #1540 from Human-Connection/remove_editor_store 
Remove obsolete code
 2019-09-10 15:04:46 +02:00
mattwr18
0c83d276bb Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1488-filter-posts-by-emotion 2019-09-10 09:32:45 +02:00
mattwr18
72ae2a4e44 Improve CSS 
- filter by users followed button was slightly higher than emotions
buttons
 2019-09-10 09:31:59 +02:00
mattwr18
b91fab7a3c
Merge pull request #1541 from Human-Connection/dependabot/npm_and_yarn/webapp/human-connection/styleguide-0.5.21 
Bump @human-connection/styleguide from 0.5.19 to 0.5.21 in /webapp
 2019-09-10 08:32:57 +02:00
mattwr18
1b677b6cb4
Merge pull request #1532 from Human-Connection/dependabot/npm_and_yarn/webapp/babel/preset-env-7.6.0 
Bump @babel/preset-env from 7.5.5 to 7.6.0 in /webapp
 2019-09-10 08:32:29 +02:00
mattwr18
e6716302a3
Merge pull request #1529 from Human-Connection/dependabot/npm_and_yarn/webapp/vue-jest-3.0.5 
Bump vue-jest from 3.0.4 to 3.0.5 in /webapp
 2019-09-10 08:31:45 +02:00
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
dependabot-preview[bot]
5e05e78401
Bump @human-connection/styleguide from 0.5.19 to 0.5.21 in /webapp 
Bumps @human-connection/styleguide from 0.5.19 to 0.5.21.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-10 04:22:57 +00:00
roschaefer
a8222c5290 Remove obsolete code 
I believe this is obsolete code. Could someone double-check?

@mattwr18 I tried to see any difference to `master` and I couldn't. Did
I miss sth.?

For context: During my work on https://github.com/Human-Connection/Human-Connection/pull/1517
the webapp was complaining about missing mutations when I changed the
dropdown.
 2019-09-10 03:35:10 +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
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
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
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
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
dependabot-preview[bot]
23a14534b7
Bump @babel/preset-env from 7.5.5 to 7.6.0 in /webapp 
Bumps [@babel/preset-env](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:25:22 +00:00
dependabot-preview[bot]
d090161e4f
Bump vue-jest from 3.0.4 to 3.0.5 in /webapp 
Bumps [vue-jest](https://github.com/vuejs/vue-jest) from 3.0.4 to 3.0.5.
- [Release notes](https://github.com/vuejs/vue-jest/releases)
- [Commits](https://github.com/vuejs/vue-jest/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-09 04:24:27 +00: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
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
roschaefer
2ca508ba2f Rename code => nonce in webapp/ 2019-09-06 19:31:04 +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
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