lain
431b3f527d
StaffPanel: Move staff loading to panel creation.
2020-07-07 14:39:43 +02:00
Shpuld Shpuldson
87b5f828d7
fix conflicts, use file icon instead of link, add support for audio and file icon in cw'd posts
2020-07-06 14:01:03 +03:00
Shpuld Shpludson
b761bcf333
Merge branch 'fix/remove-extra-notifications-fetch' into 'develop'
...
Fix: notifications fetcher double fetching on every tick
See merge request pleroma/pleroma-fe!1164
2020-07-05 07:03:27 +00:00
Shpuld Shpludson
af4a26b588
Merge branch 'feat/allow-use-without-cookies' into 'develop'
...
Fix #815 : Allow use without cookies, Add a global notice popup system
Closes #815
See merge request pleroma/pleroma-fe!1166
2020-07-05 06:53:29 +00:00
Eugenij
de291e2e33
Add bookmarks
...
Co-authored-by: jared <jaredrmain@gmail.com>
2020-07-03 19:45:49 +00:00
Shpuld Shpuldson
685ab4f33e
make the addNotice dispatch return the notice
2020-07-02 10:46:43 +03:00
Shpuld Shpuldson
1293bec77e
change storage error one-off into a global notice system
2020-07-02 10:40:41 +03:00
Shpuld Shpludson
c0fb35b106
Merge branch 'develop' into 'xenofem/pleroma-fe-rebased-image-description-authoring'
...
# Conflicts:
# CHANGELOG.md
2020-07-02 04:50:03 +00:00
Shpuld Shpuldson
15d492ace4
revert accidental change in instance.js
2020-07-01 19:24:17 +03:00
Shpuld Shpuldson
d30b0b28c9
catch localforage error and let the application work, add an alert for user to dismiss
2020-07-01 19:15:28 +03:00
Shpuld Shpuldson
62d0bc47b3
remove unnecessary fetchAndUpdate, change notifications fetcher to not double fetch
2020-07-01 14:15:04 +03:00
Shpuld Shpuldson
ea09bbecf8
Make use of backend reply filtering
2020-06-30 17:02:38 +03:00
Shpuld Shpuldson
96d2c86d3b
change placeholders to use descriptions, use icons with placeholders, change uploads to use attachment component
2020-06-29 14:48:22 +03:00
Shpuld Shpludson
ea0a12f604
Merge branch 'develop' into 'iss-149/profile-fields-setting'
...
# Conflicts:
# src/components/settings_modal/tabs/profile_tab.vue
2020-06-27 07:19:49 +00:00
lain
1afa0f0044
Merge branch 'notification-unification-experiments' into 'develop'
...
Notification unification / WebPush i18n.
See merge request pleroma/pleroma-fe!1142
2020-06-19 13:34:04 +00:00
Shpuld Shpuldson
4e0b4427a9
remove recentqueries thing
2020-06-18 14:19:21 +03:00
Shpuld Shpuldson
fa7bcb74ce
return the correct promise type from action
2020-06-18 13:00:09 +03:00
Shpuld Shpuldson
9c884fef11
remove search blocker, fix debounce params
2020-06-18 12:29:13 +03:00
lain
a52a393266
NotificationUtils: Extract preparation of notification object.
2020-06-11 15:22:31 +02:00
Shpuld Shpludson
4e3ce18703
Merge branch 'feature/autocomplete-domain-mutes' into 'develop'
...
Autocomplete domain mutes from list of known instances
Closes #824
See merge request pleroma/pleroma-fe!1103
2020-06-10 11:18:30 +00:00
kPherox
cc4691a4ef
Fix merging array field for users
2020-06-10 03:48:49 +09:00
lain
99eaec8547
Messages: Load languages asynchronously.
...
Reduces the size of the initial app bundle by about half.
2020-06-08 17:22:07 +02:00
Sergey Suprunenko
1007039478
Autocomplete domain mutes from list of known instances
2020-06-08 13:17:18 +02:00
Henry Jameson
9e3e6b0c69
Merge remote-tracking branch 'origin/develop' into settings-modal
...
* origin/develop: (22 commits)
changelog
alignment fixes
Update CHANGELOG.md
StillImage: Make it work properly in both firefox and chrome.
ReactButton: Change the combined emoji (heart) to a simple one.
Linting fixes.
Settings: Keep a local version of the mutedWordsString
MediaModal: Close on browser navigation events.
StatusContent: Try to get hashtag from dataset first.
Docs: Change wrong documentation.
EntityNormalizerSpec: More fixes.
EntityNormalizerSpec: Test new behavior.
EntityNormalizer: Add colons to emoji alt text.
fixed case in class name
The sidebarRight option wasn't being read
Use consistent naming for Pleroma-FE in README
Remove mention of GNU Social
lint
multiple fixes
fix non-mention notifs
...
2020-06-07 00:10:21 +03:00
Henry Jameson
4fae2f8ea8
track if settings modal has been opened once
2020-06-02 01:10:52 +03:00
Henry Jameson
5187b37aca
moved multiChoiceProperties where it fits better
2020-05-26 22:50:37 +03:00
Henry Jameson
9d09e4090f
multiple fixes
2020-05-26 01:01:25 +03:00
Henry Jameson
83e5ee5494
fix non-mention notifs
2020-05-26 00:22:15 +03:00
Henry Jameson
b5c1d074f8
fix reprööted posts not being muted properly. fix muted posts making
...
desktop notifications
2020-05-25 23:38:31 +03:00
Henry Jameson
138ec85003
Merge remote-tracking branch 'origin/develop' into settings-modal
...
* origin/develop: (95 commits)
Translated using Weblate (Italian)
Translated using Weblate (Chinese (Simplified))
Translated using Weblate (Russian)
Translated using Weblate (Polish)
Translated using Weblate (Dutch)
Translated using Weblate (German)
Translated using Weblate (German)
Translated using Weblate (German)
Translated using Weblate (German)
Translated using Weblate (German)
Translated using Weblate (German)
Translated using Weblate (German)
Translated using Weblate (German)
Translated using Weblate (German)
Translated using Weblate (German)
Translated using Weblate (German)
Translated using Weblate (German)
Translated using Weblate (German)
Translated using Weblate (German)
Translated using Weblate (German)
...
2020-05-25 03:29:48 +03:00
Shpuld Shpludson
a8e9c05f09
Merge branch 'feat/sidebar-alignment' into 'develop'
...
[#765 ] Permit sidebar alignment with instance configuration option
See merge request pleroma/pleroma-fe!1106
2020-05-20 15:42:42 +00:00
lain
bc9ed36424
Merge branch 'feat/add-embed-relationships' into 'develop'
...
Add `with_relationships` query param
Closes #838
See merge request pleroma/pleroma-fe!1107
2020-05-17 07:27:07 +00:00
Mark Felder
2135dc8510
Merge branch 'develop' into feat/sidebar-alignment
2020-05-15 12:26:38 -05:00
Mark Felder
229bf79d90
name setting should be with apiConfig section
2020-05-13 17:20:35 -05:00
Mark Felder
79c53b849e
registrationOpen is not an FE setting
2020-05-13 16:46:58 -05:00
Mark Felder
03318b64aa
Really alpha sort this
2020-05-13 15:48:21 -05:00
Mark Felder
e80fa3ff6d
Split apiConfig options from static/config.json options;
...
Move safeDM to nasty section, alpha sort things
2020-05-13 15:40:13 -05:00
Mark Felder
62e0fda597
loginMethod was missing
2020-05-13 14:46:31 -05:00
Mark Felder
a4a25105ba
Separate the user configurable section
2020-05-13 14:43:36 -05:00
Mark Felder
98d332793c
alpha sort
2020-05-13 14:40:46 -05:00
Shpuld Shpuldson
9c7cb3a954
remove search1 with_relationships
2020-05-13 18:04:30 +03:00
Shpuld Shpuldson
8e39971098
add with_relationships where necessary
2020-05-13 17:48:31 +03:00
Mark Felder
bc5005b3dd
Permit sidebar alignment with instance configuration option
2020-05-12 13:59:52 -05:00
Shpuld Shpludson
1186205583
Merge branch 'develop' into 'feat/relationship-refactor'
...
# Conflicts:
# src/components/notification/notification.js
2020-05-08 08:35:30 +00:00
Henry Jameson
2e35289c33
initial work on settings modal
2020-05-03 17:36:12 +03:00
Shpuld Shpuldson
92ccaa97bb
don't dismiss a rejected follow request on server
2020-05-02 11:51:39 +03:00
Shpuld Shpuldson
75519223f9
mark single notifs as seen properly on server
2020-05-02 10:52:57 +03:00
eugenijm
01b07f01e9
Add support for follow request notifications
2020-04-30 09:58:55 +03:00
Shpuld Shpuldson
8b1aa593a4
fix status mutes
2020-04-27 10:06:17 +03:00
Shpuld Shpuldson
af9492977a
add back mute prediction, add getter for relationships
2020-04-24 18:53:17 +03:00
Shpuld Shpuldson
cda298c822
remove unused mutation and test for it
2020-04-23 11:17:52 +03:00
Shpuld Shpuldson
4b7007bc7d
fix mistakes
2020-04-21 23:56:48 +03:00
Shpuld Shpuldson
6bb75a3a6d
make relationships separate from users
2020-04-21 23:27:51 +03:00
Henry Jameson
0702934f4f
fix trasparency problems in some cases (purple headers)
2020-03-04 00:23:14 +02:00
Shpuld Shpuldson
ab4005add5
add status unavailable message when status can't be loaded in status preview
2020-03-02 08:35:57 +02:00
Shpuld Shpludson
ee582855d2
Apply suggestion to src/modules/instance.js
2020-02-28 17:20:40 +00:00
Shpuld Shpuldson
5b7acca0ba
make theme loading work with source-only presets
2020-02-22 10:57:08 +02:00
Shpuld Shpludson
0abc3f9b85
Merge branch 'moderation-menu-fix' into 'develop'
...
Fix user deactivation, deletion, and role assignment in the moderation menu
See merge request pleroma/pleroma-fe!1063
2020-02-19 16:30:53 +00:00
eugenijm
695d6b6c50
Fix user activation/deactivation, deletion, and role assignment in the moderation menu
2020-02-17 16:29:39 +03:00
HJ
84ebae8ed3
Merge branch 'develop' into 'themes-accent'
...
# Conflicts:
# src/components/emoji_reactions/emoji_reactions.vue
2020-02-11 23:09:15 +00:00
Shpuld Shpludson
f6b482be51
Emoji Reactions - fixes and improvements
2020-02-11 12:24:51 +00:00
Henry Jameson
f0c4bb1193
Merge remote-tracking branch 'upstream/develop' into themes-accent
...
* upstream/develop: (33 commits)
add emoji reactions to changelog
fix emoji reaction classes broken in develop
review changes
Fix password and email update
remove unnecessary anonymous function
Apply suggestion to src/services/api/api.service.js
remove logs/commented code
remove favs count from react button
remove mock data
change emoji reactions to use new format
Added polyfills for EventTarget (needed for Safari) and CustomEvent (needed for IE)
Fix missing TWKN when logged in, but server is set to private mode.
Fix follower request fetching
Add domain mutes to changelog
Implement domain mutes v2
change changelog to reflect actual release history of frontend
Fix #750 , fix error messages and captcha resetting
Optimize Notifications Rendering
update CHANGELOG
Use last seen notif instead of first unseen notif for sinceId
...
2020-01-28 20:44:13 +02:00
Shpuld Shpuldson
c4beac5f89
Merge branch 'develop' into feat/emoji-reactions
2020-01-26 15:59:59 +02:00
Shpuld Shpuldson
a018ea622c
change emoji reactions to use new format
2020-01-26 15:45:12 +02:00
Henry Jameson
9336140486
massively improved initial theme loading code, added checks and warnings when
...
loading theme files (import/localStorage/defaults)
2020-01-22 00:37:19 +02:00
lain
8080981fcd
Fix follower request fetching
2020-01-21 16:51:49 +01:00
Shpuld Shpludson
7a013ac393
Implement domain mutes v2
2020-01-15 20:22:54 +00:00
Shpuld Shpludson
662afe973a
Fix #750 , fix error messages and captcha resetting
2020-01-14 13:45:00 +00:00
Shpuld Shpuldson
b10b92a876
clean up code, fix prediction bug
2020-01-14 10:06:14 +02:00
Shpuld Shpuldson
b32888194c
fix merge conflicts
2020-01-13 23:47:32 +02:00
Shpuld Shpuldson
33abbed5a1
usable-but-buggy: picker, adding/removing reaction on click, search, styles
2020-01-13 23:34:39 +02:00
HJ
215662afde
Merge branch 'develop' into 'fix-move-type-notification'
...
# Conflicts:
# static/fontello.json
2020-01-03 09:05:48 +00:00
Henry Jameson
bd07e5de1c
unify showimmideately
2019-12-26 14:35:46 +02:00
Henry Jameson
43197c4243
Some error handling
2019-12-26 14:12:35 +02:00
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
36376ce57c
use vuex action
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
Maksim Pechnikov
addacf36d1
mfa: removed unused code
2019-12-12 21:19:13 +03:00
Henry Jameson
585702b1ce
fix desktop notifications not working with streaming
2019-12-12 18:53:36 +02:00
taehoon
d0c78989aa
hide instance url/link/text in header using hideSitename option
2019-12-11 10:14:30 -05:00
kPherox
c3e7806acb
remove unused fallback
2019-12-11 18:48:18 +09:00
kPherox
e8333fff8d
change the expression of move
2019-12-11 18:30:23 +09:00
Henry Jameson
6acd889589
Option to enable streaming
2019-12-10 21:30:27 +02:00
kPherox
6af870cd90
Add view for moves notifications
2019-12-11 00:00:45 +09:00
kPherox
2bc63720a5
fix parse for move type notifications
2019-12-11 00:00:36 +09: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
Henry Jameson
ff95d865d2
Updated streaming and improved error-handling, some more refactoring to api
2019-12-08 16:05:41 +02:00
Wyatt Benno
13fc2612ae
Change 403 messaging
2019-12-05 11:48:37 +09:00
Henry Jameson
172ebaf4e6
improved initial notifications fetching
2019-11-24 22:01:12 +02:00
Henry Jameson
319bb4ac28
initial streaming work
2019-11-24 18:50:28 +02:00
Henry Jameson
ddb6fb9217
Backend Interactor service overhaul, removed the need for copypasting
2019-11-24 13:57:46 +02:00
HJ
0eda60eeb4
Merge branch 'greentext-strikes-back' into 'develop'
...
⑨ Added greentext support ⑨
Closes #9
See merge request pleroma/pleroma-fe!994
2019-11-19 14:22:17 +00:00
kPherox
0995658757
backend interactor service: implement startFetchingFollowRequest
...
backend interactor service: remove unused fetchFollowRequests
2019-11-19 14:07:15 +00:00
Shpuld Shpuldson
d007502629
add fetching for emoji reactions, draft design
2019-11-15 08:39:21 +02:00
Henry Jameson
897131572f
Made it optional
2019-11-14 00:47:20 +02:00
taehoon
3c3f2c654e
add hideISP to defaultState of config module
2019-11-10 14:42:01 -05:00
Henry Jameson
0dcb696e26
Merge remote-tracking branch 'upstream/develop' into emoji-optimizations
...
* upstream/develop: (95 commits)
Lightbox/modal multi image improvements - #381
'/api/pleroma/profile/mfa' -> '/api/pleroma/accounts/mfa'
Add ability to change user's email
translations-de-batch-1
eu-translate update
profile-banner rounding css, fixes #690
fix indentation
remove needless ref
show preview popover when hover numbered replies
refactor conditions
do not make too many nested div
add fetchStatus action
refactor status loading logic
split status preview popover into a separate component
uninstall mobile-detect library
listen both events
minor css fix
restrict distance at top side only
set different trigger event in desktop and mobile by default
fix eslint warnings
...
2019-11-08 19:48:31 +02:00
Henry Jameson
b66564a30d
Merge remote-tracking branch 'upstream/develop' into settings-refactor
...
* upstream/develop: (89 commits)
remove needless ref
show preview popover when hover numbered replies
refactor conditions
do not make too many nested div
add fetchStatus action
refactor status loading logic
split status preview popover into a separate component
uninstall mobile-detect library
listen both events
minor css fix
restrict distance at top side only
set different trigger event in desktop and mobile by default
fix eslint warnings
fix popper go behind the top bar
migrate Popper to v-popover
fix popper go behind the top bar
fix eslint warnings
reset font-size to normal text size using rem
use top placement by default
hide status preview popper when hover popper content
...
2019-10-29 09:36:16 +02:00
taehoon
f969e9ab3d
add fetchStatus action
2019-10-24 22:21:33 -04:00
Henry Jameson
c000879f2f
moved emoji fetching from user to instance since it's its state anyway
2019-10-09 22:50:00 +03:00
Henry Jameson
91ca1db778
moved emoji stuff away from after-store and into users module since we only need
...
emoji after login
2019-10-08 21:38:27 +03:00
Henry Jameson
39b71e5dd6
Removed all whole mess of manual watch/data declaration, now fully automatic
2019-09-29 23:47:26 +03:00
Henry Jameson
979e170bd6
created mergedConfig getter to avoid obnoxious checks for undefined everywhere
2019-09-29 22:33:15 +03:00
Maksim Pechnikov
19cb98b85f
Merge branch 'develop' into feature/following_reblogs
2019-09-26 21:14:31 +03:00
Henry Jameson
a3305799c7
Merge remote-tracking branch 'upstream/develop' into emoji-selector-update
...
* upstream/develop: (42 commits)
Fix formatting in oc.json
avoid using global class
fix logo moving bug when lightbox is open
Reserve scrollbar gap when body scroll is locked
setting display: initial makes trouble, instead, toggle display: none using classname
lock body scroll
add body-scroll-lock directive
install body-scroll-lock
wire up props with PostStatusModal
rename component
recover autofocusing behavior
refactor MobilePostStatusModal using new PostStatusModal
add new module and modal to post new status
remove needless condition
add mention button
wire up user state with global store
collapse fav/repeat notifications from muted users
do not collapse thread muted posts in conversation
detect thread-muted posts
do not change word based muting logic
...
2019-09-25 20:26:49 +03:00
Henry Jameson
7b4cb38734
split spam mode into two separate options (one in settings page)
2019-09-23 20:36:49 +03:00
Maksim Pechnikov
8721fb57fc
added support hide\show reblogs from a specific user
2019-09-21 16:24:47 +03:00
taehoon
f4bbf1d4e2
add new module and modal to post new status
2019-09-20 11:29:24 -04:00
rinpatch
b33667a743
Avoid iterating over statuses to set thread_muted if the backend does
...
not support the extension
2019-09-04 22:17:29 +03:00
rinpatch
1a5a7bbebf
Set thread_muted for all statuses with the same conversation id on
...
status mute/unmute
2019-09-04 21:11:13 +03:00
taehoon
daf7d4e661
fix pin/unpin status logic
2019-09-01 13:07:43 -04:00
taehoon
13b80b5c7c
rename a mutation
2019-09-01 13:07:43 -04:00
Sergey Suprunenko
d74f6ed6ea
Initialize chat only if user is logged in and it wasn't initialized before
2019-08-17 08:18:42 +00: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
taehoon
876c6de806
fix typos
2019-07-24 21:02:37 -04: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
taehoon
670cbfdd1c
change subscribing to subscribed
2019-07-10 21:01:07 -04:00
taehoon
646d197bf1
mutate updated relationship to the store
2019-07-10 21:01:07 -04:00
jared
d5e8315e83
#482 - add subscribe button
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
taehoon
ab4d7d9616
refetch favs and repeats separately
2019-07-07 22:49:18 -04:00
taehoon
17498ef906
update favs and repeats stats using favoritedByUsers and rebloggedByUsers data
2019-07-07 22:49:18 -04:00
shpuld
7ed9d17ce7
Add thread muting to context menu of status
2019-07-07 23:02:09 +03:00
Shpuld Shpludson
54b0f90133
Merge branch 'eslint-fix' into 'develop'
...
Fix shitton warning eslint gives
See merge request pleroma/pleroma-fe!871
2019-07-07 19:12:33 +00:00
Shpuld Shpludson
171673113f
Merge branch 'revoke-token' into 'develop'
...
Revoke oAuth token on logout
Closes pleroma#952
See merge request pleroma/pleroma-fe!864
2019-07-07 18:29:36 +00:00
Henry Jameson
020c6d1bcf
all the manual fixes
2019-07-07 00:54:17 +03:00
HJ
8f53796420
Merge branch 'develop' into 'eslint-fix'
...
# Conflicts:
# src/components/post_status_form/post_status_form.vue
2019-07-06 20:43:38 +00:00
Henry Jameson
2c2b84d31d
npm eslint --fix .
2019-07-05 10:02:14 +03:00
taehoon
0e9b8be88c
clear userId property of timeline by default in clearTimeline action
2019-07-02 14:32:46 -04:00
Egor Kislitsyn
52319acf58
Revoke oAuth token
2019-07-02 15:33:40 +07:00
HJ
bb8e2b1933
Merge branch 'timeline-skip-fix' into 'develop'
...
timeline-skip-fix
See merge request pleroma/pleroma-fe!850
2019-06-24 22:08:09 +00:00
Wyatt Benno
7a5d06a6cf
change isPinned to noIdUpdate
2019-06-24 12:01:13 +09:00
Shpuld Shpludson
947f69a953
Fix: problems with polls state
2019-06-22 14:01:36 +00:00
Wyatt Benno
a1c50c3fc1
fix for #553
2019-06-21 10:31:00 +09:00
taehoon
bd377148ad
delete state.token instead of setting false
2019-06-20 11:48:31 -04:00
taehoon
c23228f196
fix error breaking logout flow
2019-06-20 11:48:30 -04:00
taehoon
268e9ce504
make sure to clear old token when logout
2019-06-20 11:48:29 -04:00
Shpuld Shpludson
e5e9bb27f3
Move poll state handling to its own module
2019-06-20 13:02:04 +00:00
lain
0eed2ccca8
Feature/polls attempt 2
2019-06-18 20:28:31 +00:00
Henry Jameson
de03eda9f3
fix user search
2019-06-17 23:39:30 +03:00
Henry Jameson
e3638af031
Removed formattingOptionsEnabled in favor of relying on BE-provided list of
...
accepted formatting options
2019-06-16 20:16:52 +03:00
Henry Jameson
acbeea59ff
rename mutations according to actual property names
2019-06-13 10:11:17 +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
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