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
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
FloatingGhost
d8643b5b4a
Take instance stopGifs value
2022-10-29 22:08:25 +01: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
FloatingGhost
87683052e8
add hacky reply filtering, turn off streaming by default
2022-09-20 16:27:17 +01:00
Puniko
31fa6223ec
resolve merge conflicts
2022-09-17 11:17:40 +02:00
floatingghost
6084cbbb00
collapse statuses with CWs by default ( #157 )
...
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/157
2022-09-06 17:00:15 +00: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
7dc0464094
split translation language by source and dest
2022-08-30 17:46:54 +01: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
FloatingGhost
48a11cb9d1
add translation options
2022-08-29 20:02:34 +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
504a11c9da
Merge branch 'develop' into fedi-absturztau-be
2022-08-07 11:46:50 +02:00
sfr
7c675f1ded
Add toggle to hide posts mentioning blocked users ( #78 )
...
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/78
Co-authored-by: sfr <sol@solfisher.com>
Co-committed-by: sfr <sol@solfisher.com>
2022-07-31 21:47:25 +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
sfr
716320de35
Respect subject lines in notifications ( #23 )
...
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/23
Co-authored-by: sfr <sol@solfisher.com>
Co-committed-by: sfr <sol@solfisher.com>
2022-06-27 16:15:24 +00:00
FloatingGhost
ed42c476fb
allow MFM authoring
2022-06-14 15:57:02 +01: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
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
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
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
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
5ce9136d89
resolve merge conflicts
2022-04-03 19:03:36 +02:00
Absturztaube
643e087404
resolve merge conflicts
2022-03-16 20:21:33 +01: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
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