sam/pleroma-fe
sam/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
5954 commits 3 branches 15 tags 109 MiB
Commit graph

5954 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sam Therapy
4b1a1c7db9
Squashed commit of the following: 
commit d361a4d7dc
Author: Henry Jameson <me@hjkos.com>
Date:   Fri Feb 4 14:20:56 2022 +0200

    fix overflows

commit 571e73a346
Author: Henry Jameson <me@hjkos.com>
Date:   Thu Feb 3 23:13:28 2022 +0200

    better approach to unescaping

commit 39ecb33883
Author: Henry Jameson <me@hjkos.com>
Date:   Thu Feb 3 22:58:12 2022 +0200

    fix amps in links

commit 0f01931309
Author: Henry Jameson <me@hjkos.com>
Date:   Thu Feb 3 22:52:41 2022 +0200

    make chat messages behave same as posts for animated gifs

commit a9830ff491
Author: Henry Jameson <me@hjkos.com>
Date:   Thu Feb 3 22:50:32 2022 +0200

    support width/height img attributes

commit 9a6363431d
Author: Henry Jameson <me@hjkos.com>
Date:   Thu Feb 3 22:41:38 2022 +0200

    lint

commit ea6114f63c
Author: Henry Jameson <me@hjkos.com>
Date:   Thu Feb 3 22:36:13 2022 +0200

    better phrasing?

commit bfb3a4364b
Author: Henry Jameson <me@hjkos.com>
Date:   Thu Feb 3 22:34:57 2022 +0200

    options to disable (You)s and highlighting of yourself

commit 6d3229b1a1
Author: Henry Jameson <me@hjkos.com>
Date:   Thu Feb 3 22:23:28 2022 +0200

    fix poast mentions tripping

commit 06042569f1
Author: Henry Jameson <me@hjkos.com>
Date:   Thu Feb 3 22:10:45 2022 +0200

    fix alignment issues

Signed-off-by: Sam Therapy <sam@samtherapy.net>
 2022-02-05 14:57:00 -06:00
Sam Therapy
ab8629f2d8
Show full timeline selection by default 
Signed-off-by: Sam Therapy <sam@samtherapy.net>
 2022-02-05 14:43:57 -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
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
Sam Therapy
71143062f7
Lint + remove ancient file 2022-01-26 16:22:45 -06:00
Sam Therapy
86c593ea7f
Show all timeline options by default 2022-01-26 15:18:19 -06:00
Sam Therapy
2f6674627a
Add an nvmrc 2022-01-26 14:40:33 -06:00
Sam Therapy
7a3f319c7a
update submodule 
Signed-off-by: Sam Therapy <sam@samtherapy.net>
 2022-01-24 16:02:01 -06:00
Sam Therapy
3463ed97a7
Make fork settings more clear 
Signed-off-by: Sam Therapy <sam@samtherapy.net>
 2022-01-24 16:01:46 -06:00
Sam Therapy
c744056068
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into froth 
Signed-off-by: Sam Therapy <sam@samtherapy.net>
 2022-01-24 15:53:18 -06: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
Sam Therapy
285ffabdf3
Fix column size 
Signed-off-by: Sam Therapy <sam@samtherapy.net>
 2022-01-22 14:14:31 -06:00
Sam Therapy
8e71f0a093
Enhanced mention link 
https://git.pleroma.social/pleroma/pleroma-fe/-/merge_requests/1424

Signed-off-by: Sam Therapy <sam@samtherapy.net>
 2022-01-22 11:34:00 -06:00
Sam Therapy
3f113d3a69
Remove ruffle 
Signed-off-by: Sam Therapy <sam@samtherapy.net>
 2022-01-22 11:17:33 -06:00
Sam Therapy
ef7c024b84
Change git URL 2022-01-19 12:57:21 -06:00
Sam Therapy
325aab5e2a
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into froth 2022-01-19 12:55:58 -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
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
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
Sam Therapy
459e047419
Make follow requests cancel by default when clicking them twice 
https://git.pleroma.social/pleroma/pleroma-fe/-/merge_requests/1416
 2021-12-18 15:03:25 -06:00
Sam Therapy
462f50e9db
Add "deactivated user" card 
https://git.pleroma.social/pleroma/pleroma-fe/-/merge_requests/1417
 2021-12-18 15:02:22 -06: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
Sam Therapy
86fee257a2
Change panel & terms of service 
Signed-off-by: Sam Therapy <sam@samtherapy.net>
 2021-12-03 13:51:17 -06:00
Sam Therapy
55686addf1
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into froth 2021-12-03 13:39:49 -06: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