Henry Jameson
a9a1fc37f5
fixes, cleanup
2020-01-12 04:00:41 +02:00
Henry Jameson
622c9d388e
Refactoring, forgotten files
2020-01-12 03:44:06 +02:00
Henry Jameson
38f2b969e4
simplified definition for text color by accounting for layers automatically,
...
fixed badge notification text color by adding 'bw' option for textColor
2020-01-11 23:07:41 +02:00
Henry Jameson
cce64077b5
Refactored style_setter to be more declarative instead of walls of copypasted code
2020-01-06 22:55:14 +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
4bb1c98e0f
Replaced v3compat
with source
to reduce code complexity. Made more slots
...
customizable. `theme` now contains a snapshot of theme generated for better
compatiblity and future-proofing
2020-01-02 20:36:10 +02:00
Henry Jameson
332d31dc02
support for "transparent" color keyword
2019-12-30 00:45:48 +02:00
Henry Jameson
6e11924c27
underlay customization, updated contrast calculations to account for alpha blending
2019-12-28 18:49:35 +02:00
Henry Jameson
1a78461443
fixed import-export
2019-12-28 17:02:34 +02:00
Henry Jameson
e5a34870f0
Accent works
2019-12-28 15:55:42 +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
45e7f93c49
refactor toggleActivationStatus
2019-12-15 14:32:04 -05:00
taehoon
506822bed0
replace setActivationStatus api with new one
2019-12-15 14:32:04 -05:00
HJ
c1a0e23947
Merge branch 'revert-c2c48ec2' into 'develop'
...
Reinstate `push` and `admin` scopes
See merge request pleroma/pleroma-fe!1034
2019-12-14 14:12:41 +00: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
HJ
9789123b1c
Merge branch 'mfa/login_form' into 'develop'
...
mfa: fix login and recovery form
See merge request pleroma/pleroma-fe!1031
2019-12-13 10:18:50 +00:00
Ivan Tashkinov
341416b0e0
Revert "Merge branch 'revert-96cab6d8' into 'develop'"
...
This reverts merge request !1032
2019-12-12 14:43:48 +00:00
lain
b399235848
Revert "Merge branch 'oauth-extra-scopes' into 'develop'"
...
This reverts merge request !1024
2019-12-12 09:38:24 +00:00
Maksim Pechnikov
f70fe28f64
mfa: fix login and recovery form
2019-12-12 08:42:21 +03:00
Henry Jameson
63a5f50e7c
fix deletes causing errors
2019-12-11 18:20:43 +02:00
Maksim Pechnikov
d6dc2bad1f
fixed typo
2019-12-11 15:59:29 +03: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
1a043d4350
remove console
2019-12-09 09:11:31 +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
Ivan Tashkinov
a06705d939
Added OAuth 'push' and 'admin' scopes.
2019-12-08 13:52:26 +03:00
Wyatt Benno
01855f315c
Wording updates
2019-12-06 09:38:55 +09: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
a55486f8d7
Normalize profile fields
2019-11-19 14:15:41 +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
bd2a682b83
tests + updates
2019-11-14 22:40:20 +02:00
Henry Jameson
692ee0e95a
Fix regex, tag detector condition
2019-11-14 00:41:14 +02:00
Henry Jameson
50dc9df8a4
adds greentext, also small fixes
2019-11-14 00:18:14 +02: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
Maksim
ded022a1d2
'/api/pleroma/profile/mfa' -> '/api/pleroma/accounts/mfa'
2019-11-08 02:42:32 +00:00
Sergey Suprunenko
e3381cdef1
Add ability to change user's email
2019-11-08 02:21:19 +00: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
Henry Jameson
6511a744a2
arbitrary limit with option to overcome it
2019-10-08 21:38:27 +03:00
Maksim Pechnikov
541a71c3a5
Merge branch 'develop' into feature/following_reblogs
2019-10-08 16:49:03 +03:00
Maksim Pechnikov
a26d550137
updated user_card
2019-10-08 16:46:54 +03:00
Henry Jameson
0be86304d2
Fix tests, more replacing with mergedConfig
2019-10-06 23:28:30 +03:00
Henry Jameson
a2923570c3
fix regex shortcode problem
2019-09-30 23:45:03 +03:00
Hakaba Hitoyo
194dd88118
Feature/Add _Allow user discovery services_ preference
2019-09-26 22:31:28 +00:00
kaniini
4369ce6f1b
Merge branch 'hide-followers-follows-count' into 'develop'
...
Added a setting to hide follow/follower count from the user profile
See merge request pleroma/pleroma-fe!951
2019-09-26 22:20:01 +00: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
0d6a9f5a62
comment, cleanup and improve autoresize/autoscroll
2019-09-25 19:30:55 +03:00
Henry Jameson
0f55359b49
fix
2019-09-25 08:43:02 +03:00
Henry Jameson
4f563e6efb
account for parent padding, too
2019-09-25 08:36:30 +03:00
Henry Jameson
daa0e284c3
forgotten file
2019-09-25 00:21:55 +03:00
eugenijm
aafb29c589
Added a setting to hide follow/follower count from the user profile
2019-09-23 16:19:21 +03:00
Maksim Pechnikov
8721fb57fc
added support hide\show reblogs from a specific user
2019-09-21 16:24:47 +03:00
rinpatch
1306fac38f
Merge branch 'develop' into 'muting-fixes'
...
# Conflicts:
# src/components/status/status.js
2019-09-16 11:38:37 +00:00
taehoon
6a3f283256
detect thread-muted posts
2019-09-13 22:59:24 -04:00
Henry Jameson
0d8b68632b
Remove emoji zoom
2019-09-12 20:25:11 +03:00
Shpuld Shpludson
4a469d7fe3
Merge branch 'fix/follow-request-detection' into 'develop'
...
Utilize `user.requested` to display follow request status on user card
Closes #635
See merge request pleroma/pleroma-fe!942
2019-09-12 07:02:11 +00:00
Henry Jameson
9146bee7aa
better hitbox for status emoji
2019-09-08 21:18:52 +03:00
taehoon
ea5b36a597
refactor toggling body visibility using class
2019-09-06 11:17:29 -04:00
Shpuld Shpludson
e75ac9ddbc
Merge branch 'mastoapi-externalprofile' into 'develop'
...
Replace `/api/externalprofile/show.json` with a MastoAPI equialent
See merge request pleroma/pleroma-fe!938
2019-09-06 04:13:21 +00:00
Eugenij
8ee5abb1a5
Password reset page
2019-09-05 11:23:28 +00:00
rinpatch
424d4ab57e
Utilize user.requested
to display follow request status on user card
...
Closes #635
2019-09-05 11:17:53 +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
rinpatch
66a34b7ecf
Properly detect thread-muted posts and set with_muted
when fetching
...
notifications
2019-09-04 12:20:33 +03:00
rinpatch
457290e81e
Replace /api/externalprofile/show.json
with a MastoAPI equialent
...
`/api/v1/accounts/:id` supports remote nicknames since pleroma!1622
2019-09-03 19:59:28 +03:00
rinpatch
8e3d6f5c28
Use mastodon api in follow requests
2019-09-03 13:50:26 +03:00
rinpatch
114b5f6eff
Apply suggestion to src/services/follow_manipulate/follow_manipulate.js
2019-08-09 12:26:58 +00:00
rinpatch
5f3ac6625f
Apply suggestion to src/services/follow_manipulate/follow_manipulate.js
2019-08-09 12:25:58 +00:00
rinpatch
e83b321ff2
Apply suggestion to src/services/follow_manipulate/follow_manipulate.js
2019-08-09 12:01:57 +00:00
rinpatch
766bcc2a72
Fix sent follow request detection
...
This fixes `requestFollow` using the relationship instead of user object,
resulting in `sent` always being false for locked users, and also removes
assumptions about follow request being sent, instead relying on
`requested` from user relationship.
2019-08-09 15:01:13 +03: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
Shpuld Shpludson
d3f6b581d1
Merge branch 'develop' into 'feat/conversation-muting'
...
# Conflicts:
# src/components/extra_buttons/extra_buttons.js
# src/components/extra_buttons/extra_buttons.vue
2019-07-26 12:44:32 +00:00
taehoon
876c6de806
fix typos
2019-07-24 21:02:37 -04:00
shpuld
619608ea7a
fix issues caused by merges in usersearch on @
2019-07-18 17:22:51 +03: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
f4a16e6541
add subscribing to user entity normalizer
2019-07-10 21:01:07 -04:00
jared
f2c95f9d0b
#482 - add new endpoints to subscribe to the user
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
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
Shpuld Shpludson
c8794b2b84
Merge branch '580' into 'develop'
...
Fix backend version string parsing
Closes #580
See merge request pleroma/pleroma-fe!868
2019-07-07 10:30:45 +00:00
Eugenij
14ec12b4f6
Set hide_follows and hide_followers settings when parsing Mastodon format
2019-07-07 10:20:55 +00:00
Henry Jameson
020c6d1bcf
all the manual fixes
2019-07-07 00:54:17 +03:00
taehoon
66842efd81
update regex for commit hash
2019-07-05 11:11:31 -04:00
Henry Jameson
2c2b84d31d
npm eslint --fix .
2019-07-05 10:02:14 +03:00
Egor Kislitsyn
52319acf58
Revoke oAuth token
2019-07-02 15:33:40 +07:00
taehoon
1c03bd0ebc
add resolve param to user search api request
2019-06-24 07:49:22 -04:00
lain
0eed2ccca8
Feature/polls attempt 2
2019-06-18 20:28:31 +00:00
HJ
22a3351208
Apply suggestion to src/services/backend_interactor_service/backend_interactor_service.js
2019-06-17 20:12:11 +00:00
HJ
8caf13bbce
Apply suggestion to src/services/api/api.service.js
2019-06-17 08:20:02 +00:00
Henry Jameson
6744396f82
getting and setting user background via MastoAPI
2019-06-16 20:17:59 +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
d1fd3e3a1c
fix user banner
2019-06-13 01:48:41 +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
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
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
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
taehoon
0532995847
wire up user.description with masto api data
2019-05-29 12:32:14 -04:00
William Pitcock
ac97cd3e46
entity normalizer: collapse data.pleroma if blocks
2019-05-25 22:59:04 +00:00
William Pitcock
28ca504576
wire up notification settings
2019-05-25 07:34:59 +00:00
taehoon
2af35b8404
do not miss statusnet_profile_url of mentions
2019-05-22 23:47:20 -04:00
Henry Jameson
e7a2a7267d
Proper clientId/secret/token caching, MastoAPI registration
2019-05-22 19:13:41 +03:00
Henry Jameson
fc12b63fcc
mastoapi login works
2019-05-21 23:35:40 +03:00
HJ
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
HJ
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
Moonman
fc9acf8fb6
add tags to data and to status component
2019-05-20 00:03:50 -04:00
William Pitcock
00ad97fcfa
entity normalizer: add tooltip text to emojis
2019-05-17 20:10:50 +00:00
taehoon
2457dd9b91
rename for consistency's sake
2019-05-16 14:02:37 -04:00
taehoon
b6731bd9af
update admin api urls in accordance with new docs
2019-05-16 13:21:14 -04:00
taehoon
2ce0186327
update api service functions
2019-05-15 12:04:26 -04:00
taehoon
110c9d3b26
improve performance by caching pinned status ids into user object
2019-05-15 12:04:26 -04:00
taehoon
87de130ee5
apply status normalizer
2019-05-15 12:04:26 -04:00
taehoon
12f8269f01
make sure to have rights property of user object
2019-05-15 12:04:26 -04:00
taehoon
a601337a20
clean up
2019-05-15 12:04:26 -04:00
taehoon
93e9bc019e
clean up fetchPinnedStatuses api service
2019-05-15 12:04:26 -04:00
taehoon
1229622fed
refactor error handling of pinStatus
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
taehoon
9e22d6212a
revert pinned timeline polling logic
2019-05-15 12:04:25 -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
dave
affbe8700e
#468 - integrate endpoints
2019-05-15 12:04:24 -04:00
Henry Jameson
543604fd2d
removed unused masto api, added initial version of interactions timeline
2019-05-14 22:48:44 +03:00
taehoon
7d60ab322e
use backendInteractor
2019-05-07 23:36:35 -04:00
taehoon
26131266a9
refactor api service functions using new helper
2019-05-07 23:27:22 -04:00
taehoon
a27a2f78ac
fix conversationId comparision bug using integer format
2019-05-06 13:24:11 -04:00
taehoon
9787d99672
update api services
2019-05-03 11:40:06 -04:00
taehoon
19a0476985
update api endpoint url
2019-05-03 11:40:06 -04:00
taehoon
2e6eab51b8
Update promisedRequest helper to support json payload
2019-05-03 11:40:06 -04:00
taehoon
02d169b92c
add promisedRequest helper
2019-05-03 11:40:05 -04:00
taehoon
cea6ea42f0
add api service function
2019-05-03 11:40:05 -04:00
shpuld
c44c048356
add title and alt for avatars, fix console errors in avatarlist
2019-05-01 17:33:56 +03: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
HJ
0f7f685c5e
Merge branch '437-user-profile-settings' into 'develop'
...
Transition to MastoAPI: user profile settings
Closes #437
See merge request pleroma/pleroma-fe!682
2019-04-30 06:05:52 +00:00