Commit Graph

987 Commits

Author SHA1 Message Date
Tusooa Zhu 04fbb6d93d
Show announcement dates 2022-11-24 18:27:14 -05:00
Tusooa Zhu e877fedb0e
Implement deleting announcement 2022-11-24 18:27:14 -05:00
Tusooa Zhu e494e74643
Implement posting announcements 2022-11-24 18:27:13 -05:00
Tusooa Zhu 95750509b1
Fetch real data from backend 2022-11-24 18:27:13 -05:00
tusooa 045a222183 Merge branch 'better-defaults-user-popovers' into 'develop'
Better defaults for user popovers

See merge request pleroma/pleroma-fe!1685
2022-11-24 23:23:03 +00:00
Henry Jameson 1512431973 fix leaky journal by running uniq on addToCollection entries 2022-11-24 22:31:38 +02:00
Your New SJW Waifu 5cfd544689 Merge remote-tracking branch 'upstream/develop' into neckbeard 2022-11-22 18:05:57 -06:00
HJ d1885d45e7 Merge branch 'search-pagination' into 'develop'
Implement loading more statuses when searching

See merge request pleroma/pleroma-fe!1410
2022-11-21 19:48:24 +00:00
Henry Jameson 96d45617e2 make better defaults for user popovers, closer to OG behavior 2022-11-21 21:44:03 +02:00
HJ 513b81a23b Merge branch 'from/develop/tusooa/remote-xact' into 'develop'
Remote interaction with posts: frontend part

See merge request pleroma/pleroma-fe!1419
2022-11-21 19:34:19 +00:00
Your New SJW Waifu ae3d68f1c6 Merge remote-tracking branch 'upstream/develop' into neckbeard 2022-10-04 11:31:23 -05:00
HJ 03b61f0a9c Merge branch 'from/develop/tusooa/grouped-emoji-picker' into 'develop'
Group emojis into packs in emoji picker

See merge request pleroma/pleroma-fe!1408
2022-09-22 08:11:25 +00:00
Tusooa Zhu a758e18dce
Make chunks named 2022-09-20 23:13:07 -04:00
Tusooa Zhu 6fab7b9e3f
Use import() for emoji.json 2022-09-20 22:03:31 -04:00
Tusooa Zhu cc58b9b93d
Add regional indicators 2022-09-20 21:50:40 -04:00
Tusooa Zhu a73f9731f5
Display localized unicode emoji names 2022-09-20 20:44:52 -04:00
Tusooa Zhu 1c3bdda14c
Load unicode emoji annotations 2022-09-20 20:15:32 -04:00
Tusooa Zhu 0445d7c882
Make unicode emoji phrases match with _ 2022-09-18 13:19:55 -04:00
Tusooa Zhu 8f4f02683f
Make emoji picker use grouped unicode emojis 2022-09-18 13:19:53 -04:00
Tusooa Zhu d648a6f8dc
Group emojis only by pack and remove pack: prefix
Ref: grouped-emoji-picker
2022-09-18 13:19:52 -04:00
Tusooa Zhu 123913f34f
Optimise emoji picker loading process 2022-09-18 13:19:50 -04:00
Tusooa Zhu ff2242e85d
Fix load more emoji action 2022-09-18 13:19:50 -04:00
Sean King 12d8d1711b
Added support for removing users from followers 2022-09-15 22:02:58 -06:00
Your New SJW Waifu 5687aaa924 Merge remote-tracking branch 'upstream/develop' into neckbeard 2022-09-14 21:35:49 -05:00
tusooa 2bea5d8128 Merge branch 'add/edit-status' into 'develop'
Add edit status functionality

See merge request pleroma/pleroma-fe!1537
2022-09-11 18:08:00 +00:00
Your New SJW Waifu 799c6e48a1 Merge remote-tracking branch 'upstream/develop' into neckbeard 2022-09-09 09:11:41 -05:00
Tusooa Zhu 12b0561992
Fix follow request count 2022-09-07 20:00:41 -04:00
Your New SJW Waifu 99996b3814 Merge remote-tracking branch 'upstream/develop' into neckbeard 2022-08-30 12:10:41 -05:00
Your New SJW Waifu 2038f9f3fe Merge remote-tracking branch 'upstream/develop' into neckbeard 2022-08-25 22:45:44 -05:00
Henry Jameson cd7380efe7 Merge remote-tracking branch 'origin/develop' into navigation-update
* origin/develop:
  Update dependency opn to v5
  fix notices being under the navbar, also change offset to use variable
  fix modals not having proper z index
  reduce indexes to be below 9999 so that develop error messages appear above
  Do not allow to find by name in findUser()
  Use lookup endpoint to obtain users by nickname
  Use $ for id UserProfile routes
  Allow opening profile: multiChoiceProprties record, anonymous access
  Allow opening profile when clicking an avatar inside of user popover
2022-08-23 21:52:17 +03:00
Sean King ee58e3868c
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into add/edit-status 2022-08-22 19:08:58 -06:00
HJ 272b748f26 Merge branch 'develop' into 'allow-opening-profile-in-user-popover'
# Conflicts:
#   src/components/settings_modal/tabs/general_tab.vue
2022-08-22 22:29:13 +00:00
HJ 88a3cf8705 Merge branch 'from/develop/tusooa/user-profile-routes' into 'develop'
Stop generating /:nickname user profile routes

See merge request pleroma/pleroma-fe!1589
2022-08-22 21:56:55 +00:00
Henry Jameson 7b6745bb84 Merge remote-tracking branch 'origin/develop' into navigation-update
* origin/develop: (49 commits)
  Fix react & extra buttons not styled on tab-focus
  Fix popover not popping up
  Fix styling on Safari
  Use :focus-visible instead of :focus for focus markers
  Optimize Reply badge position
  Add badges to status interacting buttons
  Update dependency nightwatch to v2
  Update dependency eslint-plugin-n to v15.2.5
  Update dependency mocha to v10
  Update dependency karma-coverage to v2
  Update dependency sass to v1.54.5
  Update dependency karma-firefox-launcher to v2
  Update dependency vue-template-compiler to v2.7.9
  Pin dependencies
  Refresh yarn.lock
  Allow column width configuration: allow stretching navbar with columns
  Remove legacy code for chunksSortMode
  Add FIXME comment about html-webpack-plugin-after-emit
  Use exact webpack version in package.json
  Reintroduce css minimizer
  ...
2022-08-23 00:35:25 +03:00
Alexander Tumin a29835375a Allow column width configuration: allow stretching navbar with columns 2022-08-17 09:49:52 +03:00
Henry Jameson 821a09109c fix list tests 2022-08-16 20:00:29 +03:00
Henry Jameson 04acf069d1 ignore invalid journal entries 2022-08-16 19:33:34 +03:00
Henry Jameson 840ce06397 proper journal trimming + remove some old workaround to my local bad data 2022-08-16 19:24:45 +03:00
Henry Jameson bbd99dc3cf fix 2022-08-15 23:31:05 +03:00
Henry Jameson 50f5afbce1 add and remove users to/from lists from their profile 2022-08-15 23:19:33 +03:00
Henry Jameson 96090ea98f fix anon user issues 2022-08-15 21:03:27 +03:00
Henry Jameson ebe095bd76 fix prod build again + fetch lists (and follow request) on login,
stop fetching on logout, don't start fetching in components
2022-08-15 20:44:21 +03:00
Your New SJW Waifu ff773492c5 Merge remote-tracking branch 'upstream/develop' into neckbeard 2022-08-12 11:15:09 -05:00
Henry Jameson 8d3d8fffab fixes, clear cache on logout 2022-08-12 01:19:19 +03:00
Henry Jameson 3a16a59f37 navigation refactored, used in mobile nav as well 2022-08-11 21:56:30 +03:00
Henry Jameson 04f8c2d29d it works more or less well now 2022-08-11 18:06:28 +03:00
Alexander Tumin 3e7e31d4a9 Allow column width configuration
Group column configuration in settings
Column width configuration: do not act on defaults
2022-08-11 16:38:24 +03:00
Henry Jameson 6df9913354 ability to pin items in navigation menu, initial draft version 2022-08-11 14:30:58 +03:00
Henry Jameson 732733f115 add a todo for future 2022-08-11 02:23:58 +03:00
Henry Jameson 72e238ceb3 server side storage support for collections + fixes 2022-08-11 01:07:51 +03:00
Tusooa Zhu ab4a75bdd9
Do not allow to find by name in findUser() 2022-08-10 12:17:18 -04:00
Tusooa Zhu 09f9640be1
Use lookup endpoint to obtain users by nickname 2022-08-09 22:11:55 -04:00
Henry Jameson 894a506382 fixes 2022-08-10 02:59:08 +03:00
Henry Jameson 2c0eb29b28 more prefs storage work + move dontShowUpdateNotifs to prefs 2022-08-10 02:37:09 +03:00
Henry Jameson aa41cedd93 initial prefs storage work 2022-08-10 02:19:07 +03:00
HJ 750696643f Merge branch 'feat/report-notification' into 'develop'
#949 Feat/report notification

See merge request pleroma/pleroma-fe!1322
2022-08-09 21:56:15 +00:00
HJ 7773e7de64 Merge branch 'lists-implementation' into 'develop'
Add lists support

See merge request pleroma/pleroma-fe!1584
2022-08-09 21:46:55 +00:00
Alexander Tumin a403f93b47 Allow opening profile: multiChoiceProprties record, anonymous access 2022-08-09 10:48:48 +03:00
Alexander Tumin 4803fb07c8 Allow opening profile when clicking an avatar inside of user popover 2022-08-08 23:50:38 +03:00
Henry Jameson 95f03a56ab don't let function access `this` 2022-08-08 02:18:29 +03:00
Henry Jameson fcf62a13ed don't show to anons, make it possible to disable notification instance-wide 2022-08-08 02:01:07 +03:00
Sean King dc9951d400
Fix merge conflicts 2022-08-06 22:02:21 -06:00
Alexander Tumin b5eba5974c Lists implementation: tests, linter fix 2022-08-06 18:28:49 +03:00
Alexander Tumin 171f6f0894 Lists implementation 2022-08-06 17:56:54 +03:00
Henry Jameson 8c59bad3c2 unit test + some refactoring 2022-08-04 22:09:42 +03:00
Henry Jameson 9c00610d00 refactoring 2022-08-04 17:20:11 +03:00
Your New SJW Waifu a56e6108f7 Merge remote-tracking branch 'upstream/develop' into neckbeard 2022-08-03 18:13:57 -05:00
Henry Jameson dbfca224d8 server-side storage for flags 2022-08-04 01:56:52 +03:00
Sean King 081aa0fd05
Fix merge conflicts 2022-08-01 18:17:09 -06:00
Your New SJW Waifu 89a5f752db Merge remote-tracking branch 'upstream/develop' into neckbeard 2022-07-31 20:49:53 -05:00
Henry Jameson fc18673030 deal with no-prototype-builtins 2022-07-31 12:36:02 +03:00
Henry Jameson fddb531ed2 --fix 2022-07-31 12:35:48 +03:00
Henry Jameson 2c3c2bb5b0 fix avatar not closing, add option to put popovers next to avatar
instead of over it
2022-07-19 19:33:48 +03:00
Ilja 18d69f93d3 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into feat/report-notification 2022-07-18 12:42:40 +02:00
Tusooa Zhu b11ac22192
Fix search() not honouring type param 2022-07-15 20:22:39 -04:00
Tusooa Zhu 5cd18be47b
Enable anonymous users to interact with statuses remotely 2022-07-01 13:03:45 -04:00
Henry Jameson d232fa3dc3 close on avatar click again, add zooming as option 2022-06-27 19:52:40 +03:00
Sean King fa5d35523d
Add ability to view status history for edited statuses 2022-06-20 22:52:08 -06:00
Tusooa Zhu bb5aed09cf
Display edited status 2022-06-11 12:20:11 -04:00
Sean King 1a333aabba
Add edit status functionality 2022-06-07 21:31:48 -06:00
Your New SJW Waifu 93515aa533 Merge remote-tracking branch 'upstream/develop' into neckbeard 2022-06-01 09:55:18 -05:00
HJ 0aa334515b Merge branch 'threecolumn' into 'develop'
Layout refactoring + Three column mode

See merge request pleroma/pleroma-fe!1503
2022-05-31 17:46:59 +00:00
Your New SJW Waifu 8e0ca4b8a9 Merge remote-tracking branch 'upstream/develop' into neckbeard 2022-05-27 09:45:11 -05:00
HJ 9725443e60 Revert "Merge branch 'revert-a88abc7e' into 'develop'"
This reverts merge request !1526
2022-05-22 16:40:59 +00:00
HJ 069cf3fa87 Revert "Merge branch 'from/develop/tusooa/lang-opts' into 'develop'"
This reverts merge request !1494
2022-05-22 16:38:09 +00:00
HJ a88abc7ee3 Merge branch 'from/develop/tusooa/lang-opts' into 'develop'
Add language options

See merge request pleroma/pleroma-fe!1494
2022-05-22 16:35:51 +00:00
Tusooa Zhu a35daceb5b
Add settings for filtering end-of-poll notifications
Ref: poll-notif
2022-05-20 16:45:33 -04:00
Henry Jameson 2c876f455a Merge remote-tracking branch 'origin/develop' into threecolumn
* origin/develop:
  Fix virtual scrolling when the user has a lot of pinned statuses
  fix "allow discovery" setting misbehaving
2022-05-20 12:45:06 +03:00
Henry Jameson 8d93e9c13c set/unset threecolumn mode on login/logout 2022-05-16 23:40:51 +03:00
Henry Jameson edbbbaad48 don't use wide mode for anon viewers 2022-05-09 23:25:41 +03:00
Tusooa Zhu f57171d7b9
Make lint happy 2022-04-29 20:36:56 -04:00
Tusooa Zhu a5e861cd01
Set userLanguage cookie when setting interface language 2022-04-29 20:34:29 -04:00
Your New SJW Waifu 6fce0fc50e Merge remote-tracking branch 'upstream/develop' into neckbeard 2022-04-29 12:20:23 -05:00
Henry Jameson 91f833d1f0 fix "allow discovery" setting misbehaving 2022-04-29 10:52:16 +03:00
Your New SJW Waifu fafe2f60a5 Merge remote-tracking branch 'upstream/develop' into neckbeard 2022-04-16 19:30:38 -05:00
Henry Jameson 3d37b9d8e1 unified layout-setting code and made an option to control or disable
third column behavior
2022-04-12 21:18:06 +03:00
Henry Jameson b5ded67c06 options to enable scrollbars and disable sticky headers 2022-04-07 15:11:23 +03:00
Henry Jameson ab7490e49b Merge remote-tracking branch 'origin/develop' into threecolumn
* origin/develop:
  Fix active popover style
  Use panel text instead of text for shoutbox icon
  Fix dropdown menu style inside panel header
  Fix phoenix sockets in dev mode
  Fix no reactivity on vuex 4 values
  fix tegulu
  heck
  fix i18n for good??
  force runtime build of i18n
  fix CSP by compiling the i18n templates as well
2022-04-07 10:33:20 +03:00
Tusooa Zhu 4ddb6189dc
Fix no reactivity on vuex 4 values 2022-04-06 17:17:47 -04:00
Henry Jameson 4a068483ed wide mode initial implementation + cleanup 2022-04-05 18:38:05 +03:00
Your New SJW Waifu fda5246eec Merge remote-tracking branch 'upstream/develop' into neckbeard 2022-03-31 21:36:26 -05:00
Henry Jameson 9ac7046521 Fix notices not disappearing on their own 2022-03-27 12:21:33 +03:00
Ilja d0bfd9a808 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into feat/report-notification 2022-03-20 09:53:57 +01:00
Your New SJW Waifu a660cd3b10 Merge remote-tracking branch 'upstream/develop' into neckbeard 2022-03-18 01:35:05 -05: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
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
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
Henry Jameson 5930b667a1 reduce the copypaste by making it more functional-style 2022-03-13 11:30:38 +02:00
Tusooa Zhu 48178bdc53
Make maxDepthInThread instance-default 2022-03-07 19:30:24 -05:00
Tusooa Zhu d157f67381
Make fading ancestors optional 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 863255d52f
Make position of other replies button a pref 2022-03-07 19:19:31 -05:00
Tusooa Zhu 2e54cf12c7
Add settings for max depth in thread 2022-03-07 19:19:30 -05:00
Tusooa Zhu d9a9f97751
Add simple tree style navigation 2022-03-07 19:19:29 -05:00
Tusooa Zhu 0582f19e7c
Add tree-style thread display 2022-03-07 19:19:29 -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 39909c8a85 pre-emptively wipe serverside settings on logout 2022-02-28 18:17: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
Ilja d0c4ad22cd Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into feat/report-notification 2022-02-26 02:08:13 +01:00
Ilja 819b760261 Fix up and code review
* Check if it works properly
    * Notifs are shown as BE returns them
    * The Interaction view has Reports, but only when you're mod or admin
* Do some extra translations
* Fix some console spam
2022-02-26 01:53:01 +01:00
Henry Jameson f626da838a revert to using local setting for default nsfw since backend is broken 2022-02-24 15:00:08 +02:00
Your New SJW Waifu 18d1d3e651 Merge remote-tracking branch 'upstream/develop' into neckbeard 2022-02-23 10:09:43 -06: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
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
Your New SJW Waifu 180a81806c Merge remote-tracking branch 'upstream/develop' into neckbeard 2022-02-10 16:38:29 -06:00
Henry Jameson bfb3a4364b options to disable (You)s and highlighting of yourself 2022-02-03 22:34:57 +02:00
Your New SJW Waifu fd07a52a89 Merge remote-tracking branch 'upstream/develop' into neckbeard 2022-02-03 08:04:30 -06:00
Tusooa Zhu c3f1765b21
Hide mention link avatar by default 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 9fde13c968
Add option to display user avatar in mention link 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 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 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
Your New SJW Waifu 0e5290334a Merge remote-tracking branch 'upstream/develop' into neckbeard 2022-01-23 11:19:15 -06:00
Ilja 2ac78219ee Improve the user card for deactivated users 2022-01-19 13:09:48 +00:00
Your New SJW Waifu d55bed41bf Merge remote-tracking branch 'upstream/develop' into neckbeard 2021-09-09 10:48:20 -05: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 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
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 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
eris 179af131ee Fix changelog merge conflict
# Conflicts:
#   CHANGELOG.md
2021-07-22 20:46:41 +00:00
Your New SJW Waifu 46533b4a74 Merge remote-tracking branch 'upstream/develop' into neckbeard 2021-07-20 12:23:39 -05:00