worst/pleroma-fe
1
0
Fork 0
forked from AkkomaGang/akkoma-fe
Code Issues Pull requests Projects Releases Packages Wiki Activity
3472 commits 9 branches 25 tags 16 MiB
Commit graph

3472 commits

This branch
This branch
All branches
Author SHA1 Message Date
Shpuld Shpludson
61bb02ef06 Merge branch '657' into 'develop' 
Collapse fav/repeat notifications from muted users

Closes #657

See merge request pleroma/pleroma-fe!945
 2019-09-25 06:24:41 +00:00
taehoon
f8139e369c wire up user state with global store 2019-09-20 11:25:00 -04:00
taehoon
8618857aa3 collapse fav/repeat notifications from muted users 2019-09-20 11:25:00 -04:00
Shpuld Shpludson
dcef84363f Merge branch 'muting-fixes' into 'develop' 
Properly detect thread-muted posts and set `with_muted` when fetching notifications

See merge request pleroma/pleroma-fe!941
 2019-09-20 15:23:13 +00:00
rinpatch
1306fac38f Merge branch 'develop' into 'muting-fixes' 
# Conflicts:
#   src/components/status/status.js
 2019-09-16 11:38:37 +00:00
Shpuld Shpludson
9b163d2816 Merge branch '656' into 'develop' 
Do not collapse thread muted posts when it's expanded/on the thread page and do not collapse muted user's posts on muted user's profile page

Closes #656

See merge request pleroma/pleroma-fe!953
 2019-09-16 07:27:06 +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
Shpuld Shpludson
2bb053dd71 Merge branch 'develop' into 'develop' 
Develop

See merge request pleroma/pleroma-fe!950
 2019-09-12 06:58:19 +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
Shpuld Shpludson
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
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
Shpuld Shpludson
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
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
HJ
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
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
HJ
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
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
HJ
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
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
HJ
9825a857f3 Merge branch 'docs' into 'develop' 
Documentation

See merge request pleroma/pleroma-fe!718
 2019-08-31 19:44:44 +00:00
Henry Jameson
9e3891de61 Merge remote-tracking branch 'upstream/docs' into docs 
* upstream/docs:
  Apply suggestion to docs/HACKING.md
  Apply suggestion to docs/CONFIGURATION.md
 2019-08-31 22:39:56 +03:00
Henry Jameson
2dfba76772 update 2019-08-31 22:39:26 +03:00