Commit graph

6464 commits

Author SHA1 Message Date
Henry Jameson
2e47a5eae0 Merge branch 'expert-settings-and-serverside' into shigusegubu
* expert-settings-and-serverside:
  Update dependency shelljs to v0.8.5
  Do not mute bot posts in notifications
  Add bot indication to user icon on statuses
  Mute bot posts
2022-03-13 16:34:47 +02: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
HJ
51b14cc615 Merge branch 'eientei' into 'develop'
Mute bot posts filtering option

See merge request pleroma/pleroma-fe!1440
2022-03-13 14:04:15 +00:00
Henry Jameson
6f7ebb5891 fix merge conflict 2022-03-13 12:22:14 +02:00
HJ
80bd6433aa Merge branch 'renovate/shelljs-0.x' into 'develop'
Update dependency shelljs to v0.8.5

See merge request pleroma/pleroma-fe!1455
2022-03-13 10:20:28 +00:00
Henry Jameson
e928cef22a Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop:
  Update dependency v-click-outside to v2.1.5
2022-03-13 11:33:16 +02:00
Henry Jameson
cef6a44fa5 Merge branch 'expert-settings-and-serverside' into shigusegubu
* expert-settings-and-serverside:
  reduce the copypaste by making it more functional-style
  remove "experimental" label from streaming api
2022-03-13 11:33:12 +02:00
HJ
50b3a30d1a Merge branch 'renovate/v-click-outside-2.x' into 'develop'
Update dependency v-click-outside to v2.1.5

See merge request pleroma/pleroma-fe!1456
2022-03-13 09:32:59 +00:00
Henry Jameson
5930b667a1 reduce the copypaste by making it more functional-style 2022-03-13 11:30:38 +02:00
Pleroma Renovate Bot
9b5ae4d4a3 Update dependency v-click-outside to v2.1.5 2022-03-13 09:04:54 +00:00
Pleroma Renovate Bot
22c8ad4583 Update dependency shelljs to v0.8.5 2022-03-13 09:04:46 +00:00
Henry Jameson
726fdbea15 remove "experimental" label from streaming api 2022-03-13 10:51:13 +02:00
Henry Jameson
2469570c91 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop:
  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
2022-03-13 10:41:03 +02:00
HJ
67c2b52682 Merge branch 'renovate/portal-vue-2.x' into 'develop'
Update dependency portal-vue to v2.1.7

See merge request pleroma/pleroma-fe!1452
2022-03-13 08:20:20 +00:00
HJ
238e557d2b Merge branch 'renovate/lodash-monorepo' into 'develop'
Update dependency lodash to v4.17.21

See merge request pleroma/pleroma-fe!1451
2022-03-13 08:19:32 +00:00
HJ
c8d87e7ef9 Merge branch 'renovate/karma-spec-reporter-0.x' into 'develop'
Update dependency karma-spec-reporter to v0.0.33

See merge request pleroma/pleroma-fe!1449
2022-03-12 09:30:01 +00:00
Pleroma Renovate Bot
a83b07a629 Update dependency portal-vue to v2.1.7 2022-03-12 09:07:30 +00:00
Pleroma Renovate Bot
3bd2f3c36d Update dependency lodash to v4.17.21 2022-03-12 09:07:19 +00:00
Pleroma Renovate Bot
465c5f194c Update dependency karma-spec-reporter to v0.0.33 2022-03-12 09:07:05 +00:00
HJ
ec3df8e5f2 Merge branch 'renovate/chromedriver-87.x' into 'develop'
Update dependency chromedriver to v87.0.7

See merge request pleroma/pleroma-fe!1446
2022-03-11 10:59:22 +00:00
HJ
c194568daf Merge branch 'renovate/eslint-plugin-vue-5.x' into 'develop'
Update dependency eslint-plugin-vue to v5.2.3

See merge request pleroma/pleroma-fe!1447
2022-03-11 10:59:08 +00:00
HJ
63039aea37 Merge branch 'renovate/chenfengyuan-vue-qrcode-1.x' into 'develop'
Update dependency @chenfengyuan/vue-qrcode to v1.0.2

See merge request pleroma/pleroma-fe!1445
2022-03-11 09:15:37 +00:00
HJ
fb803b2ff2 Merge branch 'renovate/karma-webpack-4.x' into 'develop'
Update dependency karma-webpack to v4.0.2

See merge request pleroma/pleroma-fe!1450
2022-03-11 09:13:27 +00:00
HJ
fabac8524d Merge branch 'renovate/karma-sourcemap-loader-0.x' into 'develop'
Update dependency karma-sourcemap-loader to v0.3.8

See merge request pleroma/pleroma-fe!1448
2022-03-11 09:12:42 +00:00
Pleroma Renovate Bot
35ad2a1957 Update dependency karma-webpack to v4.0.2 2022-03-11 09:06:09 +00:00
Pleroma Renovate Bot
e4d40fbba4 Update dependency karma-sourcemap-loader to v0.3.8 2022-03-11 09:05:47 +00:00
Pleroma Renovate Bot
d4076e5df5 Update dependency eslint-plugin-vue to v5.2.3 2022-03-11 09:05:34 +00:00
Pleroma Renovate Bot
2ced27e734 Update dependency chromedriver to v87.0.7 2022-03-11 09:05:21 +00:00
Pleroma Renovate Bot
04d4f5525c Update dependency @chenfengyuan/vue-qrcode to v1.0.2 2022-03-11 09:05:09 +00:00
HJ
949f11ea1e Merge branch 'renovate/pin-dependencies' into 'develop'
Pin dependencies

See merge request pleroma/pleroma-fe!1443
2022-03-10 09:14:32 +00:00
Pleroma Renovate Bot
00a5dfc36f Pin dependencies 2022-03-10 09:06:57 +00:00
HJ
e29f33ed0c Merge branch 'renovate/font-awesome' into 'develop'
Pin dependencies

See merge request pleroma/pleroma-fe!1444
2022-03-09 19:35:02 +00:00
Pleroma Renovate Bot
6946d09f55 Pin dependencies 2022-03-09 18:43:25 +00:00
Alexander Tumin
450145dd6b Do not mute bot posts in notifications 2022-03-09 07:56:43 +03:00
Henry Jameson
877ab153a8 Merge remote-tracking branch 'tusooa/from/develop/tusooa/media-touch-actions' into shigusegubu
* tusooa/from/develop/tusooa/media-touch-actions:
  Make media modal buttons larger
2022-03-07 20:04:54 +02:00
Tusooa Zhu
deb6370007
Make media modal buttons larger 2022-03-06 18:38:57 -05:00
Henry Jameson
b40942557c Merge remote-tracking branch 'tusooa/from/develop/tusooa/tree-threading' into shigusegubu
* tusooa/from/develop/tusooa/tree-threading:
  Add English translations for fading ancestor option
  Make fading ancestors optional
  Update English translation for tree view settings
  Split conversation display style into two different settings
  Make 'Show full conversation' button have left border in embbeded mode
  Fix showingLongSubject not correctly propagated
  Fix timeline jump when scrolling
  Make replying and mediaPlaying controlled
  Clean up debug code for tree threading
  Fix virtual scrolling for tree threading
  Fix controlled status display toggles
  Add English translations for other replies count
  Add other replies count for reply list link
  Do not display replies inside status as link if there are no other replies
2022-03-06 23:42:04 +02:00
Henry Jameson
924a626108 Merge remote-tracking branch 'tusooa/from/develop/tusooa/media-touch-actions' into shigusegubu
* tusooa/from/develop/tusooa/media-touch-actions: (28 commits)
  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
  Prevent the click event from firing on content below modal
  ...
2022-03-06 23:40:21 +02:00
Henry Jameson
2e69cb773a Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop:
  Lint
  Add renovate.json
  fix placeholder attachments opening new tab
2022-03-06 23:38:18 +02:00
HJ
7e1e8ea429 Merge branch 'from/develop/tusooa/fix-lint-2' into 'develop'
Lint

See merge request pleroma/pleroma-fe!1442
2022-03-06 19:35:05 +00:00
Tusooa Zhu
7a8c975f61
Lint 2022-03-06 14:22:59 -05:00
Tusooa Zhu
71de2dc1d5
Add English translations for fading ancestor option 2022-03-06 14:18:52 -05:00
Tusooa Zhu
16686dbb4c
Make fading ancestors optional 2022-03-06 14:18:52 -05:00
Tusooa Zhu
55552ef273
Update English translation for tree view settings 2022-03-06 14:18:52 -05:00
Tusooa Zhu
4027b3f456
Split conversation display style into two different settings
linear => linear (now default)
simple_tree => tree / conversationTreeAdvanced=false
tree => tree / conversationTreeAdvanced=true
2022-03-06 14:18:52 -05:00
Tusooa Zhu
2d519a0822
Make 'Show full conversation' button have left border in embbeded mode 2022-03-06 14:18:44 -05:00
HJ
1e41c2b99e Merge branch 'renovate/configure' into 'develop'
Configure Renovate

See merge request pleroma/pleroma-fe!1441
2022-03-06 18:25:05 +00:00
Pleroma Renovate Bot
f0f1066bc8 Add renovate.json 2022-03-06 17:50:32 +00:00
Tusooa Zhu
dcb2270487
Add English translation for hide tooltip 2022-03-03 12:52:24 -05:00
Tusooa Zhu
2da80c2752
Add hide button to media modal 2022-03-03 12:51:13 -05:00