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
0988065f50
fix
2019-06-13 10:05:22 +03:00
dba8d8910c
fix
2019-06-13 10:00:06 +03:00
d551b39859
fix logged out post-update
2019-06-13 09:48:43 +03:00
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
d1fd3e3a1c
fix user banner
2019-06-13 01:48:41 +03:00
edb24da016
fix
2019-06-13 01:02:08 +03:00
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
1e94aecbc9
AMERICA
2019-06-13 00:47:06 +03:00
6cd4546873
comments
2019-06-13 00:44:25 +03:00
af75c6d1ea
No longer sending extra data, renamed some properties
2019-06-13 00:39:51 +03:00
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
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
77eceedbf7
Revert "add TOTP/Recovery Form for mobile version"
...
This reverts commit a3811f944819430c278b6da6b08dc322a9b9ff65.
2019-06-12 20:16:55 +00:00
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
a7b0b07e6f
Apply suggestion to src/services/entity_normalizer/entity_normalizer.service.js
2019-06-12 11:44:14 +00:00
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
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
9c8af14908
render modal at the root level using portal
2019-06-06 13:37:27 -04:00
5740123ee6
install portal vue
2019-06-06 13:37:26 -04:00
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
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
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
4526939dae
remove console spam
2019-06-01 12:10:00 +03:00
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
feld
9c0ec9b794
Merge branch 'fix/interactions-i18n' into 'develop'
...
Interactions i18n
See merge request pleroma/pleroma-fe!817
2019-05-31 15:19:10 +00:00
f67f14495b
i18n
2019-05-31 10:13:06 -05:00
50618b81c8
Merge branch '543' into 'develop'
...
Fix "stale user settings shown after save"
Closes #543
See merge request pleroma/pleroma-fe!813
2019-05-29 17:08:27 +00:00
6045708a5d
Merge branch 'fix-dropdown' into 'develop'
...
move drowdown menu to popper
Closes #559
See merge request pleroma/pleroma-fe!814
2019-05-29 16:55:28 +00:00
0532995847
wire up user.description with masto api data
2019-05-29 12:32:14 -04:00
152617e20d
Merge branch 'i18n/add-pedantic-japanese-2' into 'develop'
...
i18n/Add Japanese with kanji (2)
Closes #522
See merge request pleroma/pleroma-fe!816
2019-05-29 05:31:03 +00:00
443794b000
i18n/Add Japanese with kanji (2)
2019-05-29 05:31:03 +00:00
6c7eeb93fe
move drowdown menu to popper
2019-05-27 00:13:08 +03:00
855566f887
notification controls: redesign entirely
2019-05-25 23:44:36 +00:00
ac97cd3e46
entity normalizer: collapse data.pleroma if blocks
2019-05-25 22:59:04 +00:00
28ca504576
wire up notification settings
2019-05-25 07:34:59 +00:00
ab34a75bcf
Merge branch '556' into 'develop'
...
Fix User links/mentions opening in new tab issue
Closes #556
See merge request pleroma/pleroma-fe!808
2019-05-23 05:34:15 +00:00
2af35b8404
do not miss statusnet_profile_url of mentions
2019-05-22 23:47:20 -04:00
45961331b6
Merge branch 'update-hebrew-transalation' into 'develop'
...
Update he.json
See merge request pleroma/pleroma-fe!807
2019-05-22 18:50:32 +00:00
4249a2fd6f
Translation to Hebrew of everything other than theme_helpers and style.
2019-05-22 21:33:05 +03:00
e7a2a7267d
Proper clientId/secret/token caching, MastoAPI registration
2019-05-22 19:13:41 +03:00
3b3e4ffc54
Translate up to settings.
2019-05-22 01:46:08 +03:00
fc12b63fcc
mastoapi login works
2019-05-21 23:35:40 +03:00
233506f6c1
Merge branch 'fix-pipelines' into 'develop'
...
Fix pipelines and clean up console output
See merge request pleroma/pleroma-fe!804
2019-05-21 18:27:43 +00:00
52475dbf23
Fix pipelines and clean up console output
2019-05-21 21:22:00 +03:00
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
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
Henry Jameson
feld