HJ
3025532ecf
Merge branch 'develop' into 'mastoapi/public-tl'
...
# Conflicts:
# src/services/api/api.service.js
2019-03-25 19:09:22 +00:00
Henry Jameson
cb122e3a99
review
2019-03-25 20:11:06 +02:00
Henry Jameson
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
Shpuld Shpludson
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
Shpuld Shpludson
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
Shpuld Shpludson
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
taehoon
932652e335
Update attachment normalizer
2019-03-25 12:19:33 -04:00
taehoon
6fdbc182ca
Add fallback for attachments uploaded via the other platforms
2019-03-24 21:16:57 -04:00
taehoon
909c315a44
Get correct mimetype through entity_normalizer
2019-03-24 21:16:57 -04:00
taehoon
966add1b29
Set default parameter
2019-03-24 21:16:57 -04:00
taehoon
9802344603
Switch to mastoapi for posting status and uploading media
2019-03-24 21:16:56 -04:00
HJ
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
taehoon
f03747e841
Revert changes
2019-03-24 13:04:47 -04:00
nik
b241539d4d
prevent text pasting if image is pasted
2019-03-23 22:45:24 -05:00
nik
05634d222d
remove border radius of suggested emojis
2019-03-23 22:26:31 -05:00
Shpuld Shpludson
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
Shpuld Shpludson
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
Shpuld Shpludson
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
dave
31d09931c8
#450 - dispatch login after saved state is loaded
2019-03-22 14:04:22 -04:00
dave
d70928792d
#448 - fix timeline fetch error when status text is null
2019-03-22 13:15:11 -04:00
dave
ed4540530b
#451 - add class to username span
2019-03-22 10:42:21 -04:00
lambda
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
taehoon
9fa1bc63b0
No need to fetch mutes on load anymore 🙌
2019-03-21 21:58:02 -04:00
taehoon
a64e744c1b
switch to mastoapi
2019-03-21 21:53:24 -04:00
taehoon
8702d23a13
switch to mastoapi
2019-03-21 21:44:59 -04:00
taehoon
379e33f6a5
masto api sends muted property now
2019-03-21 21:31:16 -04:00
taehoon
883a84b313
No need to fetch user data using old api anymore 🎉
2019-03-21 21:30:30 -04:00
taehoon
af85a3f244
Switch to mastoapi
2019-03-21 21:27:10 -04:00
Henry Jameson
e617ed285e
reactivity fixes
2019-03-22 00:05:20 +02:00
Henry Jameson
67719e9a23
less hackery, more direct usage of mastoapi
2019-03-21 23:45:18 +02:00
Henry Jameson
d6c62fa50f
minor UI improvements - keep current behavior of showing originating post initially
2019-03-21 23:27:14 +02:00
Henry Jameson
ee94a6732a
why did i do that
2019-03-21 22:49:26 +02:00
Henry Jameson
307b4ba698
Merge remote-tracking branch 'upstream/develop' into mastoapi/convos
...
* upstream/develop: (47 commits)
#449 - fix auth token fetch issue
Make select tag use --inputText as text color
#444 - remote follow clean up
#444 - show `remote follow` button when logged out
Add button to save without cropping
post-merge fixes
[i18n] Update oc.json
after store: fix setting postFormats field
fix user-card avatar falling into permament failed state
fix flake id users not fetching correctly
fix console error
afterStoreSetup: Move log in and theme load to afterStoreSetup.
afterStoreSetup: Handle 404 cases.
afterStoreSetup: Emoji and nodeinfo refactor.
afterStoreSetup: refactor TOS and panel fetching, handle 404s.
afterStoreSetup: refactor.
Load persistedStated with async/await.
whoops
レインせんぱいにサンキュー
fix embedded relationship card parsing
...
2019-03-21 22:40:20 +02:00
taehoon
a0bccbce94
Add comment
2019-03-21 16:39:41 -04:00
taehoon
d7919109ec
Reset statusnet_blocking of all fetched users first while refreshing block list
2019-03-21 16:39:41 -04:00
taehoon
9857002bf5
Add hideMutedPosts setting and wire up to post-returning endpoints
2019-03-21 16:33:02 -04:00
taehoon
300259fd97
Add todo comment
2019-03-21 16:26:15 -04:00
taehoon
333afd2138
Minor code refactoring
2019-03-21 16:26:15 -04:00
taehoon
d65422a6a5
Improve fetch error handling using a util
2019-03-21 16:26:13 -04:00
taehoon
9b690209d0
Reset old mutes state after fetching new mutes data
2019-03-21 16:21:28 -04:00
taehoon
302310a653
Remove old muting logic
2019-03-21 16:19:09 -04:00
taehoon
a6ce191cbc
Update MuteCard ui
2019-03-21 16:19:05 -04:00
taehoon
859ed4f34f
Fetct full data of muted users after fetchMutes api call
2019-03-21 16:19:05 -04:00
taehoon
f04cbc8875
Add mute/unmute mutations
2019-03-21 16:19:05 -04:00
taehoon
3255950b0e
Add mute/unmute featrue and mutes management tab
2019-03-21 16:19:03 -04:00
dave
23bae67146
#452 - update button class name
2019-03-21 15:03:54 -04:00
dave
8932c53706
#451 - update styling
2019-03-21 14:58:28 -04:00
dave
dfcdf4f32c
#452 - unfollow button issue
2019-03-21 13:19:10 -04:00
dave
1c6e5d3688
#451 - long username on follow/follower tabs
2019-03-21 13:06:37 -04:00
Shpuld Shpludson
66e60572bc
Merge branch 'issue-449-auto-token-fetch' into 'develop'
...
#449 - fix auth token fetch issue
Closes #449
See merge request pleroma/pleroma-fe!696
2019-03-21 16:12:33 +00:00