Anon/yandere_fe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,352 Commits 1 Branch 0 Tags 127 MiB
1b796691b0
Commit Graph

5159 Commits

Author SHA1 Message Date
Henry Jameson
051d51bcd9 fix suggest not working 2022-03-17 09:28:19 +02:00
Henry Jameson
5718c6491e fix selects being messed up 2022-03-17 09:06:05 +02:00
Henry Jameson
a97c07bfdf fix settings not persisting 2022-03-17 09:02:26 +02:00
Henry Jameson
d815f984fb fix i18n errors related to @ symbol 2022-03-17 08:53:45 +02:00
Henry Jameson
4993dc37e2 fix rich content not rendering stillimage nor links correctly 2022-03-17 08:53:45 +02:00
Henry Jameson
0671aa0dd0 fix tabswitcher 2022-03-17 08:53:45 +02:00
Henry Jameson
b62653c202 fix chat user titles 2022-03-17 08:37:01 +02:00
Henry Jameson
be4244acde fix some warnings 2022-03-17 08:35:19 +02:00
Henry Jameson
8311d4deba shit renders yo 2022-03-16 22:13:21 +02:00
Henry Jameson
e51144809f shit boots yo 2022-03-16 22:02:44 +02:00
Henry Jameson
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
HJ
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
HJ
123de8aad0 Apply 1 suggestion(s) to 1 file(s) 2022-03-16 17:02:09 +00:00
Henry Jameson
47bb08514b fix broken icons after FA upgrade 2022-03-15 21:00:52 +02:00
Henry Jameson
71c0b59866 lint 2022-03-14 09:35:29 +02:00
Henry Jameson
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
HJ
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
Tusooa Zhu
1b204012ea
Make media modal buttons larger 2022-03-13 12:02:03 -04:00
Tusooa Zhu
b67a557a8c
Add English translation for hide tooltip 2022-03-13 12:02:03 -04:00
Tusooa Zhu
5fb302d0f1
Add hide button to media modal 2022-03-13 12:02:02 -04:00
Tusooa Zhu
7e21853cca
Lint 2022-03-13 12:02:02 -04:00
Tusooa Zhu
7dd1a0dd30
Prevent hiding media viewer if swiped over SwipeClick 2022-03-13 12:02:02 -04:00
Tusooa Zhu
90b066a744
Fix webkit image blurs 2022-03-13 12:02:02 -04:00
Tusooa Zhu
1128cc463c
Fix video in media modal not displaying properly 2022-03-13 12:02:02 -04:00
Tusooa Zhu
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
Tusooa Zhu
5829cd98af
Clean up debug code for image pinch zoom 2022-03-13 12:02:02 -04:00
Tusooa Zhu
3b4afdf567
Clean up 2022-03-13 12:00:45 -04:00
Tusooa Zhu
a485ebc2bb
Check whether we swiped only for mouse pointer 2022-03-13 12:00:45 -04:00
Tusooa Zhu
6980e4ddf1
Scale swipe threshold with viewport width 2022-03-13 12:00:44 -04:00
Tusooa Zhu
ddf6c9cef0
Allow pinch-zoom to fill the whole screen 2022-03-13 12:00:44 -04:00
Tusooa Zhu
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
Tusooa Zhu
839627ffc4
Reset position on swipe end even if we cannot navigate 2022-03-13 12:00:44 -04:00
Tusooa Zhu
f3269cdc10
Make lint happy 2022-03-13 12:00:44 -04:00
Tusooa Zhu
3502d374e3
Prevent the click event from firing on content below modal 2022-03-13 12:00:44 -04:00
Tusooa Zhu
0190a36070
Add missing swipe click component 2022-03-13 12:00:44 -04:00
Tusooa Zhu
23a6b86ef3
Clean up 2022-03-13 12:00:44 -04:00
Tusooa Zhu
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
Tusooa Zhu
a36673a6a8
Use pinch-zoom-element for pinch zoom functionality 2022-03-13 12:00:41 -04:00
Tusooa Zhu
544db06294
Add pan threshold 2022-03-13 11:56:35 -04:00
Tusooa Zhu
d9030b4fdd
Handle pinch action 2022-03-13 11:56:35 -04:00
Tusooa Zhu
a7570f5eb2
Preview swipe action 2022-03-13 11:56:34 -04:00
Tusooa Zhu
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
Henry Jameson
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
HJ
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
Henry Jameson
5930b667a1 reduce the copypaste by making it more functional-style 2022-03-13 11:30:38 +02:00
Henry Jameson
726fdbea15 remove "experimental" label from streaming api 2022-03-13 10:51:13 +02:00
Alexander Tumin
450145dd6b Do not mute bot posts in notifications 2022-03-09 07:56:43 +03:00
Tusooa Zhu
551b8f3690
Fix "max depth in thread" setting 2022-03-07 20:02:53 -05:00
Tusooa Zhu
48178bdc53
Make maxDepthInThread instance-default 2022-03-07 19:30:24 -05:00
Tusooa Zhu
a511250b63
Make $status-margin fallback only 2022-03-07 19:28:38 -05:00
Tusooa Zhu
415a823af0
Clean up dead code 2022-03-07 19:19:32 -05:00
Tusooa Zhu
0e323ef248
Add English translations for fading ancestor option 2022-03-07 19:19:32 -05:00
Tusooa Zhu
d157f67381
Make fading ancestors optional 2022-03-07 19:19:32 -05:00
Tusooa Zhu
fa20ea76b1
Update English translation for tree view settings 2022-03-07 19:19:32 -05:00
Tusooa Zhu
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
Tusooa Zhu
9432fcec7d
Make 'Show full conversation' button have left border in embbeded mode 2022-03-07 19:19:32 -05:00
Tusooa Zhu
5768806d1b
Fix showingLongSubject not correctly propagated 2022-03-07 19:19:32 -05:00
Tusooa Zhu
f8c5cbcd0d
Fix timeline jump when scrolling 
Ref: tree-threading
 2022-03-07 19:19:31 -05:00
Tusooa Zhu
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
Tusooa Zhu
cc5cff2038
Clean up debug code for tree threading 2022-03-07 19:19:31 -05:00
Tusooa Zhu
2a510205c3
Fix virtual scrolling for tree threading 
Ref: tree-threading
 2022-03-07 19:19:31 -05:00
Tusooa Zhu
0db5a5a581
Fix controlled status display toggles 2022-03-07 19:19:31 -05:00
Tusooa Zhu
ba858a894c
Add English translations for other replies count 2022-03-07 19:19:31 -05:00
Tusooa Zhu
654996fdbe
Add other replies count for reply list link 2022-03-07 19:19:31 -05:00
Tusooa Zhu
cebb4224ac
Do not display replies inside status as link if there are no other replies 2022-03-07 19:19:31 -05:00
Tusooa Zhu
9b27ac9aaf
Add English translation for position of other replies button pref 2022-03-07 19:19:31 -05:00
Tusooa Zhu
863255d52f
Make position of other replies button a pref 2022-03-07 19:19:31 -05:00
Tusooa Zhu
c4bd004cbc
Add English translation for show all conversation button improvement 2022-03-07 19:19:31 -05:00
Tusooa Zhu
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
Tusooa Zhu
22bdcda9c0
Make other replies button stretch along the row 2022-03-07 19:19:31 -05:00
Tusooa Zhu
ba8598858b
Optimise thread ancestor borders 2022-03-07 19:19:31 -05:00
Tusooa Zhu
17863f54fe
Optimise thread ancestor display style 2022-03-07 19:19:31 -05:00
Tusooa Zhu
26670e9003
Reset thread open state when collapsed 2022-03-07 19:19:30 -05:00
Tusooa Zhu
10cd03c718
Clean up 2022-03-07 19:19:30 -05:00
Tusooa Zhu
f1db5e8f4b
Highlight ancestor of the current status when diving back to top 2022-03-07 19:19:30 -05:00
Tusooa Zhu
d78c8e8ea4
Add English translation for Misskey-style tree view 2022-03-07 19:19:30 -05:00
Tusooa Zhu
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
Tusooa Zhu
4adffb4835
Remove horizontal border and thicken vertical border in a thread tree 2022-03-07 19:19:30 -05:00
Tusooa Zhu
0e4a7c3d05
Make dive/undive button clickable along the whole row 2022-03-07 19:19:30 -05:00
Tusooa Zhu
8780246ce5
Optimize thread border radius 2022-03-07 19:19:30 -05:00
Tusooa Zhu
61bb69c88f
Optimize thread display 2022-03-07 19:19:30 -05:00
Tusooa Zhu
bdf631c2c4
Fix the bug where toggleShowingTall does not work 2022-03-07 19:19:30 -05:00
Tusooa Zhu
3addc36c96
Fix status undefined in parentOf 2022-03-07 19:19:30 -05:00
Tusooa Zhu
f851bc92c9
Add English translations for max depth in thread 2022-03-07 19:19:30 -05:00
Tusooa Zhu
2e54cf12c7
Add settings for max depth in thread 2022-03-07 19:19:30 -05:00
Tusooa Zhu
ff5f69b8fd
Use mergedConfig properly 2022-03-07 19:19:30 -05:00
Tusooa Zhu
d7da9f80a7
Fallback to simpleTree style 2022-03-07 19:19:30 -05:00
Tusooa Zhu
6b990ba368
Undive when collapsed 2022-03-07 19:19:29 -05:00
Tusooa Zhu
cd3e6d0073
Clean up 2022-03-07 19:19:29 -05:00
Tusooa Zhu
0aaef50ee5
Lint 2022-03-07 19:19:29 -05:00
Tusooa Zhu
05b2351e08
Add English translation for simple tree 2022-03-07 19:19:29 -05:00
Tusooa Zhu
d9a9f97751
Add simple tree style navigation 2022-03-07 19:19:29 -05:00
Tusooa Zhu
8c0deb905e
Add English translation for diving 2022-03-07 19:19:29 -05:00
Tusooa Zhu
d15d24c11c
Add dive functionality 2022-03-07 19:19:29 -05:00
Tusooa Zhu
31c4300456
Add English translations for diving 2022-03-07 19:19:29 -05:00
Tusooa Zhu
84a3cd92a3
Support diving into one status in a conversation 2022-03-07 19:19:29 -05:00
Tusooa Zhu
ace1f5067c
Make status display controlled 2022-03-07 19:19:29 -05:00
Tusooa Zhu
cd0f6a4f78
Add English translations for message threading 2022-03-07 19:19:29 -05:00
Tusooa Zhu
414ee55957
Make show full thread message account for numbers 2022-03-07 19:19:29 -05:00
Tusooa Zhu
0f2fd8a352
Implement thread folding/expanding 2022-03-07 19:19:29 -05:00
Tusooa Zhu
0582f19e7c
Add tree-style thread display 2022-03-07 19:19:29 -05:00
Tusooa Zhu
7a8c975f61
Lint 2022-03-06 14:22:59 -05:00
Alexander Tumin
2b7f12613e Add bot indication to user icon on statuses 2022-03-01 01:00:38 +03:00
Alexander Tumin
fe0ed7e8f0 Mute bot posts 2022-02-28 23:14:45 +03:00
Henry Jameson
77b55a559b fix placeholder attachments opening new tab 2022-02-28 19:42:02 +02:00
Henry Jameson
77bb0b5530 lint 2022-02-28 18:23:32 +02:00
Henry Jameson
39909c8a85 pre-emptively wipe serverside settings on logout 2022-02-28 18:17:13 +02:00
Henry Jameson
f4b36a9ebf fix errors in choicesetting 2022-02-28 18:15:21 +02:00
Henry Jameson
67319d0e5b fix typos in profile page 2022-02-28 18:15:07 +02:00
Henry Jameson
cf58df17f6 hidden away more settings when logged out 2022-02-28 18:04:13 +02:00
Henry Jameson
8bb97fbfeb fix settings behaving erratically and not updating properly 2022-02-28 18:01:41 +02:00
Henry Jameson
3a5ad18aca fix stripping rich content not working 2022-02-28 18:00:38 +02:00
Henry Jameson
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
Henry Jameson
c07c0b2260 fix firefox rendering (??????????) 2022-02-28 17:43:08 +02:00
Henry Jameson
f626da838a revert to using local setting for default nsfw since backend is broken 2022-02-24 15:00:08 +02:00
Henry Jameson
9623b0e140 better phrasing 2022-02-24 14:41:55 +02:00
Henry Jameson
b1b9260a1d new defaults 2022-02-22 23:32:12 +02:00
Henry Jameson
9c1814d122 expert settings toggle + server-side settings 2022-02-22 23:31:40 +02:00
Tusooa Zhu
c7690aecd0
Add English translation for media modal counter 2022-02-21 10:34:20 -05:00
Tusooa Zhu
1b32bb9c51
Make media modal counter go through i18n 2022-02-21 10:33:47 -05:00
HJ
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
HJ
ddee8bb686 Merge branch 'proper-attachments' into 'develop' 
Attachment improvements

See merge request pleroma/pleroma-fe!1399
 2022-02-20 15:11:33 +00:00
HJ
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
Henry Jameson
373c30be69 fix #1133 2022-02-20 16:06:26 +02:00
Henry Jameson
7b60adb480 only for user TL 2022-02-20 00:57:31 +02:00
Henry Jameson
a31ff20f50 lol, lmao, that was some shit, this is much easier and works all the time 2022-02-20 00:36:21 +02:00
Henry Jameson
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
Henry Jameson
0d073d607c enable link handling in user bios to fix links not having _blank 2022-02-19 22:34:08 +02:00
Henry Jameson
769a9a14fe add emoji to chat titles 2022-02-19 22:30:13 +02:00
Henry Jameson
a61f6e1590 use rich content in interaction lists 2022-02-19 22:12:37 +02:00
Henry Jameson
ee86f56469 more spacing fixes 2022-02-11 15:10:52 +02:00
Henry Jameson
17d6f1b53b more spacing fixes 2022-02-11 15:06:12 +02:00
Henry Jameson
befd4d5fc7 improve unknown attachment handling 2022-02-10 15:42:28 +02:00
Henry Jameson
4c7edfc9a9 more spacing/wrapping fixes 2022-02-09 23:34:26 +02:00
Henry Jameson
d361a4d7dc fix overflows 2022-02-04 14:20:56 +02:00
Henry Jameson
571e73a346 better approach to unescaping 2022-02-03 23:13:28 +02:00
Henry Jameson
39ecb33883 fix amps in links 2022-02-03 22:58:12 +02:00
Henry Jameson
0f01931309 make chat messages behave same as posts for animated gifs 2022-02-03 22:52:41 +02:00
Henry Jameson
a9830ff491 support width/height img attributes 2022-02-03 22:50:32 +02:00
Henry Jameson
9a6363431d lint 2022-02-03 22:41:38 +02:00
Henry Jameson
ea6114f63c better phrasing? 2022-02-03 22:36:13 +02:00
Henry Jameson
bfb3a4364b options to disable (You)s and highlighting of yourself 2022-02-03 22:34:57 +02:00
Henry Jameson
6d3229b1a1 fix poast mentions tripping 2022-02-03 22:23:28 +02:00
Henry Jameson
06042569f1 fix alignment issues 2022-02-03 22:10:45 +02:00
HJ
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
HJ
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
Tusooa Zhu
0e6af68a0f
Fix lint warning in filtering_tab.vue 2022-02-02 21:35:17 -05:00
Tusooa Zhu
f886135bb7
Fix Follow button missing on follow list 2022-02-02 21:30:52 -05:00
Tusooa Zhu
c3f1765b21
Hide mention link avatar by default 2022-01-29 16:57:59 -05:00
Tusooa Zhu
7cc0d0763c
Add English translation for mention link prefs 2022-01-29 16:57:59 -05:00
Tusooa Zhu
c8983d5606
Make mention link prefs ui more intuitive 2022-01-29 16:57:59 -05:00
Tusooa Zhu
0c60b31eee
Add option to fade domains in mention link 2022-01-29 16:57:59 -05:00
Tusooa Zhu
aaf0b985ad
Make avatar unselectable 2022-01-29 16:57:59 -05:00
Tusooa Zhu
9fde13c968
Add option to display user avatar in mention link 2022-01-29 16:57:59 -05:00
Tusooa Zhu
8896afd8d8
Make (You) unselectable 2022-01-29 16:57:59 -05:00
Tusooa Zhu
95007059d1
Style properly usernames without tooltips 2022-01-29 16:57:59 -05:00
Tusooa Zhu
1d4b1b296e
Add pref for whether to display full user names and tooltips 2022-01-29 16:57:59 -05:00
Tusooa Zhu
76547fe66d
Add a pref for whether to display mention as icon or text 2022-01-29 16:57:59 -05:00
Henry Jameson
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
Henry Jameson
56de3d2f52 fix too-many-attachments in notifications column 2022-01-24 19:53:17 +02:00
Henry Jameson
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
Henry Jameson
f7e2ac1c48 undo accidental change when merging 2022-01-24 19:16:03 +02:00
Henry Jameson
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
Henry Jameson
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
HJ
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
HJ
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
Ilja
2ac78219ee Improve the user card for deactivated users 2022-01-19 13:09:48 +00:00
HJ
af2a408b78 Apply 1 suggestion(s) to 1 file(s) 2022-01-09 17:59:50 +00:00
Ilja
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
HJ
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
Ilja
b4cfda4a20 Simple policy reasons for instance specific policies 2021-12-03 18:14:32 +00:00
rinpatch
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
tarteka
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
retiolus
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
Ryo Ueno
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
Ryo Ueno
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
@liimee
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
Tirifto
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
Hồ Nhất Duy
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
Ben Is
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
Hồ Nhất Duy
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
@liimee
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
Ben Is
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
HJ
370f1e55ad Merge branch 'develop' into 'themeApply' 
# Conflicts:
#   CHANGELOG.md
 2021-09-09 21:51:39 +00:00
HJ
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
HJ
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
HJ
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
Shpuld Shpludson
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
Hồ Nhất Duy
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
@liimee
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
Kana
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
tarteka
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
Hồ Nhất Duy
6e57170626 Added translation using Weblate (Vietnamese) 2021-09-02 14:47:32 +00:00
@liimee
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
@liimee
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
tarteka
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
marcin mikołajczak
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
@liimee
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
tarteka
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
tarteka
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
@liimee
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
marcin mikołajczak
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
tarteka
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
@liimee
a7a736c7b8 Added translation using Weblate (Indonesian) 2021-08-30 15:24:16 +00:00
tarteka
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
M. Strange
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
titizen
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
M. Strange
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
titizen
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
ZEN
791293c709 Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (716 of 716 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
 2021-08-30 15:24:16 +00:00
M. Strange
8574db1cf1 Translated using Weblate (Catalan) 
Currently translated at 56.1% (402 of 716 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ca/
 2021-08-30 15:24:15 +00:00
Snow
90d553f4be Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (716 of 716 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/zh_Hant/
 2021-08-30 15:24:15 +00:00
Haelwenn (lanodan) Monnier
d3139a92b3 Translated using Weblate (French) 
Currently translated at 100.0% (716 of 716 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/fr/
 2021-08-30 15:24:15 +00:00
Ben Is
bc08f998cf 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-08-30 15:24:15 +00:00
Tirifto
f72671a1aa Translated using Weblate (Esperanto) 
Currently translated at 100.0% (715 of 715 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/eo/
 2021-08-30 15:24:15 +00:00
Ben Is
738e7923e4 Translated using Weblate (Italian) 
Currently translated at 100.0% (715 of 715 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
 2021-08-30 15:24:15 +00:00
retiolus
b3f15fe3e1 Translated using Weblate (Catalan) 
Currently translated at 44.4% (318 of 715 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ca/
 2021-08-30 15:24:15 +00:00
ZEN
761f91f7ef Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (715 of 715 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
 2021-08-30 15:24:15 +00:00
Issabella Deinschnitzel
c509ed357a Translated using Weblate (German) 
Currently translated at 100.0% (715 of 715 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/de/
 2021-08-30 15:24:15 +00:00
Ben Is
18871684c7 Translated using Weblate (Italian) 
Currently translated at 100.0% (715 of 715 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
 2021-08-30 15:24:15 +00:00
Kana
33e2bcce31 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (714 of 714 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/zh_Hans/
 2021-08-30 15:24:15 +00:00
Ben Is
4d529c13ba Translated using Weblate (Italian) 
Currently translated at 100.0% (714 of 714 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
 2021-08-30 15:24:15 +00:00
Ben Is
0e53b2916e Translated using Weblate (Italian) 
Currently translated at 100.0% (714 of 714 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
 2021-08-30 15:24:15 +00:00
Tirifto
04a49e4c42 Translated using Weblate (Esperanto) 
Currently translated at 99.7% (709 of 711 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/eo/
 2021-08-30 15:24:15 +00:00
ZEN
f57f61ca53 Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (711 of 711 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
 2021-08-30 15:24:15 +00:00
Ben Is
4302db5975 Translated using Weblate (Italian) 
Currently translated at 100.0% (711 of 711 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
 2021-08-30 15:24:15 +00:00
Henry Jameson
4d73eaa6ce fix spacing before hashtags 2021-08-23 21:36:18 +03:00
Henry Jameson
39494439d3 very minimalist hashtaglink implementation, also you can middle-click 
mentions now.
 2021-08-23 20:57:21 +03:00
Henry Jameson
cbb34e2b0e fix expanded mentions spacing 2021-08-18 20:58:26 +03:00
Henry Jameson
e98a2af39e hopefully final fix for spacings 2021-08-18 20:54:04 +03:00
Henry Jameson
dbdc5e050f fix ext profile bug 2021-08-16 01:41:52 +03:00
Henry Jameson
49fe334186 play gifs when hovering over notification 2021-08-16 01:34:35 +03:00
Henry Jameson
14ec7d6a41 add attachment counter 2021-08-16 01:11:43 +03:00
Henry Jameson
7cc19ef2ea better media modal loading 2021-08-16 01:11:42 +03:00
Henry Jameson
0507eb6550 ability to move attachments around when making a new post 2021-08-15 21:04:49 +03:00
Henry Jameson
830a03a0d1 inline description display 2021-08-15 21:04:28 +03:00
Henry Jameson
34d265467a add media description into media modal 2021-08-15 19:45:48 +03:00
Henry Jameson
f5823a96e9 add key attribute to make image refresh in media modal to give feedback 
when images are still loaded
 2021-08-15 19:43:52 +03:00
Henry Jameson
777f6c0162 Merge branch 'better-still-emoji' into proper-attachments 
* better-still-emoji:
  fix "+X more" sticking
 2021-08-15 18:43:52 +03:00
Henry Jameson
0087d33c75 fix "+X more" sticking 2021-08-15 18:41:13 +03:00
Henry Jameson
299c00cf74 fix video attachments in notifications not having pointer cursor 2021-08-15 18:35:26 +03:00
Henry Jameson
07c12ae162 replace poll with an icon in notifications 2021-08-15 18:26:37 +03:00
Henry Jameson
c8a7b6f433 fix long posts double-fading in notifications 2021-08-15 18:21:25 +03:00
Henry Jameson
5431d8fe55 Merge branch 'better-still-emoji' into proper-attachments 
* better-still-emoji:
  fix links sticking to mentionsline
 2021-08-15 18:11:57 +03:00
Henry Jameson
8cc1ad67df fix links sticking to mentionsline 2021-08-15 18:11:38 +03:00
Henry Jameson
6aa6f6f300 fix console errors 2021-08-15 17:53:35 +03:00
Henry Jameson
17d2eed06a Merge branch 'better-still-emoji' into proper-attachments 
* better-still-emoji:
  fix tests
  prevent infinite update loops
  remove obsolete tests
  removed useless code, review change, fixed bug with tall statuses
  fixed mentions line again
  remove old emoji added, everything emoji-bearing uses RichContent now
  richcontent support in polls, user cards and user profiles
  support richcontent in polls
  fix tests, add performance test (skipped, doesn't assert anything), tweak max mentions count
  made the code responsible for showing unwritten mentions actually work
  remove new options for style and separate line, now groups all chained mentions on a mentionsline regardless of placement. fixes spacing
  fix tests
 2021-08-15 16:27:41 +03:00
Henry Jameson
f16658adfc fix tests 2021-08-15 02:59:14 +03:00
Henry Jameson
68b4323181 prevent infinite update loops 2021-08-15 02:55:45 +03:00
Henry Jameson
530ac4442b removed useless code, review change, fixed bug with tall statuses 2021-08-15 02:41:53 +03:00
Henry Jameson
4465de5241 fixed mentions line again 2021-08-14 22:03:09 +03:00
Henry Jameson
97e86381c8 remove old emoji added, everything emoji-bearing uses RichContent now 2021-08-13 13:12:33 +03:00
Henry Jameson
4c974f5ca2 richcontent support in polls, user cards and user profiles 2021-08-13 13:06:42 +03:00
Henry Jameson
6c6df29ed3 support richcontent in polls 2021-08-13 12:19:57 +03:00
Henry Jameson
add5921b8b fix tests, add performance test (skipped, doesn't assert anything), 
tweak max mentions count
 2021-08-12 19:37:04 +03:00
Henry Jameson
2182af4058 made the code responsible for showing unwritten mentions actually work 2021-08-12 03:09:28 +03:00
Henry Jameson
2cfff1b8b9 remove new options for style and separate line, now groups all chained 
mentions on a mentionsline regardless of placement. fixes spacing
 2021-08-12 02:56:40 +03:00
Tusooa Zhu
ef277ae4e2
Fix mobile shoutbox 2021-08-03 20:11:06 -04:00
eris
f35e3d0f3f Fix merge conflict in CHANGELOG 
# Conflicts:
#   CHANGELOG.md
 2021-07-22 20:47:36 +00:00
eris
179af131ee Fix changelog merge conflict 
# Conflicts:
#   CHANGELOG.md
 2021-07-22 20:46:41 +00:00
Shpuld Shpludson
425919a0d2 Merge branch 'fix-themes-select' into 'develop' 
Fix theme select not working

See merge request pleroma/pleroma-fe!1393
 2021-07-19 18:33:19 +00:00
HJ
ba961b784f Apply 1 suggestion(s) to 1 file(s) 2021-07-19 17:10:13 +00:00
Shpuld Shpludson
891611816c Merge branch 'editProfile' into 'develop' 
Minor change: Add edit profile button onto self user card

See merge request pleroma/pleroma-fe!1398
 2021-07-19 16:35:28 +00:00
Shpuld Shpludson
373b14e1e4 Merge branch 'fix-settings-anon' into 'develop' 
Fix Boolean/Choice settings not working properly on initial launch

See merge request pleroma/pleroma-fe!1389
 2021-07-19 16:11:11 +00:00
Henry Jameson
b67db47c88 lint 2021-06-22 20:47:35 +03:00
Henry Jameson
dd3fe61cf3 Merge branch 'better-still-emoji' into proper-attachments 
* better-still-emoji:
  fix non-notifying mentions and original mention display
  fix not escaping some stuff
  fix rich images
 2021-06-22 20:45:44 +03:00
Henry Jameson
a2f21f4e13 fix description colliding with extra-long text 2021-06-22 20:42:52 +03:00
Henry Jameson
628b99d117 don't stretch columns when uploading media 2021-06-22 20:37:08 +03:00
Henry Jameson
5118eee19a fix videos not stretching to container 2021-06-22 20:35:34 +03:00
Henry Jameson
4ba8d95a10 fix videos and related not having working drag controls 2021-06-22 20:33:57 +03:00
Henry Jameson
4016182b89 fix z-indexes 2021-06-22 20:32:55 +03:00
Henry Jameson
a258182522 fix non-notifying mentions and original mention display 2021-06-22 20:16:26 +03:00
eris
6125dc885a Update for latest develop merges to CHANGELOG 2021-06-20 21:06:59 +00:00
Eris
cd9dd352e3 Fix follow request count position on mobile 2021-06-20 06:27:32 +00:00
Henry Jameson
c6831a3810 fix not escaping some stuff 2021-06-18 21:42:46 +03:00
Henry Jameson
8fe4355a6b fix rich images 2021-06-18 21:29:47 +03:00
Henry Jameson
6b8b9c017f whoops 2021-06-18 17:39:29 +03:00
Henry Jameson
44b741e270 better attachments in uploading (grid layout) 2021-06-18 17:30:56 +03:00
Henry Jameson
8bab8658e8 better handling of unknown files, better upload display 2021-06-18 16:11:16 +03:00
Henry Jameson
bfe31e20ea better compact attachments 2021-06-18 14:12:50 +03:00
Henry Jameson
b68fb7738b Merge remote-tracking branch 'origin/develop' into better-still-emoji 
* origin/develop:
  Use proper setting name
  Use cleaner instance config check for shoutbox setting
  Make locale language cleaner
  Don't shorten shoutbox to SB
  Fix lint error
  Update CHANGELOG.md
  New option: Hide shoutbox
 2021-06-18 02:27:57 +03:00
Henry Jameson
f35c090caa merged in compact notifs and improved upon it 2021-06-18 02:27:32 +03:00
Henry Jameson
c1293c3afa Merge branch 'compact-notifs' into proper-attachments 
* compact-notifs:
  compact notifs
 2021-06-18 02:09:50 +03:00
Henry Jameson
f15599e6e5 gallery in post status form! 2021-06-18 02:04:01 +03:00
Henry Jameson
90345f158f gallery now supports flash, fixes for flash component. refactored media modal 2021-06-18 02:03:38 +03:00
Eris
85e2f8f78c Don't show profile edit button in sidebar 2021-06-17 20:57:23 +00:00
eris
b2ebfc1fd6 Merge branch 'develop' into 'editProfile' 
# Conflicts:
#   CHANGELOG.md
 2021-06-17 19:35:09 +00:00
Eris
e1361a1cae Add edit profile button 2021-06-17 19:29:58 +00:00
Henry Jameson
e654fead23 refactored attachments and gallery. All attachments now are in gallery. 2021-06-17 16:29:46 +03:00
Eris
9c4957268d Use proper setting name 2021-06-17 13:21:25 +03:00
Eris
6689fed513 Use cleaner instance config check for shoutbox setting 2021-06-17 13:21:25 +03:00
Eris
4ecbb58086 Make locale language cleaner 2021-06-17 13:21:25 +03:00
Eris
0a3ce9cc8b Don't shorten shoutbox to SB 2021-06-17 13:21:25 +03:00
Eris
dcfd178314 Fix lint error 2021-06-17 13:21:25 +03:00
Eris
9e9ab5cec9 New option: Hide shoutbox 2021-06-17 13:21:25 +03:00
Henry Jameson
a96a62929d Merge remote-tracking branch 'origin/develop' into settings-and-filtering 
* origin/develop:
  Use proper setting name
  Use cleaner instance config check for shoutbox setting
  Make locale language cleaner
  Don't shorten shoutbox to SB
  Fix lint error
  Update CHANGELOG.md
  New option: Hide shoutbox
 2021-06-16 13:52:13 +03:00
Henry Jameson
1717a3aaf2 fix chats again 2021-06-16 12:44:04 +03:00
Henry Jameson
ad3a2fd4e5 fixed "invisible" spans inside links 2021-06-16 01:20:20 +03:00
eris
139a0d1562 Merge branch 'develop' into 'themeApply' 
# Conflicts:
#   CHANGELOG.md
 2021-06-15 21:50:39 +00:00
eris
cab0095989 Merge branch 'develop' into 'showMobileNewPost' 
# Conflicts:
#   CHANGELOG.md
#   src/App.js
 2021-06-15 21:49:33 +00:00