Marie
8c955fcce5
merge: use correct note design in favorites page - fixes #483 ( !481 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/481
Closes #483
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: Marie <marie@kaifa.ch>
2024-04-03 09:28:01 +00:00
Amelia Yukii
126248e58d
merge: some validation fixes ( !484 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/484
Closes #469
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
2024-03-30 11:05:58 +00:00
dakkar
074de82bf7
some validation fixes
2024-03-30 11:05:58 +00:00
dakkar
bd7c4f66f3
use correct note design in favorites page - fixes #483
2024-03-27 16:03:35 +00:00
dakkar
58bc8f2c10
merge: always align code to the left - fixes #436 ( !453 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/453
Closes #436
Approved-by: Essem <smswessem@gmail.com>
Approved-by: Leah <kevinlukej@gmail.com>
2024-03-14 14:48:30 +00:00
dakkar
94aed953b5
merge: make cookie a bit more secure - fixes #445 ( !468 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/468
Closes #445
Approved-by: Luna <her@mint.lgbt>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
2024-03-14 14:47:38 +00:00
dakkar
aa7035a35a
merge: longer statement_timeout for migrations - fixes 450 ( !466 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/466
Approved-by: Luna <her@mint.lgbt>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
2024-03-14 14:46:42 +00:00
dakkar
45eab01fc4
merge: hide CW-ed featured notes on welcome page - fixes #458 ( !467 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/467
Closes #458
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: Leah <kevinlukej@gmail.com>
Approved-by: Marie <marie@kaifa.ch>
2024-03-14 14:45:53 +00:00
Marie
71bcd76cc5
merge: Update IMPORTANT_NOTES.md ( !470 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/470
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: Marie <marie@kaifa.ch>
Approved-by: dakkar <dakkar@thenautilus.net>
2024-03-14 11:53:15 +00:00
Luna
d003c3ec1f
merge: Fixed broken line numbers ( !471 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/471
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: Luna <her@mint.lgbt>
2024-03-14 01:36:46 +00:00
KevinWh0
b918f38ec2
fixed
2024-03-13 23:52:21 +01:00
Dalek
cdb82c0ade
Update IMPORTANT_NOTES.md
2024-03-13 00:17:57 +00:00
dakkar
6826e43ad7
make cookie a bit more secure - fixes #445
...
We can't make the cookie `HttpOnly` because we're setting it from
Javascript, but I'm not sure it's worth the trouble to redesign that:
`JSON.parse(localStorage.account).token` gives you the token anyway,
hiding the cookie from JS won't offer much protection.
At least we can mark is `Secure` (meaning, only send it over HTTPS)
and _delete it on logout_ (it wasn't!)
2024-03-10 10:26:04 +00:00
dakkar
ff189b1952
hide CW-ed featured notes on welcome page - fixes #458
...
not the most elegant solution, but simple and robust
2024-03-10 10:13:35 +00:00
dakkar
43544a6479
longer statement_timeout for migrations - fixes 450
2024-03-09 15:38:36 +00:00
Amelia Yukii
d1f0fc6d5d
merge: Feature/maybe nicer dockerfile ( !463 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/463
Approved-by: Marie <marie@kaifa.ch>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
2024-03-08 16:13:47 +00:00
dakkar
ff7375c331
Feature/maybe nicer dockerfile
2024-03-08 16:13:47 +00:00
dakkar
5ba9a3f200
merge: check prohibited words when creating notes ( !461 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/461
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: Luna <her@mint.lgbt>
2024-03-07 15:45:28 +00:00
dakkar
29eea64d46
update notes to make sure we remember to check import/create problems
2024-03-05 16:54:31 +00:00
dakkar
ff0117a1a5
check prohibited words when creating notes
...
some small differences (between Misskey and us) inside the `create`
method made `git` put all the changes inside the `import` method… I
thought I had copied them all, but I had missed one, and it's a pretty
important one: prohibited words were not being checked!
2024-03-05 16:52:05 +00:00
Amelia Yukii
4c69cbcd2b
merge: update list of project members ( !452 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/452
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: Leah <kevinlukej@gmail.com>
2024-03-04 20:35:57 +00:00
dakkar
2a4e26c05f
update list of project members
2024-03-04 20:35:57 +00:00
Amelia Yukii
1e658ee04d
merge: fix repo + feedback URLs for Firefish / IceShrimp ( !450 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/450
Approved-by: Luna <her@mint.lgbt>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
2024-03-04 20:22:49 +00:00
Amelia Yukii
5988c5fa70
merge: rough start of a Sharkey contributors' guide - #241 ( !394 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/394
Approved-by: Marie <marie@kaifa.ch>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
2024-03-04 20:21:47 +00:00
dakkar
ad2a97f20f
rough start of a Sharkey contributors' guide - #241
2024-03-04 20:21:46 +00:00
Amelia Yukii
061cc40384
merge: allow lookup / search for http URLs ( !457 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/457
Approved-by: Luna <her@mint.lgbt>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
2024-03-04 20:20:53 +00:00
Amelia Yukii
5733190b37
merge: Fixed english translation for the "Delete File" button ( !458 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/458
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
2024-03-04 18:48:05 +00:00
Leah
e7c41927e2
Fixed english translation for the "Delete File" button
2024-03-04 18:48:04 +00:00
Amelia Yukii
421f1d46a2
merge: Fixed startup crash with seasonal effects ( !459 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/459
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
2024-03-04 18:47:47 +00:00
Leah
eba0c2cc61
Fixed startup crash with seasonal effects
2024-03-04 18:47:47 +00:00
dakkar
96d8432b85
allow lookup / search for http URLs
2024-03-03 14:45:34 +00:00
dakkar
03464cc379
always align code to the left - fixes #436
...
"featured notes" on the welcome page's right-hand column are shown
with the text right-aligned; code should not be affected by that. This
makes sure it isn't
2024-03-03 12:06:22 +00:00
dakkar
7d00c4529b
fix repo + feedback URLs for Firefish / IceShrimp
2024-03-03 11:12:58 +00:00
Amelia Yukii
2e55108b6b
merge: put back the readme ( !447 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/447
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: Marie <marie@kaifa.ch>
2024-03-02 16:50:34 +00:00
dakkar
83fa276483
put back the readme
2024-03-02 16:49:02 +00:00
Amelia Yukii
46c664348e
merge: merge upstream for 2024.2.1 ( !446 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/446
Closes #434
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: Marie <marie@kaifa.ch>
2024-03-02 16:36:49 +00:00
dakkar
af548d05ca
merge upstream for 2024.2.1
2024-03-02 16:36:49 +00:00
Amelia Yukii
eab7d5bd27
merge: Fix Images in ReadMe ( !445 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/445
Approved-by: Marie <marie@kaifa.ch>
Approved-by: dakkar <dakkar@thenautilus.net>
2024-02-25 23:59:05 +00:00
Amelia Yukii
8e8a9d3835
Fix Images in ReadMe
2024-02-25 21:57:12 +00:00
Marie
2fa0e238b7
merge: Update index.vue - Also check enableMcaptcha for noBotProtection ( !442 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/442
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <marie@kaifa.ch>
2024-02-24 18:16:43 +00:00
Marie
1b65c06d60
merge: fix: delete old follow request (if exists) before creating new ( !440 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/440
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <marie@kaifa.ch>
2024-02-24 18:16:16 +00:00
Marie
d539dec8b1
merge: Merge upstream changes from 23rd of Feburary ( !439 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/439
Closes #431
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
2024-02-24 18:16:06 +00:00
Ashley Graves
17df852c33
Update index.vue - I'm dumb sorry
2024-02-24 17:15:24 +00:00
Ashley Graves
f3ca342318
Update index.vue - Also check enableMcaptcha for noBotProtection
2024-02-24 17:12:53 +00:00
Kaity A
def2e8dff0
Merge remote-tracking branch 'origin/develop' into fix/failed-follow
2024-02-24 05:05:25 +00:00
Kaity A
ea948ccadc
fix: delete old follow request (if exists) before creating new
2024-02-24 04:38:01 +00:00
Marie
d1b787192a
fix: align note edit errors with note create errors
2024-02-23 17:01:35 +01:00
Marie
15d2319011
merge: upstream
2024-02-23 13:42:52 +01:00
tamaina
c0156b740b
enhance?: DeleteAccountServiceでユーザーを削除する際にuserChangeDeletedStateを発行する ( #13382 )
2024-02-23 18:15:39 +09:00
かっこかり
d834232232
enhance(games): 抜けている翻訳を追加・スタイル共通化 ( #13434 )
...
* enhance(games): 抜けている翻訳を追加・スタイル共通化
* frameDivider の使用箇所が見当たらなかったので削除
* ミス
* インナーでもcss変数を使う
* コロンを翻訳から外す
* 一部の翻訳を除去
* p
* revert some text
---------
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
2024-02-23 18:07:41 +09:00
