Commit graph

231 commits

Author SHA1 Message Date
Henry Jameson b619477573 Merge remote-tracking branch 'upstream/develop' into streaming
* upstream/develop: (51 commits)
  toggle_activation api is also deprecated
  use vuex action
  refactor toggleActivationStatus
  replace setActivationStatus api with new one
  use flex for stickers
  i18n/update-ja_easy
  Use a centralized fallback for missing values and use instance.federating instead of instance.federation.enabled
  Add fallback in case BE does not report federating status in nodeinfo
  The value we are looking for is federationPolicy.enabled, not federationPolicy.federating
  Logic should be to hide TWKN if not federating OR if instance is not public
  Finally trust eslint
  More lint
  More lint
  Lint
  mfa: removed unused code
  increase icon width a little bit in the nav panel
  add icons to nav panel
  Revert "Merge branch 'revert-96cab6d8' into 'develop'"
  Support "native" captcha
  Revert "Merge branch 'oauth-extra-scopes' into 'develop'"
  ...
2019-12-26 12:47:51 +02:00
taehoon 4e4c4af422 toggle_activation api is also deprecated 2019-12-15 14:32:04 -05:00
taehoon 45e7f93c49 refactor toggleActivationStatus 2019-12-15 14:32:04 -05:00
taehoon 506822bed0 replace setActivationStatus api with new one 2019-12-15 14:32:04 -05:00
feld 749a399944 Merge branch 'issue_124' into 'develop'
Change 403 messaging

See merge request pleroma/pleroma-fe!1020
2019-12-13 17:02:09 +00:00
Henry Jameson 63a5f50e7c fix deletes causing errors 2019-12-11 18:20:43 +02:00
Maksim Pechnikov d6dc2bad1f fixed typo 2019-12-11 15:59:29 +03:00
Henry Jameson 6acd889589 Option to enable streaming 2019-12-10 21:30:27 +02:00
Wyatt Benno 8ee8033955 Set error data 2019-12-09 10:31:57 +09:00
Wyatt Benno e86af0c965 Change naming, make more general 2019-12-09 09:02:34 +09:00
Henry Jameson 505fb26061 better wrapper for websocket 2019-12-08 19:18:38 +02:00
Wyatt Benno 13fc2612ae Change 403 messaging 2019-12-05 11:48:37 +09:00
Henry Jameson 319bb4ac28 initial streaming work 2019-11-24 18:50:28 +02:00
Maksim ded022a1d2 '/api/pleroma/profile/mfa' -> '/api/pleroma/accounts/mfa' 2019-11-08 02:42:32 +00:00
Sergey Suprunenko e3381cdef1 Add ability to change user's email 2019-11-08 02:21:19 +00:00
Maksim Pechnikov a26d550137 updated user_card 2019-10-08 16:46:54 +03:00
Maksim Pechnikov 8721fb57fc added support hide\show reblogs from a specific user 2019-09-21 16:24:47 +03:00
rinpatch 457290e81e Replace /api/externalprofile/show.json with a MastoAPI equialent
`/api/v1/accounts/:id` supports remote nicknames since pleroma!1622
2019-09-03 19:59:28 +03:00
rinpatch 8e3d6f5c28 Use mastodon api in follow requests 2019-09-03 13:50:26 +03:00
Shpuld Shpludson 92380652fe Merge branch 'feat/conversation-muting' into 'develop'
Add Conversation/Thread Muting

See merge request pleroma/pleroma-fe!876
2019-08-08 10:09:07 +00:00
Lee Starnes 4fc27414d2 Handle JSONified errors while registering
Closes #617
2019-08-06 18:03:31 +00:00
Shpuld Shpludson d3f6b581d1 Merge branch 'develop' into 'feat/conversation-muting'
# Conflicts:
#   src/components/extra_buttons/extra_buttons.js
#   src/components/extra_buttons/extra_buttons.vue
2019-07-26 12:44:32 +00:00
shpuld 619608ea7a fix issues caused by merges in usersearch on @ 2019-07-18 17:22:51 +03:00
Shpuld Shpludson 3370dd80dc Merge branch 'develop' into 'feat/conversation-muting'
# Conflicts:
#   src/services/api/api.service.js
2019-07-15 19:09:01 +00:00
Eugenij 69a4bcb238 New search 2019-07-15 16:42:27 +00:00
jared f2c95f9d0b #482 - add new endpoints to subscribe to the user 2019-07-10 21:01:07 -04:00
Tae Hoon 532b76eb64 Refactor user search api, better api error response handling 2019-07-10 16:58:49 +00:00
shpuld 7ed9d17ce7 Add thread muting to context menu of status 2019-07-07 23:02:09 +03:00
Henry Jameson 2c2b84d31d npm eslint --fix . 2019-07-05 10:02:14 +03:00
lain 0eed2ccca8 Feature/polls attempt 2 2019-06-18 20:28:31 +00:00
HJ 8caf13bbce Apply suggestion to src/services/api/api.service.js 2019-06-17 08:20:02 +00:00
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
William Pitcock 28ca504576 wire up notification settings 2019-05-25 07:34:59 +00: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 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
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 87de130ee5 apply status normalizer 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
dave 2c89d49a3d #468 - show pinned timeline and add pinned label to the status 2019-05-15 12:04:24 -04:00