0e2931e7de
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-433-status-reply-form
2019-03-27 13:50:51 -04:00
85e9e52090
Merge branch 'fix/add-await-to-login-request' into 'develop'
...
!701 Add await to login action in after_store
See merge request pleroma/pleroma-fe!709
2019-03-27 16:22:31 +00:00
e750b2f197
Merge branch 'mastoapi/public-tl' into 'develop'
...
switch public and TWKN to MastoAPI
See merge request pleroma/pleroma-fe!650
2019-03-27 08:54:57 +00:00
96753e6a5f
Merge branch 'revert-987b5162' into 'develop'
...
Revert "Merge branch 'mastoapi/friends-tl' into 'develop'"
See merge request pleroma/pleroma-fe!710
2019-03-27 08:51:35 +00:00
95459ff0bc
Revert "Merge branch 'mastoapi/friends-tl' into 'develop'"
...
This reverts merge request !647
2019-03-27 08:47:54 +00:00
2d05aef24b
Add await to login action'
2019-03-26 14:26:26 -07:00
987b5162a7
Merge branch 'mastoapi/friends-tl' into 'develop'
...
Switch friends TL to MastoAPI
See merge request pleroma/pleroma-fe!647
2019-03-26 17:24:37 +00:00
2f1e690478
Merge branch 'issue-442-placeholder-fix' into 'develop'
...
#442 - clean up Bio placeholder text
Closes #442
See merge request pleroma/pleroma-fe!689
2019-03-25 22:29:17 +00:00
467647d5d7
#433 - fix retweet abnormal behavior
2019-03-25 16:09:40 -04:00
04217fc660
Merge branch 'develop' into 'mastoapi/friends-tl'
...
# Conflicts:
# src/services/api/api.service.js
2019-03-25 19:21:48 +00:00
c5ec4829a7
#433 - consider page on focused
2019-03-25 15:10:45 -04:00
3025532ecf
Merge branch 'develop' into 'mastoapi/public-tl'
...
# Conflicts:
# src/services/api/api.service.js
2019-03-25 19:09:22 +00:00
73dfb00be2
#433 - remove needless nesting/bloating
2019-03-25 14:59:47 -04:00
1a68a9db36
#433 - Fix conversation page highlight, fetch conversation on converation page
2019-03-25 14:55:58 -04:00
6143b1ce0f
Resolve merge conflict,
...
Fix few issues (conversation page highlight, fetch conversation, ...)
2019-03-25 14:47:54 -04:00
854d0e8051
Merge branch 'mastoapi/convos' into 'develop'
...
Fetching convos via MastoAPI
See merge request pleroma/pleroma-fe!662
2019-03-25 18:17:53 +00:00
cb122e3a99
review
2019-03-25 20:11:06 +02:00
3b5fc88989
Merge remote-tracking branch 'upstream/develop' into mastoapi/convos
...
* upstream/develop: (34 commits)
Update attachment normalizer
Add fallback for attachments uploaded via the other platforms
Get correct mimetype through entity_normalizer
Set default parameter
Switch to mastoapi for posting status and uploading media
Revert changes
prevent text pasting if image is pasted
remove border radius of suggested emojis
#450 - dispatch login after saved state is loaded
#448 - fix timeline fetch error when status text is null
#451 - add class to username span
No need to fetch mutes on load anymore 🙌
switch to mastoapi
switch to mastoapi
masto api sends muted property now
No need to fetch user data using old api anymore 🎉
Switch to mastoapi
Add comment
Reset statusnet_blocking of all fetched users first while refreshing block list
Add hideMutedPosts setting and wire up to post-returning endpoints
...
2019-03-25 19:54:15 +02:00
b02085f2ef
Merge branch 'issue-450-user-data-populate' into 'develop'
...
#450 - dispatch login after saved state is loaded
Closes #450
See merge request pleroma/pleroma-fe!701
2019-03-25 16:57:05 +00:00
57b82e9236
Merge branch 'file-paste' into 'develop'
...
#455 - prevent text pasting if image is pasted
Closes #455
See merge request pleroma/pleroma-fe!705
2019-03-25 16:52:25 +00:00
182eab051d
Merge branch 'develop' into 'develop'
...
Remove border radius of suggested emojis
See merge request pleroma/pleroma-fe!704
2019-03-25 16:52:01 +00:00
153ad57007
Merge branch '435-mastoapi-composing-new-post' into 'develop'
...
Transition to MastoAPI: composing new status and media upload
Closes #435
See merge request pleroma/pleroma-fe!686
2019-03-25 16:42:20 +00:00
932652e335
Update attachment normalizer
2019-03-25 12:19:33 -04:00
6a9159b255
#433 - fix broken conversation page
2019-03-25 10:50:09 -04:00
4cec0d589d
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-433-status-reply-form
2019-03-25 10:22:16 -04:00
6fdbc182ca
Add fallback for attachments uploaded via the other platforms
2019-03-24 21:16:57 -04:00
909c315a44
Get correct mimetype through entity_normalizer
2019-03-24 21:16:57 -04:00
966add1b29
Set default parameter
2019-03-24 21:16:57 -04:00
9802344603
Switch to mastoapi for posting status and uploading media
2019-03-24 21:16:56 -04:00
01d0531699
Merge branch '227-manage-blocks-mutes' into 'develop'
...
Transition to MastoAPI: Mute & Block and Add Mutes management tab
See merge request pleroma/pleroma-fe!611
2019-03-24 17:15:21 +00:00
f03747e841
Revert changes
2019-03-24 13:04:47 -04:00
b241539d4d
prevent text pasting if image is pasted
2019-03-23 22:45:24 -05:00
05634d222d
remove border radius of suggested emojis
2019-03-23 22:26:31 -05:00
f86a5dc804
Merge branch 'issue-448-status-text-null' into 'develop'
...
#448 - fix timeline fetch error when status text is null
Closes #448
See merge request pleroma/pleroma-fe!700
2019-03-23 14:17:47 +00:00
e9b58f1af7
Merge branch 'issue-452-unfollow-button' into 'develop'
...
#452 - unfollow button issue
Closes #452
See merge request pleroma/pleroma-fe!698
2019-03-23 07:45:42 +00:00
f3f006c8e3
Merge branch 'issue-451-long-user-name' into 'develop'
...
#451 - long username on follow/follower tabs
Closes #451
See merge request pleroma/pleroma-fe!697
2019-03-23 07:45:04 +00:00
31d09931c8
#450 - dispatch login after saved state is loaded
2019-03-22 14:04:22 -04:00
d70928792d
#448 - fix timeline fetch error when status text is null
2019-03-22 13:15:11 -04:00
ed4540530b
#451 - add class to username span
2019-03-22 10:42:21 -04:00
277790e462
Merge branch '438-mastoapi-user-search' into 'develop'
...
Transition to MastoAPI: user search
Closes #438
See merge request pleroma/pleroma-fe!677
2019-03-22 11:16:25 +00:00
9fa1bc63b0
No need to fetch mutes on load anymore 🙌
2019-03-21 21:58:02 -04:00
a64e744c1b
switch to mastoapi
2019-03-21 21:53:24 -04:00
8702d23a13
switch to mastoapi
2019-03-21 21:44:59 -04:00
379e33f6a5
masto api sends muted property now
2019-03-21 21:31:16 -04:00
883a84b313
No need to fetch user data using old api anymore 🎉
2019-03-21 21:30:30 -04:00
af85a3f244
Switch to mastoapi
2019-03-21 21:27:10 -04:00
e617ed285e
reactivity fixes
2019-03-22 00:05:20 +02:00
67719e9a23
less hackery, more direct usage of mastoapi
2019-03-21 23:45:18 +02:00
d6c62fa50f
minor UI improvements - keep current behavior of showing originating post initially
2019-03-21 23:27:14 +02:00
ee94a6732a
why did i do that
2019-03-21 22:49:26 +02:00
dave