Commit graph

103 commits

Author SHA1 Message Date
eris 058b6b6182
Make nav panel icon margin optional 2023-01-30 16:52:52 +01:00
eris 20064ee6f7
Make new top nav links optional 2023-01-30 16:51:21 +01:00
eris 78382a27ea
Add user options to hide instance favicon and name 2023-01-30 16:41:40 +01:00
Sam Therapy a184a562f7
Pull upstream 2023-01-30 14:56:55 +01:00
Tusooa Zhu ce8101e60a
Add remove follower confirmation 2023-01-22 09:25:24 -05:00
Tusooa Zhu 547e85c7c6
Add confirm dialogs for accept & deny follow requests 2023-01-20 23:40:12 -05:00
Tusooa Zhu 1ff2948aeb
Add setting entries for whether to show confirmation dialogs 2023-01-20 23:39:07 -05:00
Sam Therapy eaa287d39d
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into froth
All checks were successful
continuous-integration/drone/push Build is passing
Signed-off-by: Sam Therapy <sam@samtherapy.net>
2023-01-20 18:24:45 +01:00
tusooa 7dc2277453
Use stylelint 2023-01-09 13:02:16 -05:00
Sam Therapy e71bf66223
Merge a ton of changes
Do any of them work? probably not.

Signed-off-by: Sam Therapy <sam@samtherapy.net>
2022-09-30 17:38:02 +02: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
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
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
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
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
Alexander Tumin 171f6f0894 Lists implementation 2022-08-06 17:56:54 +03:00
Henry Jameson fddb531ed2 --fix 2022-07-31 12:35:48 +03:00
Henry Jameson 3d9b3a7352 make user popover options expert 2022-07-27 20:25:30 +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
Henry Jameson d232fa3dc3 close on avatar click again, add zooming as option 2022-06-27 19:52:40 +03:00
Henry Jameson 9c9dc2053b move tooltips setting 2022-06-27 19:12:16 +03:00
Henry Jameson 55adcd822e fix animations, replace ugly old mentionlink tooltips with new usercard ones 2022-06-12 16:31:56 +03:00
Sam Therapy 5fcd6b1957
undo the custom emoji stuff
Signed-off-by: Sam Therapy <sam@samtherapy.net>
2022-06-11 16:47:43 +02:00
Sam Therapy 52fea46702
Merge branch 'froth' of git.froth.zone:Sam/pleroma-fe into froth 2022-06-11 12:46:34 +02: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
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
Sam Therapy fa64583de2
Fix timeline option, maybe
All checks were successful
continuous-integration/drone/push Build is passing
Signed-off-by: Sam Therapy <sam@samtherapy.net>
2022-05-30 15:58:55 +02:00
Sam Therapy 6e24a983e2
Pull from develop, again
All checks were successful
continuous-integration/drone/push Build is passing
Also remove english-nyan because that shit broken

Signed-off-by: Sam Therapy <sam@samtherapy.net>
2022-05-26 20:18:02 +02: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
Sam Therapy b51d511983
Add the froth changes back
All checks were successful
continuous-integration/drone/push Build is passing
This took forever and was really slow

Signed-off-by: Sam Therapy <sam@samtherapy.net>
2022-04-08 17:12:46 +02: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