Commit Graph

3601 Commits

Author SHA1 Message Date
Your New SJW Waifu 56a70ebb60 custom images dir 2019-09-07 22:16:43 +00:00
Your New SJW Waifu 36d3910f44 Add panda 2019-09-07 22:14:27 +00:00
Your New SJW Waifu 2a57578b28 Update terms-of-service.html 2019-09-07 19:58:53 +00:00
tarteka 5026d3719a fix some translates 2019-09-07 09:07:34 +02:00
tarteka 17a97ee6f5 fix some translates 2019-09-07 09:00:25 +02:00
Your New SJW Waifu 96e7561b26 Merge remote-tracking branch 'upstream/develop' into develop 2019-09-06 18:00:27 -05: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
tarteka 1167bafb19 Update es translate 2019-09-06 14:58:20 +02:00
tarteka f48d12b4bc update eu translate 2019-09-06 14:24:37 +02: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
Your New SJW Waifu 470fea1e35 Merge remote-tracking branch 'upstream/develop' into develop 2019-09-05 13:41:05 -05: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
Your New SJW Waifu 394b273873 Merge remote-tracking branch 'upstream/develop' into develop
Updating with origin
2019-09-03 15:21:01 -07:00
Your New SJW Waifu c5f934d398 Update index.html 2019-09-03 21:32:29 +00:00
Your New SJW Waifu 07f8313946 Update index.html 2019-09-03 21:31:08 +00:00
Your New SJW Waifu 5a33ebf3b2 Custom background 2019-09-03 21:26:36 +00:00
Your New SJW Waifu 4fc58f4fa6 Custom background 2019-09-03 21:26:19 +00:00
Your New SJW Waifu 43c6ffae63 Custom background 2019-09-03 21:25:58 +00:00
Your New SJW Waifu ad8dfb6948 Update config.json 2019-09-03 21:23:00 +00:00
Your New SJW Waifu 050b9f4964 Upload custom nsfw image 2019-09-03 21:21:46 +00:00
Your New SJW Waifu 31bf1dcb26 Add new directory for NSFW image 2019-09-03 21:20:52 +00: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
Your New SJW Waifu 704b863589 Update config.js 2019-09-03 20:01:56 +00:00
Your New SJW Waifu d5905c5b48 Update config.json 2019-09-03 19:05:54 +00:00
Your New SJW Waifu 4e7fafa156 Added NB ToS 2019-09-03 18:57:47 +00:00
Your New SJW Waifu 4e4efae6ff Added custom themes 2019-09-03 18:53:50 +00:00
Your New SJW Waifu 5e4e213668 Add new file 2019-09-03 18:52:34 +00:00
Your New SJW Waifu 2517359717 Add new file 2019-09-03 18:51:36 +00:00
Your New SJW Waifu 254dda819e Add new file 2019-09-03 18:50:43 +00:00
Your New SJW Waifu c92d7665b1 Update index.html 2019-09-03 18:48:34 +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