Maksim Pechnikov
541a71c3a5
Merge branch 'develop' into feature/following_reblogs
2019-10-08 16:49:03 +03:00
Maksim Pechnikov
a26d550137
updated user_card
2019-10-08 16:46:54 +03:00
Henry Jameson
a2923570c3
fix regex shortcode problem
2019-09-30 23:45:03 +03:00
Hakaba Hitoyo
194dd88118
Feature/Add _Allow user discovery services_ preference
2019-09-26 22:31:28 +00:00
kaniini
4369ce6f1b
Merge branch 'hide-followers-follows-count' into 'develop'
...
Added a setting to hide follow/follower count from the user profile
See merge request pleroma/pleroma-fe!951
2019-09-26 22:20:01 +00:00
Maksim Pechnikov
19cb98b85f
Merge branch 'develop' into feature/following_reblogs
2019-09-26 21:14:31 +03:00
Henry Jameson
a3305799c7
Merge remote-tracking branch 'upstream/develop' into emoji-selector-update
...
* upstream/develop: (42 commits)
Fix formatting in oc.json
avoid using global class
fix logo moving bug when lightbox is open
Reserve scrollbar gap when body scroll is locked
setting display: initial makes trouble, instead, toggle display: none using classname
lock body scroll
add body-scroll-lock directive
install body-scroll-lock
wire up props with PostStatusModal
rename component
recover autofocusing behavior
refactor MobilePostStatusModal using new PostStatusModal
add new module and modal to post new status
remove needless condition
add mention button
wire up user state with global store
collapse fav/repeat notifications from muted users
do not collapse thread muted posts in conversation
detect thread-muted posts
do not change word based muting logic
...
2019-09-25 20:26:49 +03:00
Henry Jameson
0d6a9f5a62
comment, cleanup and improve autoresize/autoscroll
2019-09-25 19:30:55 +03:00
Henry Jameson
0f55359b49
fix
2019-09-25 08:43:02 +03:00
Henry Jameson
4f563e6efb
account for parent padding, too
2019-09-25 08:36:30 +03:00
Henry Jameson
daa0e284c3
forgotten file
2019-09-25 00:21:55 +03:00
eugenijm
aafb29c589
Added a setting to hide follow/follower count from the user profile
2019-09-23 16:19:21 +03:00
Maksim Pechnikov
8721fb57fc
added support hide\show reblogs from a specific user
2019-09-21 16:24:47 +03:00
rinpatch
1306fac38f
Merge branch 'develop' into 'muting-fixes'
...
# Conflicts:
# src/components/status/status.js
2019-09-16 11:38:37 +00:00
taehoon
6a3f283256
detect thread-muted posts
2019-09-13 22:59:24 -04:00
Henry Jameson
0d8b68632b
Remove emoji zoom
2019-09-12 20:25:11 +03:00
Shpuld Shpludson
4a469d7fe3
Merge branch 'fix/follow-request-detection' into 'develop'
...
Utilize `user.requested` to display follow request status on user card
Closes #635
See merge request pleroma/pleroma-fe!942
2019-09-12 07:02:11 +00:00
Henry Jameson
9146bee7aa
better hitbox for status emoji
2019-09-08 21:18:52 +03:00
taehoon
ea5b36a597
refactor toggling body visibility using class
2019-09-06 11:17:29 -04:00
Shpuld Shpludson
e75ac9ddbc
Merge branch 'mastoapi-externalprofile' into 'develop'
...
Replace `/api/externalprofile/show.json` with a MastoAPI equialent
See merge request pleroma/pleroma-fe!938
2019-09-06 04:13:21 +00:00
Eugenij
8ee5abb1a5
Password reset page
2019-09-05 11:23:28 +00:00
rinpatch
424d4ab57e
Utilize user.requested
to display follow request status on user card
...
Closes #635
2019-09-05 11:17:53 +03:00
rinpatch
1a5a7bbebf
Set thread_muted for all statuses with the same conversation id on
...
status mute/unmute
2019-09-04 21:11:13 +03:00
rinpatch
66a34b7ecf
Properly detect thread-muted posts and set with_muted
when fetching
...
notifications
2019-09-04 12:20:33 +03:00
rinpatch
457290e81e
Replace /api/externalprofile/show.json
with a MastoAPI equialent
...
`/api/v1/accounts/:id` supports remote nicknames since pleroma!1622
2019-09-03 19:59:28 +03:00
rinpatch
8e3d6f5c28
Use mastodon api in follow requests
2019-09-03 13:50:26 +03:00
rinpatch
114b5f6eff
Apply suggestion to src/services/follow_manipulate/follow_manipulate.js
2019-08-09 12:26:58 +00:00
rinpatch
5f3ac6625f
Apply suggestion to src/services/follow_manipulate/follow_manipulate.js
2019-08-09 12:25:58 +00:00
rinpatch
e83b321ff2
Apply suggestion to src/services/follow_manipulate/follow_manipulate.js
2019-08-09 12:01:57 +00:00
rinpatch
766bcc2a72
Fix sent follow request detection
...
This fixes `requestFollow` using the relationship instead of user object,
resulting in `sent` always being false for locked users, and also removes
assumptions about follow request being sent, instead relying on
`requested` from user relationship.
2019-08-09 15:01:13 +03:00
Shpuld Shpludson
92380652fe
Merge branch 'feat/conversation-muting' into 'develop'
...
Add Conversation/Thread Muting
See merge request pleroma/pleroma-fe!876
2019-08-08 10:09:07 +00:00
Lee Starnes
4fc27414d2
Handle JSONified errors while registering
...
Closes #617
2019-08-06 18:03:31 +00:00
Shpuld Shpludson
d3f6b581d1
Merge branch 'develop' into 'feat/conversation-muting'
...
# Conflicts:
# src/components/extra_buttons/extra_buttons.js
# src/components/extra_buttons/extra_buttons.vue
2019-07-26 12:44:32 +00:00
taehoon
876c6de806
fix typos
2019-07-24 21:02:37 -04:00
shpuld
619608ea7a
fix issues caused by merges in usersearch on @
2019-07-18 17:22:51 +03:00
Shpuld Shpludson
3370dd80dc
Merge branch 'develop' into 'feat/conversation-muting'
...
# Conflicts:
# src/services/api/api.service.js
2019-07-15 19:09:01 +00:00
Eugenij
69a4bcb238
New search
2019-07-15 16:42:27 +00:00
taehoon
670cbfdd1c
change subscribing to subscribed
2019-07-10 21:01:07 -04:00
taehoon
f4a16e6541
add subscribing to user entity normalizer
2019-07-10 21:01:07 -04:00
jared
f2c95f9d0b
#482 - add new endpoints to subscribe to the user
2019-07-10 21:01:07 -04:00
Tae Hoon
532b76eb64
Refactor user search api, better api error response handling
2019-07-10 16:58:49 +00:00
shpuld
7ed9d17ce7
Add thread muting to context menu of status
2019-07-07 23:02:09 +03:00
Shpuld Shpludson
54b0f90133
Merge branch 'eslint-fix' into 'develop'
...
Fix shitton warning eslint gives
See merge request pleroma/pleroma-fe!871
2019-07-07 19:12:33 +00:00
Shpuld Shpludson
171673113f
Merge branch 'revoke-token' into 'develop'
...
Revoke oAuth token on logout
Closes pleroma#952
See merge request pleroma/pleroma-fe!864
2019-07-07 18:29:36 +00:00
Shpuld Shpludson
c8794b2b84
Merge branch '580' into 'develop'
...
Fix backend version string parsing
Closes #580
See merge request pleroma/pleroma-fe!868
2019-07-07 10:30:45 +00:00
Eugenij
14ec12b4f6
Set hide_follows and hide_followers settings when parsing Mastodon format
2019-07-07 10:20:55 +00:00
Henry Jameson
020c6d1bcf
all the manual fixes
2019-07-07 00:54:17 +03:00
taehoon
66842efd81
update regex for commit hash
2019-07-05 11:11:31 -04:00
Henry Jameson
2c2b84d31d
npm eslint --fix .
2019-07-05 10:02:14 +03:00
Egor Kislitsyn
52319acf58
Revoke oAuth token
2019-07-02 15:33:40 +07:00