Your New SJW Waifu
a5f2ea4499
Bad idea. Breaks search.
2019-09-21 11:56:17 -05:00
Your New SJW Waifu
4cbc11bf10
Merge remote-tracking branch 'upstream/develop' into develop
2019-09-21 10:58:13 -05:00
Your New SJW Waifu
d105fd0104
Better story
2019-09-21 10:42:41 -05:00
Your New SJW Waifu
27b44d9a83
Maybe this will fix the beginning space?
2019-09-21 15:23:32 +00:00
Your New SJW Waifu
3c74ba93e8
Fix beginning space on alex jones story
2019-09-21 15:21:42 +00:00
Your New SJW Waifu
b8ff49849a
add line breaks and clean up alex jones story
2019-09-21 15:18:53 +00:00
Your New SJW Waifu
15c2375e7a
add meta description and alex jones story
2019-09-21 15:06:18 +00: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
Your New SJW Waifu
bd19971311
Merge remote-tracking branch 'upstream/develop' into develop
2019-09-16 11:09:25 -05: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
Your New SJW Waifu
5ab5ef8764
Merge remote-tracking branch 'upstream/develop' into develop
2019-09-13 17:15:28 -05: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
Your New SJW Waifu
4cfae8f4c6
Switching to config.json
2019-09-12 15:17:18 +00:00
Your New SJW Waifu
aefd7bd94f
Use new background
2019-09-12 14:52:54 +00:00
Your New SJW Waifu
69ce23125c
Add new background
2019-09-12 14:49:48 +00:00
Your New SJW Waifu
16650ede23
Merge remote-tracking branch 'upstream/develop' into develop
2019-09-12 09:45:37 -05: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
Your New SJW Waifu
118bbc385d
Merge remote-tracking branch 'upstream/develop' into develop
2019-09-11 11:19:05 -05: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
Your New SJW Waifu
00ff8c6ce9
Fixed typo
2019-09-09 17:26:52 +00:00
Your New SJW Waifu
2e9c76a024
automate build with bash script
2019-09-07 22:45:34 +00:00
Your New SJW Waifu
6952bff06b
custom default avatar
2019-09-07 22:41:15 +00:00
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
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
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