sjw
/
pleroma-fe
mirror of https://git.pleroma.social/sjw/pleroma-fe.git
1
0
Fork 0
Code Issues Releases Wiki Activity
6,387 Commits 159 Branches 3 Tags 443 MiB
Commit Graph

6387 Commits

Author SHA1 Message Date
Your New SJW Waifu 2e165cdec1 new favicon 2022-02-12 08:00:07 -06:00
Your New SJW Waifu f73c3e4a7f Merge branch 'neckbeard' of ssh://git.pleroma.social:2222/sjw/pleroma-fe into neckbeard 2022-02-12 07:36:47 -06:00
Your New SJW Waifu b37fa0766c only niggers use the old logo 2022-02-12 07:36:16 -06:00
Your New SJW Waifu 180a81806c Merge remote-tracking branch 'upstream/develop' into neckbeard 2022-02-10 16:38:29 -06: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
Your New SJW Waifu f35d27d1ac remove something I never meant to commit 2022-02-03 09:25:01 -06:00
Your New SJW Waifu 4c87fd7e7a new banner url 2022-02-03 08:16:12 -06:00
Your New SJW Waifu fd07a52a89 Merge remote-tracking branch 'upstream/develop' into neckbeard 2022-02-03 08:04:30 -06: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
HJ dd75e43c57 Merge branch 'from/develop/tusooa/fix-lint-warn' into 'develop' 
Fix lint warning in filtering_tab.vue

See merge request pleroma/pleroma-fe!1429
 2022-02-03 10:22:04 +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
HJ 28ee5721bb Merge branch 'hj-develop-patch-16931' into 'develop' 
Update CHANGELOG.md

See merge request pleroma/pleroma-fe!1427
 2022-01-24 19:31:42 +00:00
HJ e5f731c97d Update CHANGELOG.md 2022-01-24 19:29:01 +00:00
HJ 3cf7f9e3c8 Merge branch 'settings-and-filtering' into 'develop' 
Settings rearrange and filtering improvements

See merge request pleroma/pleroma-fe!1394
 2022-01-24 18:18:27 +00: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
Your New SJW Waifu 0e5290334a Merge remote-tracking branch 'upstream/develop' into neckbeard 2022-01-23 11:19:15 -06: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
Your New SJW Waifu 9f2316d02a update email 2022-01-13 12:26:16 -06:00
Your New SJW Waifu b8558418fe fix typo 2022-01-13 12:20:32 -06:00
Your New SJW Waifu facbcb834d update privacy policy and tos 2022-01-13 12:17:22 -06:00
Your New SJW Waifu 1ad764cb9f no more snow 2022-01-13 11:42:28 -06:00
Your New SJW Waifu aa7ae519af Merge remote-tracking branch 'upstream/develop' into neckbeard 2022-01-13 11:41:36 -06:00
Shpuld Shpludson 756f7bf7c2 Merge branch 'shpuld-develop-patch-58245' into 'develop' 
Update CHANGELOG.md

See merge request pleroma/pleroma-fe!1423
 2022-01-09 18:29:46 +00:00
Shpuld Shpludson 4cd27acf7f Update CHANGELOG.md 2022-01-09 18:26:35 +00:00
Shpuld Shpludson 030c374def Merge branch 'shpuld-develop-patch-87791' into 'develop' 
Update CHANGELOG.md

See merge request pleroma/pleroma-fe!1422
 2022-01-09 18:21:14 +00:00
Shpuld Shpludson 056f5f547a Update CHANGELOG.md 2022-01-09 18:16:44 +00:00
HJ af2a408b78 Apply 1 suggestion(s) to 1 file(s) 2022-01-09 17:59:50 +00:00
Your New SJW Waifu 40ed0d9403 Merge remote-tracking branch 'upstream/develop' into neckbeard 2021-12-30 10:40:08 -06:00
Your New SJW Waifu 0ad5d85b22 Christmas is over 2021-12-30 10:39:33 -06:00
Your New SJW Waifu 58a07f897d Add new Baest banner by @neko@bae.st 2021-12-30 10:38:10 -06:00
HJ d22e04eaf6 Merge branch 'allow_to_cancel_follow_request' into 'develop' 
Allow canceling a follow request

See merge request pleroma/pleroma-fe!1416
 2021-12-28 11:43:24 +00:00
Your New SJW Waifu 2079be9ec3 update sidebar 2021-12-14 10:46:49 -06:00
Your New SJW Waifu 1354585860 It is christmas my dudes 2021-12-14 10:18:12 -06:00
Your New SJW Waifu 07c6849b49 new location and shell 2021-12-14 08:07:51 -06:00
Your New SJW Waifu 0b4ecbec12 Christmas time 2021-12-14 08:02:26 -06:00