Commit graph

2875 commits

Author SHA1 Message Date
rinpatch 1306fac38f Merge branch 'develop' into 'muting-fixes'
# Conflicts:
#   src/components/status/status.js
2019-09-16 11:38:37 +00:00
taehoon baebf08d20 do not collapse thread muted posts in conversation 2019-09-13 22:59:45 -04:00
taehoon 6a3f283256 detect thread-muted posts 2019-09-13 22:59:24 -04:00
taehoon 2f79a7b4a0 do not change word based muting logic 2019-09-13 16:55:17 -04:00
taehoon b10558f721 do not collapse muted user's posts on muted user's media timeline 2019-09-13 16:17:51 -04:00
taehoon 09deb69bc7 do not collapse muted user's posts on muted user's profile page 2019-09-13 15:38:04 -04:00
Shpuld Shpludson 09db4ceb1a Merge branch 'fix/italics-not-selectable' into 'develop'
fix italics not being selectable

See merge request pleroma/pleroma-fe!952
2019-09-13 17:21:15 +00:00
Shpuld Shpuldson 794481d76c fix italics not being selectable 2019-09-13 20:16:05 +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
davidyin a8cddecd41 fix some translation about blocks 2019-09-11 22:37:19 -07:00
davidyin d0fc509ad1 Complete the Chinese language file based on the version 0.9.999 2019-09-10 19:50:06 -07:00
Shpuld Shpludson 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
taehoon ea5b36a597 refactor toggling body visibility using class 2019-09-06 11:17:29 -04:00
taehoon 9727009147 update prop name 2019-09-06 11:17:05 -04:00
taehoon 482cd52f77 stop fetching whole conversation when change highlighted status 2019-09-06 11:17:04 -04:00
taehoon c1f3b0dc75 refactoring 2019-09-06 11:17:04 -04:00
taehoon 214ab22c4c update prop binding 2019-09-06 11:17:04 -04:00
taehoon d7c68d408f accept status id instead of status obj as statusoid prop 2019-09-06 11:17:04 -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 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
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
taehoon d194431642 add a comment 2019-09-04 11:24:24 -04:00
taehoon cdbb8ca8b9 force img updating immediately 2019-09-04 11:24:24 -04:00
rinpatch 66a34b7ecf Properly detect thread-muted posts and set with_muted when fetching
notifications
2019-09-04 12:20:33 +03:00
Echedey López Romero d1244e4896 Fixed "sequimiento" to "seguimiento". 2019-09-03 17:51:50 +00: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
Shpuld Shpludson 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
Shpuld Shpludson 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
Shpuld Shpludson 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
Echedey López Romero 66e9f17c58 "Optional" in lowercase. 2019-09-02 11:41:30 +00:00
Echedey López Romero 4f82ea0fea Update es.json 2019-09-01 21:57:07 +00:00
taehoon daf7d4e661 fix pin/unpin status logic 2019-09-01 13:07:43 -04:00
taehoon 13b80b5c7c rename a mutation 2019-09-01 13:07:43 -04:00
Shpuld Shpludson 018a650166 Merge branch 'remove-dead-code' into 'develop'
Remove dead code

See merge request pleroma/pleroma-fe!927
2019-08-29 17:16:57 +00:00
taehoon 9476fbba5a fix user avatar fallback logic 2019-08-28 14:02:04 -04:00
taehoon c01d2543d5 remove dead code 2019-08-28 13:06:57 -04:00
Echedey López Romero a15810afc8 Corrected "Media Proxy" translation. 2019-08-27 19:07:07 +00:00
Echedey López Romero 50bf9e633b Update es.json 2019-08-26 21:37:39 +00:00
taehoon e1c2c5cfed make bio textarea resizable vertically only 2019-08-26 16:00:19 -04:00
taehoon a0712270aa remove dead code 2019-08-26 14:29:40 -04:00
Shpuld Shpuldson 15c4088a68 Make image orientation consistent on FF, fix videos w/ modal 2019-08-26 14:08:30 +03:00
taehoon 7b5cdab7cd remove dead code 2019-08-25 16:58:13 -04:00
taehoon 9b8bf655e1 fix crazy watch logic in conversation 2019-08-23 13:49:39 -04:00
taehoon 65579796ed show three dot button only if needed 2019-08-20 17:00:28 -04:00
taehoon 92a0c475f7 hide mute conversation button to guests 2019-08-20 16:55:42 -04:00
taehoon 4bedbfea3c update keyBy 2019-08-17 22:10:01 -04:00
taehoon 1146119d6a generate idObj at timeline level 2019-08-17 14:33:32 -04:00