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

667 Commits

Author SHA1 Message Date
roschaefer
2f90a45da7 Follow @Tirokk's review and fix a bug 
The bug happened because the hashtag link won't get parsed by the
extension. This is desired for mentions because you don't want to
re-notify a user if you haven't updated the text in which you notify
somebody. For hashtags this is undesired and would lead to transforming
the hashtag link into a normal link on the next edit of a post.
 2019-09-17 11:09:45 +02:00
Wolfgang Huß
02c6bf70f3 Change the dummy domain to https://human-connection.org 2019-09-17 10:16:12 +02:00
roschaefer
431de3319f Make data-hashtag-id authoritive for #links 
This adds consistency: The mention links with `@` was implemented
that way already. Instead of parsing the URL, we add some redundancy and
add another attribute: data-hashtag-id

So, what characters are valid for html attributes?
Read: https://stackoverflow.com/questions/925994/what-characters-are-allowed-in-an-html-attribute-name

Thanks to @Tirokk, who added some validations on the hahstag ids, I
think we are all set. If you try to write a hashtag with a `"` double
quotation mark for example, it gets automatically replaced with a valid
hashtag. If someone wants to send us invalid hashtag ids to the backend
directly, the regex there would filter it out.
 2019-09-16 23:09:32 +02:00
Wolfgang Huß
82d5ac99df Make hashtag links URL safe 2019-09-16 22:06:36 +02:00
Wolfgang Huß
22a005eb1c Show categories translated in all places and even in tooltips 
Show `#` symbol in front of hashtags.
Minor design changes on posts more info page.
 2019-09-16 11:14:13 +02:00
mattwr18
fb2cade2f9
Merge pull request #1537 from Human-Connection/1455-fix-update-comment-list 
🍰 Fixes a create and update comment problem in the comments list
 2019-09-12 18:36:30 +02:00
Robert Schäfer
ef0f0353ea
Merge pull request #1548 from Human-Connection/1491-fix-show-less-link-not-working-reliably 
Fix show less link not working reliably
 2019-09-12 16:36:05 +02:00
Wolfgang Huß
36a0844fdd Followed @mattwrd18 suggestion 2019-09-12 09:30:47 +02:00
mattwr18
73db6c5e58 Left align text on password-rest page 
- to maintain consistency with login page

- Co-authored-by: Mike Aono <aonomike@gmail.com>
 2019-09-11 16:40:39 +02:00
mattwr18
fa3053dca7 Tidy up, follow @roschaefer, @Tirokk PR suggestions 
- Fix tests by stubbing LocaleSwitch/client-only
- Add portuguese translations
- Add back to login link
- Use span over &nbsp following @alina-becks PR review on another PR
 2019-09-11 16:40:39 +02:00
Brent Vardy
ca49c2296c improved class names for current component 2019-09-11 16:40:39 +02:00
Brent Vardy
53408f4bf4 refactor create-user-account to have no header 
- also added locale switch to card
 2019-09-11 16:40:39 +02:00
Brent Vardy
ea16d1652a used no header for login and password reset pages 
- added locale switch back on login
- added locale switch to password reset
- increased width of login and password reset
- added logo to password reset

- co-authored-by: mattwr18 <mattwr18@gmail.com>
- co-authored-by: mikeaono <aonomike@gmail.com>
 2019-09-11 16:40:39 +02:00
Vasily Belolapotkov
f4b3c84815 moved footer styles into footer component and added shadow 2019-09-11 16:40:39 +02:00
Brent Vardy
5d73cad168 refactor page footer to component 2019-09-11 16:40:39 +02:00
Wolfgang Huß
7dc5856845 write tests and fix minor appearing and position problems with context menu 2019-09-11 15:13:31 +02:00
Wolfgang Huß
0e39f1de86 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1455-fix-update-comment-list 2019-09-11 13:56:50 +02:00
mattwr18
32849ae920 Fix show less link not working reliably 
- Add a span wrapping the show more/less links with a pointer cursor and
margin... it's now clear it should be clicked and reliable works
 2019-09-11 12:58:56 +02:00
Robert Schäfer
5273f8b9fa
Merge pull request #1533 from Human-Connection/293-fix-follower-counter 
[WIP] 🍰 Update follower count on follow/unfollow
 2019-09-11 12:33:56 +02:00
Wolfgang Huß
379f7d1ed7 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1455-fix-update-comment-list 
# Conflicts:
#	webapp/components/Comment.vue
#	webapp/components/CommentForm/CommentForm.spec.js
#	webapp/components/CommentForm/CommentForm.vue
#	webapp/components/EditCommentForm/EditCommentForm.vue
#	webapp/store/editor.js
 2019-09-11 07:58:40 +02:00
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
Vasily Belolapotkov
fac7faf877 Sync 293-fix-follower-counter with master 2019-09-10 09:02:52 +03:00
Wolfgang Huß
fb672410f9 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1455-fix-update-comment-list 2019-09-10 06:58:33 +02: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
Wolfgang Huß
f72bccbebe Fix lint prettier 2019-09-09 16:43:54 +02:00
Wolfgang Huß
2c732bfbfb Refactor create and update comment to emit events 2019-09-09 15:53:50 +02: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
Wolfgang Huß
9f203cda3b Refactor by melting EditCommentForm.vue into CommentForm.vue 2019-09-09 13:06:44 +02:00
Wolfgang Huß
3f4e717163 Move user queries to graphql/User.js 2019-09-09 10:58:10 +02:00
Wolfgang Huß
e544725e87 Remove editPending and SET_EDIT_PENDING from the store 2019-09-09 10:27:21 +02:00
Vasily Belolapotkov
beb78249f6 update follower count on follow/unfollow 2019-09-09 10:01:46 +03: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
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
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