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
2bb053dd71
Merge branch 'develop' into 'develop'
...
Develop
See merge request pleroma/pleroma-fe!950
2019-09-12 06:58:19 +00:00
a8cddecd41
fix some translation about blocks
2019-09-11 22:37:19 -07:00
d0fc509ad1
Complete the Chinese language file based on the version 0.9.999
2019-09-10 19:50:06 -07:00
4f0195b05c
Apply suggestion to src/components/emoji_picker/emoji_picker.vue
2019-09-10 18:39:45 +00:00
6217ef4718
fix some translates
2019-09-10 10:09:07 +02:00
753d15ed37
Merge branch '651' into 'develop'
...
Fix "Needless context api requests when click timeago in conversation page"
Closes #651
See merge request pleroma/pleroma-fe!934
2019-09-09 19:47:58 +00:00
9651293956
Apply suggestion to src/components/emoji_picker/emoji_picker.js
2019-09-09 19:42:33 +00:00
a4a4c46fe7
Merge branch '648-2' into 'develop'
...
Fix wrong body css while toggling visibility
Closes #648
See merge request pleroma/pleroma-fe!930
2019-09-09 19:22:11 +00:00
9146bee7aa
better hitbox for status emoji
2019-09-08 21:18:52 +03:00
7360a4d9ef
fix aspect
2019-09-08 17:11:45 +03:00
2237da0151
Apply suggestion to src/components/emoji_input/emoji_input.js
2019-09-08 14:08:39 +00:00
4f88bb4ea1
scale emoji on hover
2019-09-08 17:01:28 +03:00
83f45167b6
added emoji zoom for picker
2019-09-08 16:56:54 +03:00
94afc5ee19
fixed scroll when switching back to emoji
2019-09-08 15:57:49 +03:00
14df84d89b
fixed some bugs, added spam mode, minor collateral fixes
2019-09-08 15:51:17 +03:00
db086fe1fd
Merge remote-tracking branch 'upstream/develop' into emoji-selector-update
...
* upstream/develop: (116 commits)
Password reset page
add a comment
force img updating immediately
Fixed "sequimiento" to "seguimiento".
Replace `/api/externalprofile/show.json` with a MastoAPI equialent
Use mastodon api in follow requests
"Optional" in lowercase.
Update es.json
fix pin/unpin status logic
rename a mutation
update
fix user avatar fallback logic
remove dead code
Corrected "Media Proxy" translation.
Update es.json
make bio textarea resizable vertically only
remove dead code
Make image orientation consistent on FF, fix videos w/ modal
remove dead code
fix crazy watch logic in conversation
...
2019-09-08 13:44:29 +03:00
5026d3719a
fix some translates
2019-09-07 09:07:34 +02:00
17a97ee6f5
fix some translates
2019-09-07 09:00:25 +02:00
ea5b36a597
refactor toggling body visibility using class
2019-09-06 11:17:29 -04:00
9727009147
update prop name
2019-09-06 11:17:05 -04:00
482cd52f77
stop fetching whole conversation when change highlighted status
2019-09-06 11:17:04 -04:00
c1f3b0dc75
refactoring
2019-09-06 11:17:04 -04:00
214ab22c4c
update prop binding
2019-09-06 11:17:04 -04:00
d7c68d408f
accept status id instead of status obj as statusoid prop
2019-09-06 11:17:04 -04:00
1167bafb19
Update es translate
2019-09-06 14:58:20 +02:00
f48d12b4bc
update eu translate
2019-09-06 14:24:37 +02:00
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
702dc6963c
Merge branch 'password-reset' into 'develop'
...
Password reset page
Closes #213
See merge request pleroma/pleroma-fe!884
2019-09-05 11:23:28 +00:00
8ee5abb1a5
Password reset page
2019-09-05 11:23:28 +00:00
424d4ab57e
Utilize `user.requested` to display follow request status on user card
...
Closes #635
2019-09-05 11:17:53 +03:00
b33667a743
Avoid iterating over statuses to set thread_muted if the backend does
...
not support the extension
2019-09-04 22:17:29 +03:00
1a5a7bbebf
Set thread_muted for all statuses with the same conversation id on
...
status mute/unmute
2019-09-04 21:11:13 +03:00
c89703a359
Merge branch '655' into 'develop'
...
Fix "User avatar not updating immediately when switching user profile"
Closes #655
See merge request pleroma/pleroma-fe!940
2019-09-04 16:55:07 +00:00
d194431642
add a comment
2019-09-04 11:24:24 -04:00
cdbb8ca8b9
force img updating immediately
2019-09-04 11:24:24 -04:00
66a34b7ecf
Properly detect thread-muted posts and set `with_muted` when fetching
...
notifications
2019-09-04 12:20:33 +03:00
a1aada2454
Merge branch 'patch-2' into 'develop'
...
Fixed "sequimiento" to "seguimiento". Spanish translation.
See merge request pleroma/pleroma-fe!939
2019-09-03 21:16:11 +00:00
d1244e4896
Fixed "sequimiento" to "seguimiento".
2019-09-03 17:51:50 +00:00
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
49159e6db3
Merge branch 'mastoapi-follow-reqs' into 'develop'
...
Use mastodon api in follow requests
See merge request pleroma/pleroma-fe!937
2019-09-03 10:58:17 +00:00
8e3d6f5c28
Use mastodon api in follow requests
2019-09-03 13:50:26 +03:00
6238fe3633
Merge branch '652' into 'develop'
...
Fix "TypeError: Cannot set property 'pinned' of undefined"
Closes #652
See merge request pleroma/pleroma-fe!936
2019-09-03 04:48:24 +00:00
c43a5ab992
Merge branch 'patch-1' into 'develop'
...
Some corrections to the spanish translation
See merge request pleroma/pleroma-fe!929
2019-09-03 04:11:16 +00:00
fbfedf0084
Merge branch 'fix/attachment-css' into 'develop'
...
Make image orientation consistent on FF, fix videos w/ modal
See merge request pleroma/pleroma-fe!926
2019-09-03 04:09:56 +00:00
66e9f17c58
"Optional" in lowercase.
2019-09-02 11:41:30 +00:00
4f82ea0fea
Update es.json
2019-09-01 21:57:07 +00:00
daf7d4e661
fix pin/unpin status logic
2019-09-01 13:07:43 -04:00
13b80b5c7c
rename a mutation
2019-09-01 13:07:43 -04:00
9825a857f3
Merge branch 'docs' into 'develop'
...
Documentation
See merge request pleroma/pleroma-fe!718
2019-08-31 19:44:44 +00:00
Shpuld Shpludson