a4408cffa8
fix merge conflicts
2019-06-18 17:50:20 +03:00
f243739954
Add basic clientside validation for polls
2019-06-18 17:42:31 +03:00
ac46de3972
Merge branch 'mastoapi-login-and-config-fixes' into 'develop'
...
Mastoapi login and config fixes
See merge request pleroma/pleroma-fe!833
2019-06-17 20:17:58 +00:00
22a3351208
Apply suggestion to src/services/backend_interactor_service/backend_interactor_service.js
2019-06-17 20:12:11 +00:00
e817b5b5a4
change fallback for polls to be false
2019-06-17 22:47:31 +03:00
bf6e1155c5
uncomment the ws stuff
2019-06-17 22:45:23 +03:00
c92d86519c
merge develop
2019-06-17 21:56:02 +03:00
602dded2fd
fix test to use now tolerance
2019-06-17 21:20:23 +03:00
64737f32d2
make min/max expiry dynamic
2019-06-17 21:13:24 +03:00
8caf13bbce
Apply suggestion to src/services/api/api.service.js
2019-06-17 08:20:02 +00:00
8d2e63a8e4
Merge branch 'fix-mfa' into 'develop'
...
fix MFA crashing on user-settings page
See merge request pleroma/pleroma-fe!834
2019-06-17 07:33:39 +00:00
06c84a9cf3
fix MFA crashing on user-settings page
2019-06-16 20:36:21 +03:00
b72aa97098
fixup! Removed formattingOptionsEnabled in favor of relying on BE-provided list of accepted formatting options
2019-06-16 20:23:07 +03:00
6744396f82
getting and setting user background via MastoAPI
2019-06-16 20:17:59 +03:00
e3638af031
Removed formattingOptionsEnabled in favor of relying on BE-provided list of
...
accepted formatting options
2019-06-16 20:16:52 +03:00
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
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
32dae8eb7a
fix radio buttons, polish stuff
2019-06-13 22:01:11 +03:00
de2504ad6c
fix typo
2019-06-13 15:00:13 -04:00
acbeea59ff
rename mutations according to actual property names
2019-06-13 10:11:17 +03:00
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
d7b75ba037
combine the 2 poll components, do the footer
2019-06-10 22:35:33 +03:00
6bc1d10ae9
Fix poll crash
2019-06-09 22:41:39 +03:00
1a989d0661
polish the poll form
2019-06-09 22:33:25 +03:00
e2dc0d85fc
replace vue-timeago with custom timeago
2019-06-09 14:07:54 +03: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
88c3103755
make poll form state local instead of vuex
2019-06-07 19:09:38 +03: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
70ba232ce3
fix refreshing
2019-06-06 07:33:00 +03:00
080921e977
make poll voting update status, making it reactive, fix multiple choice voting
2019-06-05 22:19:13 +03: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
shpuld