0b7a8dca15
fix duplicate setting (most likely a merge issue)
2022-03-27 12:26:51 +03:00
dd4672dc9a
fix opening directly to filtering tab not working
2022-03-27 12:24:38 +03:00
9ac7046521
Fix notices not disappearing on their own
2022-03-27 12:21:33 +03:00
e4c804fac0
fix another spacing issue
2022-03-27 12:03:31 +03:00
b319c0c72b
Remove debugging code
2022-03-25 13:17:22 +00:00
c5551e834b
Fix English translation of Shoutbox in features panel
2022-03-24 19:28:15 -04:00
e58422889b
Fix overlapping buttons in Theme settings
2022-03-24 18:03:13 -04:00
b7755314b1
fix forms closing in timelines
2022-03-24 14:09:25 +02:00
3fb647b34b
fix minor renames
2022-03-24 13:50:22 +02:00
0eb9c019e4
woah ima stupid
2022-03-24 13:41:52 +02:00
4539feed40
fix checkboxes, specifically the NSFW one
2022-03-24 11:41:39 +02:00
9793002070
cleanup console log
2022-03-23 16:53:57 +02:00
01d8fa4e54
fix i18n at places
2022-03-23 16:32:53 +02:00
961ca3a71b
fix all the spacings i could find
2022-03-23 16:15:05 +02:00
08811e5a27
fix spacings in notifications
2022-03-23 16:08:45 +02:00
a6fae395da
fix dupe id
2022-03-23 16:05:53 +02:00
d690b88c1c
fix animations
2022-03-23 15:53:36 +02:00
d524e98348
fix capitalization (and localization of tooltips for scope icon)
2022-03-22 20:42:29 +02:00
7afa6c9f40
listeners aren't actually used
2022-03-22 20:22:28 +02:00
538903f9d8
fix selects in settings screen
2022-03-22 20:17:25 +02:00
c5a6f40dff
fix tabs not being able to be "disabled"
2022-03-22 20:15:21 +02:00
b817e09ee8
fix avatars not opening inline card
2022-03-22 19:43:11 +02:00
6b5791fda6
fix other weird route
2022-03-22 19:20:12 +02:00
9d7a7e2019
fix emoji input tests
2022-03-22 18:22:23 +02:00
c2cf13fc00
fix richcontent and its tests
2022-03-22 18:22:23 +02:00
edb66ecade
fix mobile post button being too square
2022-03-22 16:39:27 +02:00
c6a4a0a320
Merge remote-tracking branch 'origin/develop' into vue3-again
...
* origin/develop:
quick fix for alignment in avatars, juggling multiple branches is confusing
fix even more issues with avatars
Update dependency ora to v0.4.1
Update dependency mini-css-extract-plugin to v0.12.0
Update dependency karma-firefox-launcher to v1.3.0
fix avatars in mobile view
2022-03-22 12:14:02 +02:00
fa99abf106
quick fix for alignment in avatars, juggling multiple branches is confusing
2022-03-22 11:57:21 +02:00
a253c95170
Merge branch 'develop' into 'fix-avatars2'
...
# Conflicts:
# src/components/status/status.scss
2022-03-22 09:47:24 +00:00
c6e0dcf08e
fix even more issues with avatars
2022-03-22 11:43:51 +02:00
2cd8a3ec8d
Merge branch 'fix-mobile-avatars' into 'develop'
...
fix avatars in mobile view
See merge request pleroma/pleroma-fe!1479
2022-03-22 08:24:42 +00:00
971cec024c
fix avatars in mobile view
2022-03-22 10:20:45 +02:00
7a17eb7fec
fix selects
2022-03-21 22:01:08 +02:00
4cb14c257c
fix expert mode checkbox not working
2022-03-21 21:34:55 +02:00
1187727b60
fix tabswitcher bugs
2022-03-21 21:29:51 +02:00
54fd7e2be6
Merge remote-tracking branch 'origin/develop' into vue3-again
...
* origin/develop:
improve the looks of bot indicator
fix bot indicator appearing on retweeter avatar
Update dependency localforage to v1.10.0
Update dependency http-proxy-middleware to v0.21.0
Update dependency eslint-plugin-standard to v4.1.0
Update dependency eslint-plugin-import to v2.25.4
Update babel monorepo to v7.17.8
Update dependency iso-639-1 to v2.1.13
Update dependency express to v4.17.3
Update dependency eslint-plugin-promise to v4.3.1
Update dependency eslint-loader to v2.2.1
2022-03-21 21:09:48 +02:00
9478a462a7
improve the looks of bot indicator
2022-03-21 20:59:25 +02:00
4e2fd7baf9
fix bot indicator appearing on retweeter avatar
2022-03-21 20:39:56 +02:00
5948d20f00
mutes and blocks tab works
2022-03-18 13:36:08 +02:00
b3ed29ff02
made withLoadMore work... sorta
2022-03-18 13:32:36 +02:00
26bfbdc2ad
fix sw compilation
2022-03-18 11:02:00 +02:00
051d51bcd9
fix suggest not working
2022-03-17 09:28:19 +02:00
5718c6491e
fix selects being messed up
2022-03-17 09:06:05 +02:00
a97c07bfdf
fix settings not persisting
2022-03-17 09:02:26 +02:00
d815f984fb
fix i18n errors related to @ symbol
2022-03-17 08:53:45 +02:00
4993dc37e2
fix rich content not rendering stillimage nor links correctly
2022-03-17 08:53:45 +02:00
0671aa0dd0
fix tabswitcher
2022-03-17 08:53:45 +02:00
b62653c202
fix chat user titles
2022-03-17 08:37:01 +02:00
be4244acde
fix some warnings
2022-03-17 08:35:19 +02:00
8311d4deba
shit renders yo
2022-03-16 22:13:21 +02:00
e51144809f
shit boots yo
2022-03-16 22:02:44 +02:00
cd4ad2df11
Merge remote-tracking branch 'origin/develop' into vue3-again
...
* origin/develop: (475 commits)
Apply 1 suggestion(s) to 1 file(s)
Update dependency @ungap/event-target to v0.2.3
Update package.json
fix broken icons after FA upgrade
Update Font Awesome
Update dependency webpack-dev-middleware to v3.7.3
Update dependency vuelidate to v0.7.7
Pin dependency @kazvmoe-infra/pinch-zoom-element to 1.2.0
lint
Make media modal buttons larger
Add English translation for hide tooltip
Add hide button to media modal
Lint
Prevent hiding media viewer if swiped over SwipeClick
Fix webkit image blurs
Fix video in media modal not displaying properly
Add changelog for https://git.pleroma.social/pleroma/pleroma-fe/-/merge_requests/1403
Remove image box-shadow in media modal
Clean up debug code for image pinch zoom
Bump @kazvmoe-infra/pinch-zoom-element to 1.2.0 on npm
...
2022-03-16 21:00:20 +02:00
b632d740c1
Merge branch 'expert-settings-and-serverside' into 'develop'
...
Expert settings and serverside settings + new defaults
See merge request pleroma/pleroma-fe!1438
2022-03-16 17:33:24 +00:00
123de8aad0
Apply 1 suggestion(s) to 1 file(s)
2022-03-16 17:02:09 +00:00
47bb08514b
fix broken icons after FA upgrade
2022-03-15 21:00:52 +02:00
71c0b59866
lint
2022-03-14 09:35:29 +02:00
a97db1efd6
Merge remote-tracking branch 'origin/develop' into expert-settings-and-serverside
...
* origin/develop: (83 commits)
Make media modal buttons larger
Add English translation for hide tooltip
Add hide button to media modal
Lint
Prevent hiding media viewer if swiped over SwipeClick
Fix webkit image blurs
Fix video in media modal not displaying properly
Add changelog for https://git.pleroma.social/pleroma/pleroma-fe/-/merge_requests/1403
Remove image box-shadow in media modal
Clean up debug code for image pinch zoom
Bump @kazvmoe-infra/pinch-zoom-element to 1.2.0 on npm
Bump pinch-zoom-element version
Clean up
Check whether we swiped only for mouse pointer
Scale swipe threshold with viewport width
Update pinch-zoom-element
Allow pinch-zoom to fill the whole screen
Use native click for hiding overlay
Reset position on swipe end even if we cannot navigate
Make lint happy
...
2022-03-14 09:31:24 +02:00
e34d71fc1f
Merge branch 'from/develop/tusooa/tree-threading' into 'develop'
...
Add the option to display threads as trees
See merge request pleroma/pleroma-fe!1407
2022-03-13 17:31:46 +00:00
1b204012ea
Make media modal buttons larger
2022-03-13 12:02:03 -04:00
b67a557a8c
Add English translation for hide tooltip
2022-03-13 12:02:03 -04:00
5fb302d0f1
Add hide button to media modal
2022-03-13 12:02:02 -04:00
7e21853cca
Lint
2022-03-13 12:02:02 -04:00
7dd1a0dd30
Prevent hiding media viewer if swiped over SwipeClick
2022-03-13 12:02:02 -04:00
90b066a744
Fix webkit image blurs
2022-03-13 12:02:02 -04:00
1128cc463c
Fix video in media modal not displaying properly
2022-03-13 12:02:02 -04:00
76727cd39c
Remove image box-shadow in media modal
...
The box-shadow causes an image to be very blurry on Webkit browsers
(experienced: Konqueror, Safari; heard of: Chrome) when scaled up
if the initial size of the image is much smaller than the actual size
(e.g. when viewing a very long picture).
The shadow is not really obvious anyway.
2022-03-13 12:02:02 -04:00
5829cd98af
Clean up debug code for image pinch zoom
2022-03-13 12:02:02 -04:00
3b4afdf567
Clean up
2022-03-13 12:00:45 -04:00
a485ebc2bb
Check whether we swiped only for mouse pointer
2022-03-13 12:00:45 -04:00
6980e4ddf1
Scale swipe threshold with viewport width
2022-03-13 12:00:44 -04:00
ddf6c9cef0
Allow pinch-zoom to fill the whole screen
2022-03-13 12:00:44 -04:00
9f3a983fef
Use native click for hiding overlay
...
The pointerup strategy is unsuccessful, as some other overlays
(Firefox's Inspect Element) will pass down pointerup events.
2022-03-13 12:00:44 -04:00
839627ffc4
Reset position on swipe end even if we cannot navigate
2022-03-13 12:00:44 -04:00
f3269cdc10
Make lint happy
2022-03-13 12:00:44 -04:00
3502d374e3
Prevent the click event from firing on content below modal
2022-03-13 12:00:44 -04:00
0190a36070
Add missing swipe click component
2022-03-13 12:00:44 -04:00
23a6b86ef3
Clean up
2022-03-13 12:00:44 -04:00
29cd8fbd3b
Add swipe-click handler to media modal
...
Now swiping will correctly change the current media, and with a good
preview. Clicking without swiping closes the overlay.
2022-03-13 12:00:44 -04:00
a36673a6a8
Use pinch-zoom-element for pinch zoom functionality
2022-03-13 12:00:41 -04:00
544db06294
Add pan threshold
2022-03-13 11:56:35 -04:00
d9030b4fdd
Handle pinch action
2022-03-13 11:56:35 -04:00
a7570f5eb2
Preview swipe action
2022-03-13 11:56:34 -04:00
f96e5882d1
Make media modal be aware of multi-touch actions
...
Originally the media viewer would think every touch is a swipe (one-finger
touch event), so we would encounter the case where a two-finger scale event
would incorrectly change the current media. This is now fixed.
2022-03-13 11:56:30 -04:00
f16f35a4d4
Merge remote-tracking branch 'origin/develop' into expert-settings-and-serverside
...
* origin/develop:
Update dependency v-click-outside to v2.1.5
Update dependency shelljs to v0.8.5
Update dependency portal-vue to v2.1.7
Update dependency lodash to v4.17.21
Update dependency karma-spec-reporter to v0.0.33
Update dependency karma-webpack to v4.0.2
Update dependency karma-sourcemap-loader to v0.3.8
Update dependency eslint-plugin-vue to v5.2.3
Update dependency chromedriver to v87.0.7
Update dependency @chenfengyuan/vue-qrcode to v1.0.2
Pin dependencies
Pin dependencies
Do not mute bot posts in notifications
Lint
Add renovate.json
Add bot indication to user icon on statuses
Mute bot posts
fix placeholder attachments opening new tab
2022-03-13 16:34:05 +02:00
51b14cc615
Merge branch 'eientei' into 'develop'
...
Mute bot posts filtering option
See merge request pleroma/pleroma-fe!1440
2022-03-13 14:04:15 +00:00
5930b667a1
reduce the copypaste by making it more functional-style
2022-03-13 11:30:38 +02:00
726fdbea15
remove "experimental" label from streaming api
2022-03-13 10:51:13 +02:00
450145dd6b
Do not mute bot posts in notifications
2022-03-09 07:56:43 +03:00
551b8f3690
Fix "max depth in thread" setting
2022-03-07 20:02:53 -05:00
48178bdc53
Make maxDepthInThread instance-default
2022-03-07 19:30:24 -05:00
a511250b63
Make $status-margin fallback only
2022-03-07 19:28:38 -05:00
415a823af0
Clean up dead code
2022-03-07 19:19:32 -05:00
0e323ef248
Add English translations for fading ancestor option
2022-03-07 19:19:32 -05:00
d157f67381
Make fading ancestors optional
2022-03-07 19:19:32 -05:00
fa20ea76b1
Update English translation for tree view settings
2022-03-07 19:19:32 -05:00
e7f5033c7d
Split conversation display style into two different settings
...
linear => linear (now default)
simple_tree => tree / conversationTreeAdvanced=false
tree => tree / conversationTreeAdvanced=true
2022-03-07 19:19:32 -05:00
9432fcec7d
Make 'Show full conversation' button have left border in embbeded mode
2022-03-07 19:19:32 -05:00
5768806d1b
Fix showingLongSubject not correctly propagated
2022-03-07 19:19:32 -05:00
f8c5cbcd0d
Fix timeline jump when scrolling
...
Ref: tree-threading
2022-03-07 19:19:31 -05:00
20880cdf0b
Make replying and mediaPlaying controlled
...
$refs is not a reliable way to deal with child components under
tree threading as it is not reactive, but the children may change at
any time. The only good way seems to be making these states aggregated on
the conversation component.
Ref: tree-threading
2022-03-07 19:19:31 -05:00
cc5cff2038
Clean up debug code for tree threading
2022-03-07 19:19:31 -05:00
2a510205c3
Fix virtual scrolling for tree threading
...
Ref: tree-threading
2022-03-07 19:19:31 -05:00
0db5a5a581
Fix controlled status display toggles
2022-03-07 19:19:31 -05:00
ba858a894c
Add English translations for other replies count
2022-03-07 19:19:31 -05:00
654996fdbe
Add other replies count for reply list link
2022-03-07 19:19:31 -05:00
cebb4224ac
Do not display replies inside status as link if there are no other replies
2022-03-07 19:19:31 -05:00
9b27ac9aaf
Add English translation for position of other replies button pref
2022-03-07 19:19:31 -05:00
863255d52f
Make position of other replies button a pref
2022-03-07 19:19:31 -05:00
c4bd004cbc
Add English translation for show all conversation button improvement
2022-03-07 19:19:31 -05:00
244174a32b
Improve "show full conversation" interaction
...
Now we only show that button when there are other statuses out of sight
(other toplevel statuses exist outside of the current thread tree).
2022-03-07 19:19:31 -05:00
22bdcda9c0
Make other replies button stretch along the row
2022-03-07 19:19:31 -05:00
ba8598858b
Optimise thread ancestor borders
2022-03-07 19:19:31 -05:00
17863f54fe
Optimise thread ancestor display style
2022-03-07 19:19:31 -05:00
26670e9003
Reset thread open state when collapsed
2022-03-07 19:19:30 -05:00
10cd03c718
Clean up
2022-03-07 19:19:30 -05:00
f1db5e8f4b
Highlight ancestor of the current status when diving back to top
2022-03-07 19:19:30 -05:00
d78c8e8ea4
Add English translation for Misskey-style tree view
2022-03-07 19:19:30 -05:00
e560fbc935
Implement Misskey-style tree view
...
Now the tree will be always rooted at the highlighted status, and
all its ancestors shown linearly on the top.
Enhancement: If an ancestor has more
than one reply (i.e. it has a child that is not on current status's
ancestor chain), we are given a link to root the thread at that status.
2022-03-07 19:19:30 -05:00
4adffb4835
Remove horizontal border and thicken vertical border in a thread tree
2022-03-07 19:19:30 -05:00
0e4a7c3d05
Make dive/undive button clickable along the whole row
2022-03-07 19:19:30 -05:00
8780246ce5
Optimize thread border radius
2022-03-07 19:19:30 -05:00
61bb69c88f
Optimize thread display
2022-03-07 19:19:30 -05:00
bdf631c2c4
Fix the bug where toggleShowingTall does not work
2022-03-07 19:19:30 -05:00
3addc36c96
Fix status undefined in parentOf
2022-03-07 19:19:30 -05:00
f851bc92c9
Add English translations for max depth in thread
2022-03-07 19:19:30 -05:00
2e54cf12c7
Add settings for max depth in thread
2022-03-07 19:19:30 -05:00
ff5f69b8fd
Use mergedConfig properly
2022-03-07 19:19:30 -05:00
d7da9f80a7
Fallback to simpleTree style
2022-03-07 19:19:30 -05:00
6b990ba368
Undive when collapsed
2022-03-07 19:19:29 -05:00
cd3e6d0073
Clean up
2022-03-07 19:19:29 -05:00
0aaef50ee5
Lint
2022-03-07 19:19:29 -05:00
05b2351e08
Add English translation for simple tree
2022-03-07 19:19:29 -05:00
d9a9f97751
Add simple tree style navigation
2022-03-07 19:19:29 -05:00
8c0deb905e
Add English translation for diving
2022-03-07 19:19:29 -05:00
d15d24c11c
Add dive functionality
2022-03-07 19:19:29 -05:00
31c4300456
Add English translations for diving
2022-03-07 19:19:29 -05:00
84a3cd92a3
Support diving into one status in a conversation
2022-03-07 19:19:29 -05:00
ace1f5067c
Make status display controlled
2022-03-07 19:19:29 -05:00
cd0f6a4f78
Add English translations for message threading
2022-03-07 19:19:29 -05:00
414ee55957
Make show full thread message account for numbers
2022-03-07 19:19:29 -05:00
0f2fd8a352
Implement thread folding/expanding
2022-03-07 19:19:29 -05:00
0582f19e7c
Add tree-style thread display
2022-03-07 19:19:29 -05:00
7a8c975f61
Lint
2022-03-06 14:22:59 -05:00
2b7f12613e
Add bot indication to user icon on statuses
2022-03-01 01:00:38 +03:00
fe0ed7e8f0
Mute bot posts
2022-02-28 23:14:45 +03:00
77b55a559b
fix placeholder attachments opening new tab
2022-02-28 19:42:02 +02:00
77bb0b5530
lint
2022-02-28 18:23:32 +02:00
39909c8a85
pre-emptively wipe serverside settings on logout
2022-02-28 18:17:13 +02:00
f4b36a9ebf
fix errors in choicesetting
2022-02-28 18:15:21 +02:00
67319d0e5b
fix typos in profile page
2022-02-28 18:15:07 +02:00
cf58df17f6
hidden away more settings when logged out
2022-02-28 18:04:13 +02:00
8bb97fbfeb
fix settings behaving erratically and not updating properly
2022-02-28 18:01:41 +02:00
3a5ad18aca
fix stripping rich content not working
2022-02-28 18:00:38 +02:00
e3d602fdcc
revert changes related to streaming/firehose setting, reword it so it's
...
not confused with websocket streaming
2022-02-28 17:45:07 +02:00
c07c0b2260
fix firefox rendering (??????????)
2022-02-28 17:43:08 +02:00
f626da838a
revert to using local setting for default nsfw since backend is broken
2022-02-24 15:00:08 +02:00
9623b0e140
better phrasing
2022-02-24 14:41:55 +02:00
b1b9260a1d
new defaults
2022-02-22 23:32:12 +02:00
9c1814d122
expert settings toggle + server-side settings
2022-02-22 23:31:40 +02:00
c7690aecd0
Add English translation for media modal counter
2022-02-21 10:34:20 -05:00
1b32bb9c51
Make media modal counter go through i18n
2022-02-21 10:33:47 -05:00
58d0f9678b
Merge branch 'fix-mentions-new-bugs' into 'develop'
...
Fix newfound bugs with rich mentions + user suggestions
See merge request pleroma/pleroma-fe!1430
2022-02-20 15:11:52 +00:00
ddee8bb686
Merge branch 'proper-attachments' into 'develop'
...
Attachment improvements
See merge request pleroma/pleroma-fe!1399
2022-02-20 15:11:33 +00:00
56616787ec
Merge branch 'fix-pinned-statuses' into 'develop'
...
Fix pinned statuses appearing at the bottom of user timeline
Closes #1112
See merge request pleroma/pleroma-fe!1433
2022-02-20 15:11:08 +00:00
373c30be69
fix #1133
2022-02-20 16:06:26 +02:00
7b60adb480
only for user TL
2022-02-20 00:57:31 +02:00
a31ff20f50
lol, lmao, that was some shit, this is much easier and works all the time
2022-02-20 00:36:21 +02:00
2a97bdb39d
fix pinned statuses appearing at the bottom of user timeline (and
...
possibly fetching new ones there)
2022-02-20 00:04:47 +02:00
0d073d607c
enable link handling in user bios to fix links not having _blank
2022-02-19 22:34:08 +02:00
769a9a14fe
add emoji to chat titles
2022-02-19 22:30:13 +02:00
a61f6e1590
use rich content in interaction lists
2022-02-19 22:12:37 +02:00
ee86f56469
more spacing fixes
2022-02-11 15:10:52 +02:00
17d6f1b53b
more spacing fixes
2022-02-11 15:06:12 +02:00
befd4d5fc7
improve unknown attachment handling
2022-02-10 15:42:28 +02:00
4c7edfc9a9
more spacing/wrapping fixes
2022-02-09 23:34:26 +02:00
d361a4d7dc
fix overflows
2022-02-04 14:20:56 +02:00
571e73a346
better approach to unescaping
2022-02-03 23:13:28 +02:00
39ecb33883
fix amps in links
2022-02-03 22:58:12 +02:00
0f01931309
make chat messages behave same as posts for animated gifs
2022-02-03 22:52:41 +02:00
a9830ff491
support width/height img attributes
2022-02-03 22:50:32 +02:00
9a6363431d
lint
2022-02-03 22:41:38 +02:00
ea6114f63c
better phrasing?
2022-02-03 22:36:13 +02:00
bfb3a4364b
options to disable (You)s and highlighting of yourself
2022-02-03 22:34:57 +02:00
6d3229b1a1
fix poast mentions tripping
2022-02-03 22:23:28 +02:00
06042569f1
fix alignment issues
2022-02-03 22:10:45 +02:00
8ade11783a
Merge branch 'from/develop/tusooa/1118-enhanced-mention-link' into 'develop'
...
Enhanced mention link
Closes #1118
See merge request pleroma/pleroma-fe!1424
2022-02-03 19:37:13 +00:00
a5e20a4eb2
Merge branch 'from/develop/tusooa/fix-follow-list' into 'develop'
...
Fix Follow button missing on follow list
See merge request pleroma/pleroma-fe!1428
2022-02-03 10:22:22 +00:00
0e6af68a0f
Fix lint warning in filtering_tab.vue
2022-02-02 21:35:17 -05:00
f886135bb7
Fix Follow button missing on follow list
2022-02-02 21:30:52 -05:00
c3f1765b21
Hide mention link avatar by default
2022-01-29 16:57:59 -05:00
7cc0d0763c
Add English translation for mention link prefs
2022-01-29 16:57:59 -05:00
c8983d5606
Make mention link prefs ui more intuitive
2022-01-29 16:57:59 -05:00
0c60b31eee
Add option to fade domains in mention link
2022-01-29 16:57:59 -05:00
aaf0b985ad
Make avatar unselectable
2022-01-29 16:57:59 -05:00
9fde13c968
Add option to display user avatar in mention link
2022-01-29 16:57:59 -05:00
8896afd8d8
Make (You) unselectable
2022-01-29 16:57:59 -05:00
95007059d1
Style properly usernames without tooltips
2022-01-29 16:57:59 -05:00
1d4b1b296e
Add pref for whether to display full user names and tooltips
2022-01-29 16:57:59 -05:00
76547fe66d
Add a pref for whether to display mention as icon or text
2022-01-29 16:57:59 -05:00
94c37e8adf
Merge remote-tracking branch 'origin/develop' into proper-attachments
...
* origin/develop:
undo accidental change when merging
Apply 1 suggestion(s) to 1 file(s)
Rearranged settings, moved more stuff to filtering where apllicable. Changed how filering works.
2022-01-24 21:29:19 +02:00
56de3d2f52
fix too-many-attachments in notifications column
2022-01-24 19:53:17 +02:00
c551e3e697
Merge remote-tracking branch 'origin/develop' into proper-attachments
...
* origin/develop: (81 commits)
Improve the user card for deactivated users
Update CHANGELOG.md
Update CHANGELOG.md
Allow canceling a follow request
Simple policy reasons for instance specific policies
entity_normalizer: Escape name when parsing user
Translated using Weblate (Spanish)
Translated using Weblate (Catalan)
Translated using Weblate (Korean)
Translated using Weblate (Japanese (ja_PEDANTIC))
Translated using Weblate (Indonesian)
Translated using Weblate (Esperanto)
Translated using Weblate (Vietnamese)
Translated using Weblate (Italian)
Translated using Weblate (Vietnamese)
Translated using Weblate (Indonesian)
Translated using Weblate (Italian)
Translated using Weblate (Vietnamese)
Translated using Weblate (Indonesian)
Translated using Weblate (Chinese (Simplified))
...
2022-01-24 19:28:38 +02:00
f7e2ac1c48
undo accidental change when merging
2022-01-24 19:16:03 +02:00
2f8aae371b
Merge remote-tracking branch 'origin/settings-and-filtering' into settings-and-filtering
...
* origin/settings-and-filtering:
Apply 1 suggestion(s) to 1 file(s)
2022-01-24 19:13:29 +02:00
9ea0f10abb
Merge remote-tracking branch 'origin/develop' into settings-and-filtering
...
* origin/develop: (169 commits)
Improve the user card for deactivated users
Update CHANGELOG.md
Update CHANGELOG.md
Allow canceling a follow request
Simple policy reasons for instance specific policies
entity_normalizer: Escape name when parsing user
Translated using Weblate (Spanish)
Translated using Weblate (Catalan)
Translated using Weblate (Korean)
Translated using Weblate (Japanese (ja_PEDANTIC))
Translated using Weblate (Indonesian)
Translated using Weblate (Esperanto)
Translated using Weblate (Vietnamese)
Translated using Weblate (Italian)
Translated using Weblate (Vietnamese)
Translated using Weblate (Indonesian)
Translated using Weblate (Italian)
Translated using Weblate (Vietnamese)
Translated using Weblate (Indonesian)
Translated using Weblate (Chinese (Simplified))
...
2022-01-24 19:12:17 +02:00
182fcca5da
Merge branch 'weblate-pleroma-pleroma-fe' into 'develop'
...
Translations update from Weblate
See merge request pleroma/pleroma-fe!1413
2022-01-19 13:10:16 +00:00
6509542dbd
Merge branch 'fixes_for_deactivated_profile' into 'develop'
...
Improve the user card for deactivated users
See merge request pleroma/pleroma-fe!1417
2022-01-19 13:09:49 +00:00
2ac78219ee
Improve the user card for deactivated users
2022-01-19 13:09:48 +00:00
af2a408b78
Apply 1 suggestion(s) to 1 file(s)
2022-01-09 17:59:50 +00:00
4587f37dd7
Allow canceling a follow request
...
When a follow request is sent, but not (yet) accepted, the behaviour is now to cancel the request instead of re sending.
The reason is double
* You couldn't cancel a follow request if you change your mind and the request wasn't answered yet
* Instances don't always correctly process a new follow request when the following is already happening. If something went wrong (e;g. the target server thinks you're following, but your instance thinks you're not yet), it's better to first sent an unfollow. This is the behaviour that Mastodon and most probably most other clients have. Therefore this flow is more tested and expected by other instances.
2021-12-12 18:09:21 +01:00
a20f1794d0
Merge branch 'simplePolicy_reasons_for_instance_specific_policies' into 'develop'
...
Simple policy reasons for instance specific policies
See merge request pleroma/pleroma-fe!1263
2021-12-03 18:14:32 +00:00
b4cfda4a20
Simple policy reasons for instance specific policies
2021-12-03 18:14:32 +00:00
d36b45ad43
entity_normalizer: Escape name when parsing user
...
In January 2020 Pleroma backend stopped escaping HTML in display names
and passed that responsibility on frontends, compliant with Mastodon's
version of Mastodon API [1]. Pleroma-FE was subsequently modified to
escape the display name [2], however only in the "name_html" field. This
was fine however, since that's what the code rendering display names used.
However, 2 months ago an MR [3] refactoring the way the frontend does emoji
and mention rendering was merged. One of the things it did was moving away
from doing emoji rendering in the entity normalizer and use the unescaped
'user.name' in the rendering code, resulting in HTML injection being
possible again.
This patch escapes 'user.name' as well, as far as I can tell there is no
actual use for an unescaped display name in frontend code, especially
when it comes from MastoAPI, where it is not supposed to be HTML.
[1]: https://git.pleroma.social/pleroma/pleroma-fe/-/merge_requests/1052
[2]: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/2167
[3]: https://git.pleroma.social/pleroma/pleroma-fe/-/merge_requests/1392
2021-11-16 20:35:23 +03:00
d2730d5bad
Translated using Weblate (Spanish)
...
Currently translated at 100.0% (722 of 722 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/es/
2021-10-21 19:22:22 +00:00
1c75c74c91
Translated using Weblate (Catalan)
...
Currently translated at 99.7% (720 of 722 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ca/
2021-09-29 00:45:54 +00:00
ef684dff61
Translated using Weblate (Korean)
...
Currently translated at 61.9% (447 of 722 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ko/
2021-09-19 09:45:49 +00:00
241b4957e1
Translated using Weblate (Japanese (ja_PEDANTIC))
...
Currently translated at 99.4% (718 of 722 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ja_PEDANTIC/
2021-09-19 09:45:49 +00:00
45eda03d1c
Translated using Weblate (Indonesian)
...
Currently translated at 68.1% (492 of 722 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/id/
2021-09-16 00:45:47 +00:00
1d0e4bada8
Translated using Weblate (Esperanto)
...
Currently translated at 100.0% (722 of 722 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/eo/
2021-09-14 15:45:47 +00:00
3c8ced53b9
Translated using Weblate (Vietnamese)
...
Currently translated at 100.0% (722 of 722 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/vi/
2021-09-09 22:00:26 +00:00
80dd6b2500
Translated using Weblate (Italian)
...
Currently translated at 100.0% (722 of 722 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
2021-09-09 22:00:26 +00:00
ad64b91d66
Translated using Weblate (Vietnamese)
...
Currently translated at 100.0% (716 of 716 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/vi/
2021-09-09 22:00:26 +00:00
4988268f5f
Translated using Weblate (Indonesian)
...
Currently translated at 67.5% (484 of 716 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/id/
2021-09-09 22:00:26 +00:00
50adf0ddf2
Translated using Weblate (Italian)
...
Currently translated at 100.0% (716 of 716 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
2021-09-09 22:00:26 +00:00
370f1e55ad
Merge branch 'develop' into 'themeApply'
...
# Conflicts:
# CHANGELOG.md
2021-09-09 21:51:39 +00:00
a8a82ad12f
Merge branch 'showMobileNewPost' into 'develop'
...
New user option: Always show floating New Post button
See merge request pleroma/pleroma-fe!1395
2021-09-09 12:19:53 +00:00
1c53528433
Merge branch 'fix-favico-badge-chrome' into 'develop'
...
fix favico badge not working on chrome
See merge request pleroma/pleroma-fe!1391
2021-09-07 16:17:31 +00:00
8af1f08539
Merge branch 'better-still-emoji' into 'develop'
...
Status HTML parsing - better emoji and mentions rendering
Closes #935
See merge request pleroma/pleroma-fe!1392
2021-09-07 16:15:41 +00:00
25a8b48bf2
Merge branch 'from/develop/tusooa/fix-mobile-shoutbox-display' into 'develop'
...
Fix mobile shoutbox display
See merge request pleroma/pleroma-fe!1404
2021-09-07 14:46:39 +00:00
13468f2a89
Translated using Weblate (Vietnamese)
...
Currently translated at 50.0% (358 of 716 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/vi/
2021-09-05 04:46:01 +00:00
5bb471a68e
Translated using Weblate (Indonesian)
...
Currently translated at 67.3% (482 of 716 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/id/
2021-09-05 04:45:45 +00:00
ff5ed29ec1
Translated using Weblate (Chinese (Simplified))
...
Currently translated at 100.0% (716 of 716 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/zh_Hans/
2021-09-05 04:45:43 +00:00
fa75a3a615
Translated using Weblate (Basque)
...
Currently translated at 80.7% (578 of 716 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/eu/
2021-09-05 04:45:43 +00:00
6e57170626
Added translation using Weblate (Vietnamese)
2021-09-02 14:47:32 +00:00
98da3ad124
Translated using Weblate (Indonesian)
...
Currently translated at 60.6% (434 of 716 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/id/
2021-08-30 15:24:16 +00:00
144cee6d34
Translated using Weblate (Indonesian)
...
Currently translated at 58.6% (420 of 716 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/id/
2021-08-30 15:24:16 +00:00
0543c8d536
Translated using Weblate (Basque)
...
Currently translated at 80.4% (576 of 716 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/eu/
2021-08-30 15:24:16 +00:00
9319666f04
Translated using Weblate (Polish)
...
Currently translated at 98.8% (708 of 716 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/pl/
2021-08-30 15:24:16 +00:00
ca9652b30b
Translated using Weblate (Indonesian)
...
Currently translated at 56.9% (408 of 716 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/id/
2021-08-30 15:24:16 +00:00
21af736fe1
Translated using Weblate (Basque)
...
Currently translated at 79.8% (572 of 716 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/eu/
2021-08-30 15:24:16 +00:00
78ba8be969
Translated using Weblate (Spanish)
...
Currently translated at 100.0% (716 of 716 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/es/
2021-08-30 15:24:16 +00:00
29f229daad
Translated using Weblate (Indonesian)
...
Currently translated at 50.1% (359 of 716 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/id/
2021-08-30 15:24:16 +00:00
5049ee575f
Translated using Weblate (Polish)
...
Currently translated at 98.7% (707 of 716 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/pl/
2021-08-30 15:24:16 +00:00
32ed71501a
Translated using Weblate (Spanish)
...
Currently translated at 100.0% (716 of 716 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/es/
2021-08-30 15:24:16 +00:00
a7a736c7b8
Added translation using Weblate (Indonesian)
2021-08-30 15:24:16 +00:00
5cbb71e588
Translated using Weblate (Spanish)
...
Currently translated at 100.0% (716 of 716 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/es/
2021-08-30 15:24:16 +00:00
fa2e5deae2
Translated using Weblate (Catalan)
...
Currently translated at 97.4% (698 of 716 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ca/
2021-08-30 15:24:16 +00:00
a3bfa63d05
Translated using Weblate (Catalan)
...
Currently translated at 95.3% (683 of 716 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ca/
2021-08-30 15:24:16 +00:00
1ef2bb93fe
Translated using Weblate (Catalan)
...
Currently translated at 92.0% (659 of 716 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ca/
2021-08-30 15:24:16 +00:00
c38ab7234d
Translated using Weblate (Catalan)
...
Currently translated at 92.0% (659 of 716 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ca/
2021-08-30 15:24:16 +00:00
Henry Jameson