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
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
Maksim
77eceedbf7
Revert "add TOTP/Recovery Form for mobile version"
...
This reverts commit a3811f944819430c278b6da6b08dc322a9b9ff65.
2019-06-12 20:16:55 +00:00
Henry Jameson
e7a2a7267d
Proper clientId/secret/token caching, MastoAPI registration
2019-05-22 19:13:41 +03:00
taehoon
110c9d3b26
improve performance by caching pinned status ids into user object
2019-05-15 12:04:26 -04:00
taehoon
f8186bfc74
show immediately pinned statuses
2019-05-15 12:04:26 -04:00
taehoon
8308315038
revert removeStatus changes
2019-05-15 12:04:26 -04:00
taehoon
1229622fed
refactor error handling of pinStatus
2019-05-15 12:04:25 -04:00
taehoon
ce1d19136d
refactor pin/unpin status logic
2019-05-15 12:04:25 -04:00
taehoon
e8abe1273b
filter pinned statuses based on pinned entity instead of a separate user entity
2019-05-15 12:04:25 -04:00
taehoon
cd0a7afa06
remove pinned timeline, instead, use simple entity of user object
2019-05-15 12:04:25 -04:00
dave
e6268c492e
#468 - clean up
2019-05-15 12:04:25 -04:00
dave
df207593e9
#468 - update pinned status after actions(remove, add)
2019-05-15 12:04:24 -04:00
dave
f1ff48ffd6
#468 - remove unpinned status from timeline
2019-05-15 12:04:24 -04:00
dave
2c89d49a3d
#468 - show pinned timeline and add pinned label to the status
2019-05-15 12:04:24 -04:00
dave
1aa0e8d7e0
#468 - pin/unpin status
2019-05-15 12:04:24 -04:00
HJ
cd67b1f496
Merge branch '527' into 'develop'
...
Fix "Liking/reprööting posts while post is highlighted in conversation fails to update the liked/reprööted status"
Closes #527
See merge request pleroma/pleroma-fe!787
2019-05-09 17:17:26 +00:00
HJ
177e53cf6a
Merge branch 'mobile-scope' into 'develop'
...
Display additional scope description above the status form for mobile users.
Closes #505
See merge request pleroma/pleroma-fe!767
2019-05-09 17:13:50 +00:00
taehoon
7d60ab322e
use backendInteractor
2019-05-07 23:36:35 -04:00
taehoon
a54cf47ba5
clean up
2019-05-07 23:21:19 -04:00
taehoon
28c2a700e1
update favorite number earlier
2019-05-07 23:19:46 -04:00
taehoon
ff3a7e8b5b
update status interaction upon retweet action response
2019-05-07 23:17:52 -04:00
taehoon
f75e40e462
sync up favoritedBy with favorite/unfavorite action
2019-05-07 16:43:54 -04:00
taehoon
78a4ab98af
do not regenerate status object
2019-05-07 16:20:24 -04:00
HJ
157d4e601e
Merge branch 'fix/floating-button' into 'develop'
...
Mobile Post button fix
Closes #506
See merge request pleroma/pleroma-fe!769
2019-05-07 18:40:49 +00:00
eugenijm
4af343374a
Move scope visibility notice to the status form, make it dismissible
2019-05-07 19:13:45 +03:00
taehoon
1b07c6ae4f
add processing state and close modal after api request is completed
2019-05-03 11:40:05 -04:00
taehoon
cea6ea42f0
add api service function
2019-05-03 11:40:05 -04:00
taehoon
2cda9010df
add user reporting modal
2019-05-03 11:40:05 -04:00
Shpuld Shpludson
b1bd5bd08e
Merge branch 'develop' into 'brendenbice1222/pleroma-fe-issues/pleroma-fe-202-show-boosted-users'
...
# Conflicts:
# src/services/api/api.service.js
2019-04-30 15:11:30 +00:00
shpuld
da08388d6a
filter outside of component
2019-04-29 22:36:39 +03:00
eugenijm
ae1496cfb4
Make floating post button configurable
2019-04-29 21:32:29 +03:00
taehoon
f2f3fa81d8
refer searched user objects from the global user rep
2019-04-22 11:17:01 -04:00
shpuld
d417945427
Merge branch 'develop' into brendenbice1222/pleroma-fe-issues/pleroma-fe-202-show-boosted-users
2019-04-22 17:24:35 +03:00
taehoon
992c8e1f77
stop fetching user relationship when user is unauthorized
2019-04-17 22:47:56 -04:00
taehoon
d3cad54aa3
add bulk mute/unmute buttons and wire up to vuex
2019-04-17 11:32:49 -04:00
taehoon
13c8f10f4b
wire up bulk action buttons to vuex
2019-04-17 11:32:49 -04:00
Shpuld Shpludson
55410c91fa
Merge branch '489' into 'develop'
...
Fix Blocked status inconsistency between Blocks setting tab and Following profile tab
Closes #489
See merge request pleroma/pleroma-fe!751
2019-04-15 19:58:15 +00:00
taehoon
948baba9d3
add muted user to the mutes list in real time
2019-04-14 23:44:50 -04:00
taehoon
5c2c222252
add blocked user to the blocked list on real time
2019-04-14 23:44:49 -04:00
taehoon
69f9ea987c
make blocking functional in the search results
2019-04-14 23:44:49 -04:00
taehoon
e7010d73ac
store friends/followers in the global user repository
2019-04-14 23:41:38 -04:00
Brenden Bice
41845389a9
display no message on empty data fetched from api
2019-04-12 23:12:22 -04:00
Brenden Bice
2ae0507575
remove error message on no more following
2019-04-12 23:09:05 -04:00
Brenden Bice
8ed4eb8a7f
refactor showing favs and repeats logic
2019-04-11 23:26:13 -04:00
Brenden Bice
f74a6b4b57
display favs & reblogged users on expanded post in timeline view
2019-04-11 23:26:13 -04:00
Brenden Bice
8c9bcdc6c1
rename favourite to favorite
2019-04-11 23:26:12 -04:00
Brenden Bice
4ab2ddb03c
improve code quality
2019-04-11 23:26:12 -04:00
Brenden Bice
85457fc917
fetch reblogged users
2019-04-11 23:26:12 -04:00
Brenden Bice
2d339cd3b8
fetch favorited users
2019-04-11 23:26:12 -04:00
taehoon
ab7a418d80
maintain conversationsObject storage
2019-04-11 12:46:06 -04:00
dave
d498a26af5
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-436-mastoapi-notifications
2019-04-09 15:42:05 -04:00
Shpuld Shpludson
1e9ddcb0da
Merge branch 'fix/notification-bugs' into 'develop'
...
#474 Fix notification bugs
Closes #474
See merge request pleroma/pleroma-fe!728
2019-04-09 15:24:33 +00:00
dave
d3218807b4
#436 - merge develop
2019-04-08 21:04:59 -04:00
Shpuld Shpludson
546ced43d9
Merge branch 'moderation-menu' into 'develop'
...
Moderation menu #310
See merge request pleroma/pleroma-fe!595
2019-04-08 19:01:40 +00:00
dave
b0da32fea2
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-436-mastoapi-notifications
2019-04-08 14:29:12 -04:00
Maksim
7259e02a10
remove debug message
2019-04-08 16:49:51 +00:00
jasper
1c04cd2036
Add space
2019-04-04 09:06:53 -07:00
jasper
a1275be4c0
Separate timeline and notification
2019-04-04 09:03:56 -07:00
jasper
7c2b65e9a3
Remove useless codes
2019-04-03 09:08:23 -07:00
jasper
ea27483f27
Fix notification bugs
2019-04-03 09:04:46 -07:00
dave
fe756fe30d
#436 - revert stripe html for notification
2019-04-03 11:17:23 -04:00
dave
6ed26ce65d
#436 - notification html to text content
2019-04-03 10:58:39 -04:00
dave
6fa014505c
#436 - revert notification silience config
2019-04-03 10:53:11 -04:00
dave
c9a9b3122d
#469 - DM warning text should vary based on BE setting
2019-04-02 10:26:14 -04:00
dave
8b3f037f87
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-436-mastoapi-notifications
2019-04-02 10:07:36 -04:00
eugenijm
6b6878bde0
Added moderation menu
2019-04-01 23:30:06 +03:00