Commit graph

26000 commits

Author SHA1 Message Date
241d123fc4 bump version 2024-02-27 14:59:25 -08:00
1c50079f7b Allow pinning/unpinning other users posts 2024-02-27 14:57:27 -08:00
401376d668 Fix restriction on excludeReplies and excludeNoFiles 2024-02-27 14:50:13 -08:00
6e0f7195b3 Remove withReplies NAND withFiles check 2024-02-27 14:13:48 -08:00
86a77a9dba bump version 2024-02-26 21:38:22 -08:00
3ae5cfd720 Change icons for like and favorite
"Like" will now use a star emoji, like mastodon's faves
"Favorite" will now use a bookmark emoji, since it functions as a bookmark
2024-02-26 21:36:53 -08:00
6ecb0dcacf bump version 2024-02-26 11:33:57 -08:00
b75006ff10 Change default reaction emoji 2024-02-26 11:33:50 -08:00
b9764e5a73 bump version 2024-02-25 13:40:37 -08:00
74a62c2107 Merge branch 'feature-allowlist' into egirls-sharkey 2024-02-24 14:33:24 -08:00
9dcc7645ea Allowlist implementation 2024-02-24 14:33:12 -08:00
83880096b2 Lock off public HTML 2024-02-23 12:27:13 -08:00
acec9de658 Allow securing public api 2024-02-23 12:04:47 -08:00
d1e8653449 nix stuff 2024-02-22 06:20:14 -08:00
Amelia Yukii
11d9fd9199 merge: import upstream ssrf fix on our stable (!425)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/425

Approved-by: Leah <kevinlukej@gmail.com>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
2024-02-17 13:06:47 +00:00
syuilo
6132bc3b3e fix of 9a70ce8f5e
Co-Authored-By: RyotaK <49341894+Ry0taK@users.noreply.github.com>
2024-02-17 12:54:45 +00:00
dakkar
fef7a7b99a bump version 2024-02-17 12:38:01 +00:00
tamaina
1948ca9aa8 Merge pull request from GHSA-qqrm-9grj-6v32 2024-02-17 12:36:44 +00:00
Amelia Yukii
848e1f9a56 version is better
(cherry picked from commit fb455e4fd9)
2024-02-01 16:11:48 +00:00
Amelia Yukii
9c4353ee79 Update .gitlab-ci.yml
(cherry picked from commit 8c5818acf0)
2024-02-01 16:10:47 +00:00
Amelia Yukii
a6e257f502 Merge branch 'feture/code-injection-fix' into 'develop'
CVE: Fixed code injection from twitter import

See merge request TransFem-org/Sharkey!390

(cherry picked from commit 127f8556d4)

2a8e93e4 Fixed code injection from twitter import
2024-02-01 15:07:35 +00:00
Amelia Yukii
310e1a1262 Merge branch 'Amelia-stable-patch-29368' into 'stable'
Update docker-compose_example.yml

See merge request TransFem-org/Sharkey!389
2024-02-01 14:44:14 +00:00
Amelia Yukii
15f3c046d1 Update docker-compose_example.yml 2024-02-01 14:42:19 +00:00
Amelia Yukii
01d695428a Revert "build stable with stable tag"
This reverts commit acf3e3460f
2024-02-01 14:15:10 +00:00
Amelia Yukii
acf3e3460f build stable with stable tag 2024-02-01 14:00:56 +00:00
Amelia Yukii
4c8116859c Revert "Merge branch 'cherry-pick-3b2d47b1' into 'stable'"
This reverts merge request !386
2024-02-01 13:55:44 +00:00
Amelia Yukii
0e13397db7 Merge branch 'cherry-pick-3b2d47b1' into 'stable'
build stable with stable tag

See merge request TransFem-org/Sharkey!386
2024-02-01 13:41:34 +00:00
Amelia Yukii
ad8818508f Update file .gitlab-ci.yml
(cherry picked from commit 3b2d47b1e39f9ff5a3bb47ca5f4abbc85fee7944)
2024-02-01 13:38:19 +00:00
Amelia Yukii
d444ee662f Merge branch 'cherry-pick-522ab39d' into 'stable'
Merge branch 'gitlab-ci' into 'develop'

See merge request TransFem-org/Sharkey!383
2024-02-01 10:23:23 +00:00
Amelia Yukii
4c354fff2d Merge branch 'gitlab-ci' into 'develop' 2024-02-01 10:23:23 +00:00
Marie
b81448edf6 merge: release 2023.12.0 2023-12-31 23:19:41 +01:00
Marie
134d2895f0 fix: merge conflict 2023-12-31 23:11:15 +01:00
Marie
7ba8fde9b9 chore: change version 2023-12-31 22:49:43 +01:00
Marie
1805150533 fix: visibility check on masto import
Originally from PR #288
2023-12-31 22:41:35 +01:00
Marie
6a46e30f67
chore: fix icons 2023-12-31 22:26:46 +01:00
Marie
ce6fadf767 fix: broken icon in emoji picker 2023-12-31 22:17:40 +01:00
Marie
57e9359e5d merge: (probably) fix line length between note and 1st reply (#287)
Reviewed-on: https://git.joinsharkey.org/Sharkey/Sharkey/pulls/287
2023-12-31 22:08:38 +01:00
dakkar
f42e2bacd4 (probably) fix line length between note and 1st reply 2023-12-31 20:56:16 +00:00
Marie
8e02d7f364
upd: add rosepine and rosepine dawn as preinstalle themes 2023-12-31 20:14:22 +01:00
Marie
049129fabe
chore: translate some japanese to english 2023-12-31 20:02:31 +01:00
Marie
49885504b9 merge: fix: sort multiple config files (#285) 2023-12-31 19:49:06 +01:00
dakkar
8bc77072cb fix: sort multiple config files
`globSync` doesn't guarantee the order in which it returns the
matching paths, so without the `sort()`, the config files may be
merged differently each time the server is started
2023-12-31 18:44:53 +00:00
Marie
7b04c6ade4
fix: make real-time update work with new notes/show changes 2023-12-31 19:29:26 +01:00
Marie
4f2fa60a72 merge: bugfix auth-fetch ask to never cache responses (#284)
Reviewed-on: https://git.joinsharkey.org/Sharkey/Sharkey/pulls/284
2023-12-31 19:24:29 +01:00
Marie
3ec00398a3
fix: security with notes/show endpoint 2023-12-31 19:21:59 +01:00
Marie
233eff48f3 merge: pleroma note import - Use hashed filename for exists check (#283)
Reviewed-on: https://git.joinsharkey.org/Sharkey/Sharkey/pulls/283
2023-12-31 18:43:38 +01:00
Marie
8336b6c6b4
upd: check for replies length 2023-12-31 18:41:29 +01:00
Marie
b1c26201ca
upd: Note Length customization
note length is now configurable through the config file

Closes #281

falls back to 3000 (misskey default) if not used/included in config
2023-12-31 18:22:02 +01:00
Marie
031d748d0c fix: /oauth/oauth to /oauth 2023-12-31 17:25:38 +01:00
dakkar
61c193c08f lint 2023-12-31 16:17:45 +00:00