Commit Graph

99 Commits

Author SHA1 Message Date
Sam Therapy 3a0825cf25
Merge branch 'froth-akkoma' of git.froth.zone:Sam/pleroma-fe; branch 'develop' of https://akkoma.dev/AkkomaGang/pleroma-fe into froth-akkoma
continuous-integration/drone/push Build was killed Details
2023-01-04 15:47:02 +01:00
FloatingGhost 313ddcebcb Add blurhash support 2022-12-30 04:57:23 +00:00
Sam Therapy 27b350ecce
Revert "purge shout/chat (#49)"
This reverts commit a8c4aec721.
2022-11-30 17:20:17 +01:00
Sam Therapy b343a88d77
Use akkoma maybe
continuous-integration/drone/push Build is passing Details
Signed-off-by: Sam Therapy <sam@samtherapy.net>
2022-11-30 17:01:38 +01:00
Puniko b6280ae97d resolve merge conflicts 2022-11-20 08:37:26 +01:00
floatingghost db46879a8f Big 'ol set of patches and dep maintenance (#212)
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/212
2022-11-15 15:47:32 +00:00
Puniko 1b190db9ed Merge branch 'develop' into fedi-absturztau-be 2022-10-19 17:48:12 +02:00
floatingghost 4f837f75ea setting-sync (#175)
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/175
2022-10-06 15:59:16 +00:00
Puniko 31fa6223ec resolve merge conflicts 2022-09-17 11:17:40 +02:00
floatingghost ae1b6ad887 Customisation of default profile tab, clean up settings (#156)
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/156
2022-09-05 17:02:16 +00:00
FloatingGhost ef50c63dc7 use supported languages from service 2022-08-30 14:37:36 +01:00
FloatingGhost e7c21ffbd7 allow selecting languages for translation 2022-08-29 22:16:59 +01:00
Absturztaube dccf5ed1c0 resolve merge conflicts 2022-08-28 10:34:00 +02:00
floatingghost 776bee889e Confirmation dialogs (#140)
supercedes #135

adapted from https://git.pleroma.social/pleroma/pleroma-fe/-/merge_requests/1431

Co-authored-by: Tusooa Zhu <tusooa@kazv.moe>
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/140
2022-08-26 11:58:33 +00:00
floatingghost 64fdde52f6 timeline panel nav (#131)
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/131
2022-08-17 08:41:36 +00:00
eris ca0b730605 Redo desktop nav, add options for site name and favicon (#83)
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/83
Co-authored-by: eris <femmediscord@gmail.com>
Co-committed-by: eris <femmediscord@gmail.com>
2022-08-14 23:24:59 +00:00
eris d4f8934e8a New option: Pause MFM animations until status hover (#120)
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/120
Co-authored-by: eris <femmediscord@gmail.com>
Co-committed-by: eris <femmediscord@gmail.com>
2022-08-08 15:47:06 +00:00
Absturztaube d3d13d50d4 resolve merge conflicts 2022-07-26 12:22:07 +02:00
Absturztaube 6b10df2d89 merged akkoma-fe develop 2022-07-26 10:44:11 +02:00
floatingghost a8c4aec721 purge shout/chat (#49)
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/49
2022-07-20 15:36:45 +00:00
FloatingGhost ed42c476fb allow MFM authoring 2022-06-14 15:57:02 +01:00
FloatingGhost d2bce51941 resolve merge conflicts 2022-06-11 10:58:50 +02:00
Absturztaube 89a37d84b2 resolve merge conflicts 2022-06-11 10:55:23 +02:00
FloatingGhost f6cf509a04 Merge remote-tracking branch 'upstream/develop' into develop 2022-06-08 18:09:16 +01:00
FloatingGhost a731f046b3 fix emoji sizing 2022-06-08 17:22:45 +01: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
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
Henry Jameson edbbbaad48 don't use wide mode for anon viewers 2022-05-09 23:25:41 +03:00
Tusooa Zhu d39de30221
Add config opts for email language 2022-04-29 20:34:31 -04:00
Tusooa Zhu a5e861cd01
Set userLanguage cookie when setting interface language 2022-04-29 20:34:29 -04: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
Absturztaube 643e087404 resolve merge conflicts 2022-03-16 20:21:33 +01: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
Henry Jameson 726fdbea15 remove "experimental" label from streaming api 2022-03-13 10:51:13 +02:00
Tusooa Zhu 551b8f3690
Fix "max depth in thread" setting 2022-03-07 20:02:53 -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 0582f19e7c
Add tree-style thread display 2022-03-07 19:19:29 -05:00
Henry Jameson 77bb0b5530 lint 2022-02-28 18:23:32 +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 f626da838a revert to using local setting for default nsfw since backend is broken 2022-02-24 15:00:08 +02:00
Henry Jameson 9c1814d122 expert settings toggle + server-side settings 2022-02-22 23:31:40 +02:00
Henry Jameson bfb3a4364b options to disable (You)s and highlighting of yourself 2022-02-03 22:34:57 +02: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 9fde13c968
Add option to display user avatar in mention link 2022-01-29 16:57:59 -05:00