|
|
7d175f77ad
|
Merge branch 'froth' of git.froth.zone:Sam/pleroma-fe into froth
|
2022-03-14 10:33:49 +01:00 |
|
|
|
8c027a4754
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into froth
I hate merge commits
Signed-off-by: Sam Therapy <sam@samtherapy.net>
|
2022-03-11 19:55:15 +01: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 |
|
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 |
|
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 |
|
|
|
3ddf430770
|
Reapply pinch and zoom
https://git.pleroma.social/pleroma/pleroma-fe/-/merge_requests/1403
Signed-off-by: Sam Therapy <sam@samtherapy.net>
|
2022-03-01 14:16:09 -06:00 |
|
|
|
cd877e7514
|
Revert old scroll & pan
Signed-off-by: Sam Therapy <sam@samtherapy.net>
|
2022-03-01 14:04:36 -06:00 |
|
HJ
|
514d7d3f88
|
Merge branch 'fix-hidden-attachments' into 'develop'
fix placeholder attachments opening new tab
Closes #1139
See merge request pleroma/pleroma-fe!1439
|
2022-02-28 17:46:58 +00:00 |
|
Henry Jameson
|
77b55a559b
|
fix placeholder attachments opening new tab
|
2022-02-28 19:42:02 +02:00 |
|
|
|
4995d61bbb
|
Add mastoFE to the panel
Signed-off-by: Sam Therapy <sam@samtherapy.net>
|
2022-02-27 13:13:38 -06:00 |
|
Tusooa Zhu
|
b223acfc74
|
Clean up debug code
|
2022-02-27 12:08:28 -06:00 |
|
Tusooa Zhu
|
45e71af01e
|
Fix the bug where remote media fail to load without media proxy
|
2022-02-27 12:08:27 -06:00 |
|
Tusooa Zhu
|
7c9823e079
|
Cache emojis in service worker
|
2022-02-27 12:08:27 -06:00 |
|
Tusooa Zhu
|
c048011b07
|
Cache compiled assets in service worker
|
2022-02-27 12:08:27 -06:00 |
|
Tusooa Zhu
|
003c31c0a1
|
Create service worker in app
|
2022-02-27 12:08:27 -06:00 |
|
|
|
f907d68629
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into froth
|
2022-02-24 06:50:10 -06:00 |
|
|
|
0f23794e10
|
add wrench because I could not be bothred to redo the other commit
Signed-off-by: Sam Therapy <sam@samtherapy.net>
|
2022-02-21 14:50:14 -06:00 |
|
|
|
6716dafacd
|
add unicode 14.0 emojis
Signed-off-by: Sam Therapy <sam@samtherapy.net>
|
2022-02-21 13:03:26 -06:00 |
|
HJ
|
0300db6c63
|
Merge branch 'from/develop/tusooa/media-modal-counter-i18n' into 'develop'
Make media modal counter go through i18n
See merge request pleroma/pleroma-fe!1436
|
2022-02-21 16:15:16 +00:00 |
|
|
|
13bd05c4f9
|
make timeline expand not defaut (it's still an option)
Signed-off-by: Sam Therapy <sam@samtherapy.net>
|
2022-02-21 10:00:03 -06:00 |
|
|
|
896e446486
|
Add compact panel options back in
Signed-off-by: Sam Therapy <sam@samtherapy.net>
|
2022-02-21 09:56:24 -06:00 |
|
Tusooa Zhu
|
c7690aecd0
|
Add English translation for media modal counter
|
2022-02-21 10:34:20 -05:00 |
|
Tusooa Zhu
|
1b32bb9c51
|
Make media modal counter go through i18n
|
2022-02-21 10:33:47 -05:00 |
|
HJ
|
9bc7d99e16
|
Merge branch 'hj-develop-patch-74637' into 'develop'
Update changelog
See merge request pleroma/pleroma-fe!1435
|
2022-02-21 14:23:11 +00:00 |
|
HJ
|
965bc5573f
|
Update CHANGELOG.md
|
2022-02-21 14:17:28 +00:00 |
|
HJ
|
2559d03d7e
|
Update CHANGELOG.md
|
2022-02-21 14:16:45 +00:00 |
|
|
|
918006f5cb
|
Add pinch to zoom back
Signed-off-by: Sam Therapy <sam@samtherapy.net>
|
2022-02-20 18:46:49 -06:00 |
|
|
|
14eaeb3f26
|
Merge remote-tracking branch 'puni/fedi-absturztau-be' into froth
|
2022-02-20 11:52:46 -06:00 |
|
|
|
0344475722
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into froth
|
2022-02-20 11:30:51 -06:00 |
|
|
|
450ee4d6d4
|
Undo puni's changes temporarily
|
2022-02-20 11:12:33 -06:00 |
|
HJ
|
58d0f9678b
|
Merge branch 'fix-mentions-new-bugs' into 'develop'
Fix newfound bugs with rich mentions + user suggestions
See merge request pleroma/pleroma-fe!1430
|
2022-02-20 15:11:52 +00:00 |
|
HJ
|
ddee8bb686
|
Merge branch 'proper-attachments' into 'develop'
Attachment improvements
See merge request pleroma/pleroma-fe!1399
|
2022-02-20 15:11:33 +00:00 |
|
HJ
|
56616787ec
|
Merge branch 'fix-pinned-statuses' into 'develop'
Fix pinned statuses appearing at the bottom of user timeline
Closes #1112
See merge request pleroma/pleroma-fe!1433
|
2022-02-20 15:11:08 +00:00 |
|
HJ
|
d3659b5597
|
Merge branch 'fix-1133' into 'develop'
fix #1133
Closes #1133
See merge request pleroma/pleroma-fe!1434
|
2022-02-20 14:12:20 +00:00 |
|
Henry Jameson
|
373c30be69
|
fix #1133
|
2022-02-20 16:06:26 +02:00 |
|
