9df99c5205
Merge branch 'masto-login-fixes' into 'develop'
...
MastoAPI login
See merge request pleroma/pleroma-fe!805
2019-06-12 19:42:25 +00:00
28ca504576
wire up notification settings
2019-05-25 07:34:59 +00:00
fc12b63fcc
mastoapi login works
2019-05-21 23:35:40 +03:00
b78ad8998d
Merge branch 'masto-remains' into 'develop'
...
Interactions 2.0, removing last bits of qvitter api. Only login/register and change background remains after that
See merge request pleroma/pleroma-fe!792
2019-05-20 20:54:05 +00:00
2457dd9b91
rename for consistency's sake
2019-05-16 14:02:37 -04:00
b6731bd9af
update admin api urls in accordance with new docs
2019-05-16 13:21:14 -04:00
2ce0186327
update api service functions
2019-05-15 12:04:26 -04:00
87de130ee5
apply status normalizer
2019-05-15 12:04:26 -04:00
93e9bc019e
clean up fetchPinnedStatuses api service
2019-05-15 12:04:26 -04:00
1229622fed
refactor error handling of pinStatus
2019-05-15 12:04:25 -04:00
2c89d49a3d
#468 - show pinned timeline and add pinned label to the status
2019-05-15 12:04:24 -04:00
affbe8700e
#468 - integrate endpoints
2019-05-15 12:04:24 -04:00
543604fd2d
removed unused masto api, added initial version of interactions timeline
2019-05-14 22:48:44 +03:00
26131266a9
refactor api service functions using new helper
2019-05-07 23:27:22 -04:00
9787d99672
update api services
2019-05-03 11:40:06 -04:00
19a0476985
update api endpoint url
2019-05-03 11:40:06 -04:00
2e6eab51b8
Update promisedRequest helper to support json payload
2019-05-03 11:40:06 -04:00
02d169b92c
add promisedRequest helper
2019-05-03 11:40:05 -04:00
cea6ea42f0
add api service function
2019-05-03 11:40:05 -04:00
b1bd5bd08e
Merge branch 'develop' into 'brendenbice1222/pleroma-fe-issues/pleroma-fe-202-show-boosted-users'
...
# Conflicts:
# src/services/api/api.service.js
2019-04-30 15:11:30 +00:00
0f7f685c5e
Merge branch '437-user-profile-settings' into 'develop'
...
Transition to MastoAPI: user profile settings
Closes #437
See merge request pleroma/pleroma-fe!682
2019-04-30 06:05:52 +00:00
904a64de89
use json content type
2019-04-27 14:20:32 -04:00
0ab2f9dfa5
add “block import” feature
2019-04-27 08:31:06 -04:00
6ea4154084
change api function name
2019-04-27 08:31:06 -04:00
903bce40c3
move formData generating logic to api.service
2019-04-27 08:31:06 -04:00
e14720419f
Switch to mastoapi for updating user profile
2019-04-27 08:30:08 -04:00
909d11825d
Switch to mastoapi for updating banner
2019-04-27 08:30:08 -04:00
808e1ac11c
Switch to mastoapi for updating avatar
...
# Conflicts:
# src/services/api/api.service.js
2019-04-27 08:30:08 -04:00
d417945427
Merge branch 'develop' into brendenbice1222/pleroma-fe-issues/pleroma-fe-202-show-boosted-users
2019-04-22 17:24:35 +03:00
3565b18712
fetch all friends using pagination
2019-04-19 00:27:06 -04:00
8c9bcdc6c1
rename favourite to favorite
2019-04-11 23:26:12 -04:00
0c3a922341
use promisedRequest for api call
2019-04-11 23:26:12 -04:00
85457fc917
fetch reblogged users
2019-04-11 23:26:12 -04:00
2d339cd3b8
fetch favorited users
2019-04-11 23:26:12 -04:00
d3218807b4
#436 - merge develop
2019-04-08 21:04:59 -04:00
6b6878bde0
Added moderation menu
2019-04-01 23:30:06 +03:00
783cc00dd0
merge develop & resolve conflict
2019-03-29 10:11:28 -04:00
30084a1204
merge develop and resolve conflict
2019-03-27 16:41:05 -04:00
66ab131bd4
Merge remote-tracking branch 'upstream/develop' into mastoapi/actions
...
* upstream/develop:
errata
review
Revert "Merge branch 'revert-987b5162' into 'develop'"
Revert "Merge branch 'mastoapi/friends-tl' into 'develop'"
Add await to login action'
correctly paginate on MastoAPI
#442 - update placeholder linebreak
#442 - clean up Bio placeholder text
wip support for follower/following, a bit broken and with regression
switch direct messages to mastoapi
switch public and TWKN to MastoAPI
undo this change since BE returns empty object for relationship, add in a separate MR
updates normalizer for proper user handling and adds support for friends tl via mastoapi
2019-03-27 22:24:38 +02:00
c2c7e12aad
review/remove error hiding
2019-03-27 22:18:43 +02:00
a5e71d1dd1
Merge remote-tracking branch 'upstream/develop' into mastoapi/followers
...
* upstream/develop:
Revert "Merge branch 'revert-987b5162' into 'develop'"
Revert "Merge branch 'mastoapi/friends-tl' into 'develop'"
Add await to login action'
switch direct messages to mastoapi
switch public and TWKN to MastoAPI
2019-03-27 22:14:26 +02:00
ff18e339cf
Merge remote-tracking branch 'upstream/develop' into mastoapi/followers
...
* upstream/develop:
#442 - update placeholder linebreak
#442 - clean up Bio placeholder text
undo this change since BE returns empty object for relationship, add in a separate MR
updates normalizer for proper user handling and adds support for friends tl via mastoapi
2019-03-27 22:12:51 +02:00
fb2aca06de
review
2019-03-27 22:02:46 +02:00
ea50f55148
Merge branch 'develop' into 'masto-api/direct'
...
# Conflicts:
# src/services/api/api.service.js
2019-03-27 19:48:41 +00:00
578b412177
#457 - merge develop and resolve conflict
2019-03-27 11:09:30 -04:00
b3a6bec17b
Revert "Merge branch 'revert-987b5162' into 'develop'"
...
This reverts commit 96753e6a5f987b5162a7
2019-03-27 11:17:04 +02:00
982be05873
#457 - update tag timeline endpoint to MastoAPI
2019-03-26 11:40:34 -04:00
5fd589d5e7
merge develop & resolve conflict
2019-03-26 10:52:46 -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
82f077feb9
fixup! Merge remote-tracking branch 'upstream/develop' into mastoapi/actions
2019-03-25 21:12:54 +02:00
HJ
William Pitcock
Henry Jameson
taehoon
dave
Shpuld Shpludson
Brenden Bice
eugenijm