Henry Jameson
6744396f82
getting and setting user background via MastoAPI
2019-06-16 20:17:59 +03:00
Henry Jameson
f9c3aabea4
Merge remote-tracking branch 'upstream/develop' into masto-register-app-secret
...
* upstream/develop:
fix user banner
2019-06-13 10:05:53 +03:00
Henry Jameson
d1fd3e3a1c
fix user banner
2019-06-13 01:48:41 +03:00
Henry Jameson
c8a57ad32e
Merge remote-tracking branch 'upstream/develop' into masto-register-app-secret
...
* upstream/develop:
Revert "add TOTP/Recovery Form for mobile version"
2019-06-13 00:51:14 +03:00
Henry Jameson
1e94aecbc9
AMERICA
2019-06-13 00:47:06 +03:00
Henry Jameson
77511a5338
Merge remote-tracking branch 'upstream/develop' into masto-register-app-secret
...
* upstream/develop:
Apply suggestion to src/services/entity_normalizer/entity_normalizer.service.js
i18n/Update Japanese translation
render modal at the root level using portal
install portal vue
Small improve of the who to follow panel layout
Fix/Small fix in the who to follow page
remove console spam
i18n
wire up user.description with masto api data
i18n/Add Japanese with kanji (2)
move drowdown menu to popper
notification controls: redesign entirely
entity normalizer: collapse data.pleroma if blocks
wire up notification settings
do not miss statusnet_profile_url of mentions
Translation to Hebrew of everything other than theme_helpers and style.
Translate up to settings.
mastoapi login works
2019-06-13 00:07:28 +03:00
Maksim
77eceedbf7
Revert "add TOTP/Recovery Form for mobile version"
...
This reverts commit a3811f944819430c278b6da6b08dc322a9b9ff65.
2019-06-12 20:16:55 +00:00
HJ
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
HJ
a7b0b07e6f
Apply suggestion to src/services/entity_normalizer/entity_normalizer.service.js
2019-06-12 11:44:14 +00:00
kaniini
b4796ccbf6
Merge branch 'feature/notification-controls' into 'develop'
...
wire up notification settings
See merge request pleroma/pleroma-fe!809
2019-06-01 05:16:15 +00:00
taehoon
0532995847
wire up user.description with masto api data
2019-05-29 12:32:14 -04:00
William Pitcock
ac97cd3e46
entity normalizer: collapse data.pleroma if blocks
2019-05-25 22:59:04 +00:00
William Pitcock
28ca504576
wire up notification settings
2019-05-25 07:34:59 +00:00
taehoon
2af35b8404
do not miss statusnet_profile_url of mentions
2019-05-22 23:47:20 -04:00
Henry Jameson
e7a2a7267d
Proper clientId/secret/token caching, MastoAPI registration
2019-05-22 19:13:41 +03:00
Henry Jameson
fc12b63fcc
mastoapi login works
2019-05-21 23:35:40 +03:00
HJ
0fc7cbfa24
Merge branch 'fetags' into 'develop'
...
add tags to data and to status component
See merge request pleroma/pleroma-fe!801
2019-05-20 21:02:29 +00:00
HJ
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
Moonman
fc9acf8fb6
add tags to data and to status component
2019-05-20 00:03:50 -04:00
William Pitcock
00ad97fcfa
entity normalizer: add tooltip text to emojis
2019-05-17 20:10:50 +00:00
taehoon
2457dd9b91
rename for consistency's sake
2019-05-16 14:02:37 -04:00
taehoon
b6731bd9af
update admin api urls in accordance with new docs
2019-05-16 13:21:14 -04:00
taehoon
2ce0186327
update api service functions
2019-05-15 12:04:26 -04:00
taehoon
110c9d3b26
improve performance by caching pinned status ids into user object
2019-05-15 12:04:26 -04:00
taehoon
87de130ee5
apply status normalizer
2019-05-15 12:04:26 -04:00
taehoon
12f8269f01
make sure to have rights property of user object
2019-05-15 12:04:26 -04:00
taehoon
a601337a20
clean up
2019-05-15 12:04:26 -04:00
taehoon
93e9bc019e
clean up fetchPinnedStatuses api service
2019-05-15 12:04:26 -04:00
taehoon
1229622fed
refactor error handling of pinStatus
2019-05-15 12:04:25 -04:00
taehoon
e8abe1273b
filter pinned statuses based on pinned entity instead of a separate user entity
2019-05-15 12:04:25 -04:00
taehoon
cd0a7afa06
remove pinned timeline, instead, use simple entity of user object
2019-05-15 12:04:25 -04:00
taehoon
9e22d6212a
revert pinned timeline polling logic
2019-05-15 12:04:25 -04:00
dave
2c89d49a3d
#468 - show pinned timeline and add pinned label to the status
2019-05-15 12:04:24 -04:00
dave
1aa0e8d7e0
#468 - pin/unpin status
2019-05-15 12:04:24 -04:00
dave
affbe8700e
#468 - integrate endpoints
2019-05-15 12:04:24 -04:00
Henry Jameson
543604fd2d
removed unused masto api, added initial version of interactions timeline
2019-05-14 22:48:44 +03:00
taehoon
7d60ab322e
use backendInteractor
2019-05-07 23:36:35 -04:00
taehoon
26131266a9
refactor api service functions using new helper
2019-05-07 23:27:22 -04:00
taehoon
a27a2f78ac
fix conversationId comparision bug using integer format
2019-05-06 13:24:11 -04:00
taehoon
9787d99672
update api services
2019-05-03 11:40:06 -04:00
taehoon
19a0476985
update api endpoint url
2019-05-03 11:40:06 -04:00
taehoon
2e6eab51b8
Update promisedRequest helper to support json payload
2019-05-03 11:40:06 -04:00
taehoon
02d169b92c
add promisedRequest helper
2019-05-03 11:40:05 -04:00
taehoon
cea6ea42f0
add api service function
2019-05-03 11:40:05 -04:00
shpuld
c44c048356
add title and alt for avatars, fix console errors in avatarlist
2019-05-01 17:33:56 +03:00
Shpuld Shpludson
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
HJ
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
taehoon
904a64de89
use json content type
2019-04-27 14:20:32 -04:00
taehoon
0ab2f9dfa5
add “block import” feature
2019-04-27 08:31:06 -04:00
taehoon
6ea4154084
change api function name
2019-04-27 08:31:06 -04:00
taehoon
903bce40c3
move formData generating logic to api.service
2019-04-27 08:31:06 -04:00
taehoon
e14720419f
Switch to mastoapi for updating user profile
2019-04-27 08:30:08 -04:00
taehoon
909d11825d
Switch to mastoapi for updating banner
2019-04-27 08:30:08 -04:00
taehoon
808e1ac11c
Switch to mastoapi for updating avatar
...
# Conflicts:
# src/services/api/api.service.js
2019-04-27 08:30:08 -04:00
William Pitcock
f4420cbf9f
entity normalizer: hook up in_reply_to_account_acct
2019-04-27 04:52:11 +00:00
taehoon
445b54c553
fix follow button not updating bug in follow-card
2019-04-22 11:17:01 -04:00
shpuld
d417945427
Merge branch 'develop' into brendenbice1222/pleroma-fe-issues/pleroma-fe-202-show-boosted-users
2019-04-22 17:24:35 +03:00
taehoon
3565b18712
fetch all friends using pagination
2019-04-19 00:27:06 -04:00
taehoon
e7010d73ac
store friends/followers in the global user repository
2019-04-14 23:41:38 -04:00
Brenden Bice
8ed4eb8a7f
refactor showing favs and repeats logic
2019-04-11 23:26:13 -04:00
Brenden Bice
8c9bcdc6c1
rename favourite to favorite
2019-04-11 23:26:12 -04:00
Brenden Bice
0c3a922341
use promisedRequest for api call
2019-04-11 23:26:12 -04:00
Brenden Bice
85457fc917
fetch reblogged users
2019-04-11 23:26:12 -04:00
Brenden Bice
2d339cd3b8
fetch favorited users
2019-04-11 23:26:12 -04:00
dave
40e9eebf91
#436 - merge develop
2019-04-10 12:54:33 -04:00
Henry Jameson
18cb97a2bd
Fix wrong local
2019-04-10 15:02:14 +03:00
dave
d498a26af5
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-436-mastoapi-notifications
2019-04-09 15:42:05 -04:00
Henry Jameson
dfd89b0bbc
revert, it's still missing
2019-04-09 22:28:36 +03:00
Henry Jameson
d95fc02810
add support for pleroma-specific fields
2019-04-09 22:26:57 +03:00
Shpuld Shpludson
1e9ddcb0da
Merge branch 'fix/notification-bugs' into 'develop'
...
#474 Fix notification bugs
Closes #474
See merge request pleroma/pleroma-fe!728
2019-04-09 15:24:33 +00:00
dave
d3218807b4
#436 - merge develop
2019-04-08 21:04:59 -04:00
jasper
a1275be4c0
Separate timeline and notification
2019-04-04 09:03:56 -07:00
jasper
ea27483f27
Fix notification bugs
2019-04-03 09:04:46 -07:00
dave
8b3f037f87
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-436-mastoapi-notifications
2019-04-02 10:07:36 -04:00
eugenijm
6b6878bde0
Added moderation menu
2019-04-01 23:30:06 +03:00
shpuld
46de457f50
Merge branch 'develop' into feature/mobile-improvements-3
2019-04-01 22:42:06 +03:00
shpuld
2879495b8a
remove window width copypasta
2019-04-01 22:41:34 +03:00
dave
21ea5adc8b
#436 - apply patch and clean up
2019-03-31 21:59:18 -04:00
dave
06fd3a9c5f
#436 - apply patch
2019-03-31 14:50:34 -04:00
dave
0db66e2905
#436 - keep original naming
2019-03-31 13:41:22 -04:00
dave
8efcfc69e8
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-436-mastoapi-notifications
2019-03-31 11:03:43 -04:00
Shpuld Shpludson
e329a362e0
Merge branch 'fix/warnings-in-user-profile' into 'develop'
...
#461 Fix warnings about user-profile
Closes #461
See merge request pleroma/pleroma-fe!708
2019-03-29 15:32:40 +00:00
dave
783cc00dd0
merge develop & resolve conflict
2019-03-29 10:11:28 -04:00
jasper
e6f9b1517b
Fix: Change condition
2019-03-28 18:43:03 -07:00
Shpuld Shpludson
c829b1a5f4
Merge branch 'feat/gesture-service' into 'develop'
...
Add a gesture service for easier touch gestures
See merge request pleroma/pleroma-fe!714
2019-03-28 20:20:16 +00:00
shpuld
1e2c304f76
fix typo
2019-03-28 22:11:05 +02:00
Shpuld Shpludson
ee9aa40001
Merge branch 'issues/#466' into 'develop'
...
show replies count right after reply icon
Closes #466
See merge request pleroma/pleroma-fe!716
2019-03-28 20:09:59 +00:00
Brenden Bice
95639fbd63
expose replies_count from mastodon api
2019-03-28 03:46:41 -04:00
dave
30084a1204
merge develop and resolve conflict
2019-03-27 16:41:05 -04:00
Henry Jameson
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
Henry Jameson
c2c7e12aad
review/remove error hiding
2019-03-27 22:18:43 +02:00
Henry Jameson
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
Henry Jameson
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
Henry Jameson
fb2aca06de
review
2019-03-27 22:02:46 +02:00
HJ
ea50f55148
Merge branch 'develop' into 'masto-api/direct'
...
# Conflicts:
# src/services/api/api.service.js
2019-03-27 19:48:41 +00:00
dave
578b412177
#457 - merge develop and resolve conflict
2019-03-27 11:09:30 -04:00
Henry Jameson
b3a6bec17b
Revert "Merge branch 'revert-987b5162' into 'develop'"
...
This reverts commit 96753e6a5f
, reversing
changes made to 987b5162a7
.
2019-03-27 11:17:04 +02:00
jasper
ab99d5ef95
Fix warnings in user profile routing
2019-03-26 13:35:08 -07:00
shpuld
c50e64f8ee
Add tests for gesture service, fix bug with perpendicular directions
2019-03-26 22:11:45 +02:00
dave
982be05873
#457 - update tag timeline endpoint to MastoAPI
2019-03-26 11:40:34 -04:00