Mark Felder
b8350423d9
Updated Notification Settings API use
2020-05-28 10:57:02 -05:00
Henry Jameson
a8e013bd65
Move modal frame parts away from modal-content into modal, improve error handling
2020-05-26 23:58:55 +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
7951192cd9
Improve settings-modal async loading, update vue to 2.6.11 to be able
...
to use Vue.observable, to implmement resettable async component
2020-05-25 16:11:05 +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
rinpatch
ca52a7321d
Merge remote-tracking branch 'weblate/develop' into resolve-weblate-merge-conflicts
2020-05-14 22:53:08 +03:00
Anonymous
8db7cba9e1
Translated using Weblate (English)
...
Currently translated at 100.0% (613 of 613 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/en/
2020-05-14 18:13:04 +00:00
Henry Jameson
bcebec478e
moved stuff from settings, cleaned up naming for tabs, added close and peek
2020-05-10 06:46:06 +03:00
Mark Felder
9180fdb492
Clarify that we only delete data, not the account
2020-05-08 15:56:53 -05:00
Shpuld Shpludson
f4676e17d3
Merge branch 'develop' into 'feature/copy-link'
...
# Conflicts:
# static/fontello.json
2020-05-08 08:20:03 +00:00
Mark Felder
b3003d4e8d
Add notification privacy option to user settings
2020-05-06 11:46:40 -05:00
Henry Jameson
2e35289c33
initial work on settings modal
2020-05-03 17:36:12 +03:00
eugenijm
01b07f01e9
Add support for follow request notifications
2020-04-30 09:58:55 +03:00
Mark Felder
8c5946b728
Add button in 3dot menu to copy status link to clipboard
2020-03-30 12:39:28 -05: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
HJ
3ddf7ebe2c
Merge branch 'themes-accent' into 'develop'
...
Themes v3 Part 1 "2.1" codenamed "One step for themes, a giant burder for code reviewers"
Closes #750 and #774
See merge request pleroma/pleroma-fe!1037
2020-02-18 21:20:43 +00:00
4aeba026e6
Refactor i18n messages for MRF policy disclosure
2020-02-13 09:43:56 +00: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
Shpuld Shpludson
17b6d8ddb8
Merge branch 'move-type-notification' into 'develop'
...
Add setting for allow following move
Closes #732
See merge request pleroma/pleroma-fe!1054
2020-02-10 14:51:35 +00:00
dafced3a86
MRF Keyword Policy Disclosure
2020-02-10 08:04:58 +00:00
Henry Jameson
611da13a4b
Better Disabled buttons support. Mammal theme fixes. Implemented proper
...
context-aware `mod` argument - now checks lightness of "variant" color. needs
retesting tho
2020-02-07 01:25:26 +02:00
kPherox
ce68ef0138
Add option text
2020-02-04 04:54:36 +09: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
Henry Jameson
b63e679a31
removed one color TODO
2020-01-28 02:03:21 +02:00
Shpuld Shpuldson
c4beac5f89
Merge branch 'develop' into feat/emoji-reactions
2020-01-26 15:59:59 +02:00
Henry Jameson
d98e31af45
snapshot/source mismatch case
2020-01-22 02:44:39 +02:00
Henry Jameson
644ce497a0
lightBg -> highlight because it causes issues with v2
2020-01-22 01:28:46 +02:00
Henry Jameson
803edcb53a
dismiss warning when loading theme
2020-01-22 01:28:17 +02:00
Henry Jameson
1191207aa5
more help strings
2020-01-22 00:53:51 +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
Henry Jameson
93dfb4d352
fix shadow picker preview, change hint
2020-01-20 02:00:13 +02:00
Shpuld Shpludson
7a013ac393
Implement domain mutes v2
2020-01-15 20:22:54 +00:00
Shpuld Shpuldson
b32888194c
fix merge conflicts
2020-01-13 23:47:32 +02:00
Henry Jameson
c3cd66335f
i18n & fixes
2020-01-13 22:26:31 +02:00
Henry Jameson
8d2f2866f6
computed colors support
2020-01-13 01:56:29 +02:00
Henry Jameson
40ba3e2252
added more slots to UI
2020-01-12 23:41:11 +02:00
Henry Jameson
39dd08e694
replace hsl's l with relative luminance for better lightness detection
2020-01-12 17:58:26 +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
e5a34870f0
Accent works
2019-12-28 15:55:42 +02:00
kPherox
b4acbf5311
Add user migrates filter to interactions
2019-12-11 18:30:26 +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
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
Shpuld Shpuldson
de945ba3e9
wip commit, add basic popover for emoji reaction select
2019-11-15 16:29:25 +02:00
Henry Jameson
897131572f
Made it optional
2019-11-14 00:47:20 +02:00
taehoon
58839ecef8
change N/A to Hidden
2019-11-12 13:31:30 -05:00
taehoon
85685d6478
add a translation
2019-11-12 11:42:07 -05:00
Ariadne Conill
90f764224d
about: add MRF transparency panel
2019-11-09 00:09:32 -06:00
Ariadne Conill
20ccd93a17
about: add staff panel
2019-11-08 23:21:07 -06:00
e4820012a3
redirect /remote-users/:username@:hostname -> /users/:id, /remote-users/:hostname/:username -> /users/:id
2019-11-08 22:27:25 +00: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
Sergey Suprunenko
e3381cdef1
Add ability to change user's email
2019-11-08 02:21:19 +00:00
Maxim Filippov
37be781312
Require password reset
2019-10-16 10:00:26 +00: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
taehoon
7e5a3fa09f
update copy
2019-10-01 07:36:42 -04:00
taehoon
4f75ad9905
add admin link to nav
2019-10-01 07:36:41 -04:00
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
7b4cb38734
split spam mode into two separate options (one in settings page)
2019-09-23 20:36:49 +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
f0b9f5d29c
use repeats
intead boosts
2019-09-22 14:45:42 +03:00
Maksim Pechnikov
8721fb57fc
added support hide\show reblogs from a specific user
2019-09-21 16:24:47 +03:00
taehoon
5ff899b455
add mention button
2019-09-20 11:29:21 -04:00
Henry Jameson
e366adbb6c
updated logic for padding with spaces, improved spam mode
2019-09-15 12:30:02 +03:00
Henry Jameson
14df84d89b
fixed some bugs, added spam mode, minor collateral fixes
2019-09-08 15:51:17 +03:00
Henry Jameson
db086fe1fd
Merge remote-tracking branch 'upstream/develop' into emoji-selector-update
...
* upstream/develop: (116 commits)
Password reset page
add a comment
force img updating immediately
Fixed "sequimiento" to "seguimiento".
Replace `/api/externalprofile/show.json` with a MastoAPI equialent
Use mastodon api in follow requests
"Optional" in lowercase.
Update es.json
fix pin/unpin status logic
rename a mutation
update
fix user avatar fallback logic
remove dead code
Corrected "Media Proxy" translation.
Update es.json
make bio textarea resizable vertically only
remove dead code
Make image orientation consistent on FF, fix videos w/ modal
remove dead code
fix crazy watch logic in conversation
...
2019-09-08 13:44:29 +03:00
Eugenij
8ee5abb1a5
Password reset page
2019-09-05 11:23:28 +00:00
Henry Jameson
5851f97eb0
fixed a lot of bugs with emoji picker, improved relevant components
2019-08-12 20:03:48 +03:00
HJ
59f2931361
Merge branch 'fix/text-dont-media-viewer' into 'develop'
...
fix english settings label regarding how to view videos
See merge request pleroma/pleroma-fe!909
2019-08-09 08:31:02 +00:00
3e7f0ecf9b
fix english settings label regarding how to view videos
2019-08-09 08:03:21 +02: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
fa6210872f
Feature/add sticker picker
...
Squash to avoid storing commits with stickers in it to avoid possible copyright problems and excess storage space. --hj
2019-07-24 19:35:52 +00: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
4f26299bd5
update copy
2019-07-10 21:01:08 -04:00
taehoon
0c52d69a52
update copy
2019-07-10 21:01:07 -04:00
taehoon
ace3b399ff
support i18n
2019-07-10 21:01:07 -04:00
shpuld
7ed9d17ce7
Add thread muting to context menu of status
2019-07-07 23:02:09 +03:00
lain
0eed2ccca8
Feature/polls attempt 2
2019-06-18 20:28:31 +00:00
Maksim
77eceedbf7
Revert "add TOTP/Recovery Form for mobile version"
...
This reverts commit a3811f944819430c278b6da6b08dc322a9b9ff65.
2019-06-12 20:16:55 +00:00
William Pitcock
855566f887
notification controls: redesign entirely
2019-05-25 23:44:36 +00:00
William Pitcock
28ca504576
wire up notification settings
2019-05-25 07:34:59 +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
Henry Jameson
7976d118ca
Cleanup, little documentation, localization
2019-05-15 20:44:35 +03:00
taehoon
beaf512573
add translation
2019-05-15 12:04:26 -04:00
taehoon
d76bd0044f
fix typo
2019-05-15 12:04:26 -04:00
dave
9fc997500e
#468 - add extra buttons for status actions
2019-05-15 12:04:25 -04: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
eugenijm
a89010843d
Use more clear explanation in the scope notice, make sure the hide button doesn't overlap with text in notice.
2019-05-08 16:50:39 +03: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
cf72ebb407
update copy
2019-05-03 11:40:05 -04:00
taehoon
5d0bae5569
update generic error message
2019-05-03 11:40:05 -04:00
taehoon
d115d98a1b
add translations
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
eugenijm
ae1496cfb4
Make floating post button configurable
2019-04-29 21:32:29 +03:00
taehoon
95bc2d727b
add “export blocks” feature
2019-04-27 08:31:06 -04:00
taehoon
08eaf9bd33
make reusable Exporter component
2019-04-27 08:31:06 -04:00
taehoon
0ab2f9dfa5
add “block import” feature
2019-04-27 08:31:06 -04:00
taehoon
6d0e98a1c2
make Importer component reusable
2019-04-27 08:31:06 -04:00
William Pitcock
55823b8d67
add BBCode strings
2019-04-26 22:48:21 +00:00
shpuld
8af8f719e4
fix i18n
2019-04-22 21:37:27 +03:00
taehoon
ac9ddfb1e2
support i18n
2019-04-17 11:32:49 -04:00
taehoon
d874ca905c
support i18n
2019-04-14 23:44:50 -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
70071b870f
#469 - update text copy
2019-04-02 12:46:22 -04:00
dave
67258571c5
#469 - update behavior of safe_dm
2019-04-02 11:19:45 -04:00
eugenijm
6b6878bde0
Added moderation menu
2019-04-01 23:30:06 +03:00
HJ
3c2931529e
Merge branch 'minimal-scopes-mode' into 'develop'
...
Initial work on deprecating scopeModesEnabled in favor of minimalScopeMode
See merge request pleroma/pleroma-fe!633
2019-04-01 19:32:37 +00:00
jared
dee9ab7bda
#470 - update button text capitalization
2019-04-01 13:04:40 -04:00
jared
6847e70a49
#470 - update i18n
2019-04-01 12:58:23 -04:00
Henry Jameson
9f4a9bff46
Merge remote-tracking branch 'upstream/develop' into minimal-scopes-mode
...
* upstream/develop: (173 commits)
Fix: Change condition
fix typo
update store according to retweeted status
#433 - update sort by for conversation
display replies_count right after reply icon
expose replies_count from mastodon api
Apparently, MastoAPI gives status in ancestors if you try opening a repeat...
make side drawer use gesture service and fix its animations
review/remove error hiding
errata
review
#433 - sort conversation for retweets and clean up
Revert "Merge branch 'revert-987b5162' into 'develop'"
Revert "Merge branch 'mastoapi/friends-tl' into 'develop'"
Add await to login action'
Remove console log
Fix warnings in user profile routing
Add tests for gesture service, fix bug with perpendicular directions
#255 - clean up autocomplete form
#255 - clean up user settings page with self-closing html tags
...
2019-03-30 12:31:50 +02:00
HJ
2f1e690478
Merge branch 'issue-442-placeholder-fix' into 'develop'
...
#442 - clean up Bio placeholder text
Closes #442
See merge request pleroma/pleroma-fe!689
2019-03-25 22:29:17 +00:00
taehoon
9857002bf5
Add hideMutedPosts setting and wire up to post-returning endpoints
2019-03-21 16:33:02 -04:00
Shpuld Shpludson
9890e41440
Merge branch 'feature/bypass-avatar-cropper' into 'develop'
...
#443 Add button to save without cropping
Closes #443
See merge request pleroma/pleroma-fe!691
2019-03-21 15:44:26 +00:00
jasper
3108722eda
Add button to save without cropping
2019-03-18 18:19:42 -07:00
dave
5717d97182
#442 - update placeholder linebreak
2019-03-18 10:35:13 -04:00
dave
543cc0d285
#442 - clean up Bio placeholder text
2019-03-17 16:59:08 -04:00
Edijs
068c9724e4
Added new tab to display versions of BE/FE
2019-03-10 16:58:12 -07:00
Edijs
292cdfb24b
Merge content types translations
2019-03-06 20:13:04 -08:00
Edijs
f91e4a5801
Load post status content type from instance config
2019-03-04 21:29:56 -08:00
Henry Jameson
6184c88ac7
Initial work on deprecating scopeModesEnabled in favor of minimalScopeMode
2019-03-03 15:45:17 +02:00
Shpuld Shpludson
c4f8426349
Re-do status header a bit, add more consistent spacing to status
2019-03-02 16:35:38 +00:00
Shpuld Shpludson
dc01f90dde
Merge branch '386-display-invalid-user-profile' into 'develop'
...
Show error message when visit profile page of invalid user
Closes #386
See merge request pleroma/pleroma-fe!606
2019-02-28 17:19:14 +00:00
Maxim Filippov
c71f411ad6
Show only "app_name" and "valid_until" (OAuth tokens table)
2019-02-28 04:05:54 +03:00
Maxim Filippov
2c7406d9a8
Add OAuth Tokens management to settings
2019-02-28 04:04:26 +03:00
Shpuld Shpludson
95fb768b5a
Fix #399 Make max attachments configurable
2019-02-27 14:38:58 +00:00
taehoon
b78227456e
Better error handling
2019-02-26 12:26:04 -05:00
taehoon
e687b58091
Show error message when visit profile page of invalid user
2019-02-26 11:08:13 -05:00
dave
20c68d33eb
#396 : update en.json
2019-02-24 15:44:06 -05:00
dave
8275f2aa9a
#396 : update registration form
2019-02-24 14:30:29 -05:00
Shpuld Shpludson
e34e1ccdae
Merge branch '227-manage-blocks-mutes' into 'develop'
...
Add Blocks / Mutes management tabs under user settings page
See merge request pleroma/pleroma-fe!578
2019-02-22 14:54:12 +00:00
taehoon
85d43d17f5
Add missing translation strings
2019-02-20 13:30:31 -05:00
taehoon
395d212904
Add new strings to i18n
2019-02-20 13:30:31 -05:00
taehoon
e91a94ff9c
Add mutes tab
2019-02-20 13:30:30 -05:00
taehoon
52913d8f87
Complete functionality of BlockCard
2019-02-20 13:30:30 -05:00
taehoon
0220d3d304
Finally, added BlockCard
2019-02-20 13:30:30 -05:00
taehoon
a56d2dfeb1
Add blocks tab with test data to user settings page
2019-02-20 13:30:30 -05:00
dave
e20a7be3aa
#376 : update status timeline when it's empty
2019-02-20 10:13:28 -05:00
shpuld
32df77c16a
Merge branch 'tae-hoon/pleroma-fe-323-improve-image-lightbox' into develop
2019-02-19 18:34:09 +02:00
Shpuld Shpludson
7b9a6f8d43
Merge branch '256-avatar-crop-popup' into 'develop'
...
Add avatar cropper
Closes #256
See merge request pleroma/pleroma-fe!547
2019-02-19 15:37:01 +00:00
shpuld
e801d78e9d
Take over branch and fix some issues
2019-02-17 18:54:22 +02:00
taehoon
b24db12e1c
Make embedded image cropper
2019-02-15 13:34:33 -05:00