Commit graph

3124 commits

Author SHA1 Message Date
HJ
c6a29b48eb Apply suggestion to docs/USER_GUIDE.md 2019-06-26 11:47:26 +00:00
HJ
0892c13c2c Apply suggestion to docs/USER_GUIDE.md 2019-06-26 11:46:19 +00:00
HJ
0b4c6127c5 Apply suggestion to docs/USER_GUIDE.md 2019-06-26 11:46:16 +00:00
HJ
b02a92e9f6 Apply suggestion to docs/USER_GUIDE.md 2019-06-26 11:46:13 +00:00
lain
7dfd50c7c8 Apply suggestion to docs/USER_GUIDE.md 2019-06-24 22:07:03 +00:00
lain
bd8e1c9e23 Apply suggestion to docs/USER_GUIDE.md 2019-06-24 22:06:19 +00:00
lain
9bc7b19500 Apply suggestion to docs/USER_GUIDE.md 2019-06-24 22:06:02 +00:00
lain
0ba0f8f1f1 Documentations: Add docs for settings. 2019-06-21 12:47:54 +02:00
HJ
3ec9ef8975 Apply suggestion to docs/CONFIGURATION.md 2019-06-17 16:08:32 +00:00
HJ
886b097a67 Apply suggestion to docs/CONFIGURATION.md 2019-06-17 16:06:01 +00:00
HJ
201ea169fe Apply suggestion to docs/USER_GUIDE.md 2019-06-17 11:40:31 +00:00
HJ
8543bab582 Apply suggestion to docs/USER_GUIDE.md 2019-06-17 11:39:23 +00:00
HJ
934ca66d87 Apply suggestion to docs/USER_GUIDE.md 2019-06-17 11:38:54 +00:00
HJ
65520d7a01 Apply suggestion to docs/USER_GUIDE.md 2019-06-17 11:38:22 +00:00
HJ
ee9bacee7a Apply suggestion to docs/USER_GUIDE.md 2019-06-17 11:37:03 +00:00
Henry Jameson
5a70eda5e8 fix 2019-06-16 21:54:27 +03:00
Henry Jameson
bda36c64c0 User guide + updates 2019-06-16 21:53:00 +03:00
Henry Jameson
b00da17788 Merge remote-tracking branch 'upstream/develop' into docs
* upstream/develop: (374 commits)
  fix typo
  rename mutations according to actual property names
  fix
  fix
  fix logged out post-update
  fix user banner
  fix
  AMERICA
  comments
  No longer sending extra data, renamed some properties
  Revert "add TOTP/Recovery Form for mobile version"
  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
  ...
2019-06-16 20:24:03 +03:00
HJ
1db3c785d8 Merge branch 'masto-register-app-secret' into 'develop'
Proper clientId/secret/token caching, MastoAPI registration

Closes #554

See merge request pleroma/pleroma-fe!806
2019-06-16 11:18:21 +00:00
HJ
1fc460a7a5 Merge branch 'hotfix-token-auth' into 'develop'
Fix broken token authentication

See merge request pleroma/pleroma-fe!831
2019-06-13 19:05:05 +00:00
taehoon
de2504ad6c fix typo 2019-06-13 15:00:13 -04:00
Henry Jameson
acbeea59ff rename mutations according to actual property names 2019-06-13 10:11:17 +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
0988065f50 fix 2019-06-13 10:05:22 +03:00
Henry Jameson
dba8d8910c fix 2019-06-13 10:00:06 +03:00
Henry Jameson
d551b39859 fix logged out post-update 2019-06-13 09:48:43 +03:00
HJ
2e77a3ffef Merge branch 'hotfix-user-background' into 'develop'
fix user banner

See merge request pleroma/pleroma-fe!828
2019-06-12 22:53:24 +00:00
Henry Jameson
d1fd3e3a1c fix user banner 2019-06-13 01:48:41 +03:00
Henry Jameson
edb24da016 fix 2019-06-13 01:02:08 +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
6cd4546873 comments 2019-06-13 00:44:25 +03:00
Henry Jameson
af75c6d1ea No longer sending extra data, renamed some properties 2019-06-13 00:39:51 +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
HJ
e53f11c30f Merge branch 'feature/2fa' into 'develop'
adds 2FA/two_factor_authentication support

See merge request pleroma/pleroma-fe!556
2019-06-12 20:16:55 +00: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
HJ
855080b896 Merge branch 'update-japanese-translation' into 'develop'
i18n/Update Japanese translation

See merge request pleroma/pleroma-fe!815
2019-06-11 12:10:47 +00:00
322c9fbfb6 i18n/Update Japanese translation 2019-06-11 12:10:47 +00:00
kaniini
33554e8d1d Merge branch '547' into 'develop'
Fix "Delete account modal partially hidden" issue

Closes #547

See merge request pleroma/pleroma-fe!803
2019-06-08 17:40:15 +00:00
taehoon
9c8af14908 render modal at the root level using portal 2019-06-06 13:37:27 -04:00
taehoon
5740123ee6 install portal vue 2019-06-06 13:37:26 -04:00
HJ
0ecf23881d Merge branch 'small-improve-of-who-to-follow-panel-layout' into 'develop'
Small improve of the who to follow panel layout

See merge request pleroma/pleroma-fe!821
2019-06-05 17:43:35 +00:00
5b274364ce Small improve of the who to follow panel layout 2019-06-05 17:43:35 +00:00
HJ
e9e7b36c69 Merge branch 'fix/avatars-in-who-to-follow-page-are-missing' into 'develop'
Fix/Small fix in the who to follow page

See merge request pleroma/pleroma-fe!820
2019-06-04 08:04:47 +00:00
809d872b2d Fix/Small fix in the who to follow page 2019-06-04 08:04:47 +00:00
Shpuld Shpludson
7ce9b7be07 Merge branch 'fix/remove-notifications-console-spam' into 'develop'
fix: Remove some console spam

See merge request pleroma/pleroma-fe!818
2019-06-01 09:15:53 +00:00
shpuld
4526939dae remove console spam 2019-06-01 12:10:00 +03: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