Commit graph

7903 commits

Author SHA1 Message Date
ggurdin
829bb79958
fluffychat merge 2026-02-03 14:49:47 -05:00
ggurdin
4c220b18a2
fluffychat merge 2026-02-03 14:44:06 -05:00
ggurdin
953e9281e6
Merge commit '046b3b8b14dec13119f28376b3f7c87c9606717a' into fluffychat-merge-2 2026-02-03 14:41:33 -05:00
ggurdin
25d28b2217
fluffychat merge 2026-02-03 14:41:19 -05:00
ggurdin
54e99fb7de
fluffychat merge 2026-02-03 14:14:10 -05:00
ggurdin
8bf947f070
fix iOS notifications 2026-02-03 14:07:46 -05:00
ggurdin
b21ae7a55a
fluffychat merge 2026-02-03 13:32:26 -05:00
ggurdin
d32f65235e
fluffychat merge 2026-02-03 13:21:33 -05:00
ggurdin
5973b16467
fluffychat merge 2026-02-03 13:17:04 -05:00
ggurdin
e64f5850e1
fluffychat merge 2026-02-03 13:14:22 -05:00
ggurdin
c993d8d5b2
fluffychat merge 2026-02-03 13:06:20 -05:00
ggurdin
07f14c35f1
fluffychat merge 2026-02-03 13:05:34 -05:00
ggurdin
a3ea04109c
fluffychat merge 2026-02-03 12:59:40 -05:00
ggurdin
3cd12a3828
fluffychat merge 2026-02-03 12:48:57 -05:00
ggurdin
5a9294fe60
fluffychat merge 2026-02-03 12:46:57 -05:00
ggurdin
ac1f514849
fluffychat merge 2026-02-03 12:43:00 -05:00
ggurdin
78b581d7fa
fluffychat merge 2026-02-03 12:29:10 -05:00
ggurdin
b5261c7a2a
fluffychat merge 2026-02-03 12:18:56 -05:00
ggurdin
5aeb3dc7b8
fluffychat merge 2026-02-03 12:17:48 -05:00
ggurdin
8c9648d0b4
fluffychat merge 2026-02-03 12:13:24 -05:00
ggurdin
30b068ae60
fluffychat merge 2026-02-03 12:07:36 -05:00
ggurdin
5664772dba
fluffychat merge 2026-02-03 12:04:49 -05:00
ggurdin
bed1a6dce5
fluffychat merge 2026-02-03 12:00:24 -05:00
ggurdin
67d374215d
fluffychat merge 2026-02-03 11:50:30 -05:00
ggurdin
d51c1a8599
fluffychat merge 2026-02-03 11:47:42 -05:00
ggurdin
9c2db01d29
fluffychat merge 2026-02-03 11:46:47 -05:00
ggurdin
a4a7424627
fluffychat merge 2026-02-03 11:44:25 -05:00
ggurdin
13890d5082
fluffychat merge 2026-02-03 11:43:03 -05:00
ggurdin
100fb4bfbc
fluffychat merge 2026-02-03 11:37:35 -05:00
ggurdin
082ca6d1de
fluffychat merge 2026-02-03 11:13:01 -05:00
ggurdin
dbeae58a6b
Merge branch 'main' into fluffychat-merge-2 2026-02-03 10:52:14 -05:00
ggurdin
8612f989c6
fix: filter edited events from search results 2026-02-03 10:39:43 -05:00
ggurdin
386275270f
fix: don't show error on cancel add recovery email 2026-02-03 10:28:47 -05:00
ggurdin
5817ee5f0a
fix: one click to close word card in activity vocab 2026-02-03 10:03:45 -05:00
ggurdin
d99936dc62
fix: move use activity image background setting into pangea user-specific style settings 2026-02-03 09:40:43 -05:00
ggurdin
93c8393ab7
fix: update data type of user genders in bot options model 2026-02-03 09:16:38 -05:00
ggurdin
abdd5c2be1
fluffychat merge 2026-02-02 16:55:35 -05:00
ggurdin
1432ee29e0
Merge pull request #5526 from pangeachat/5421-grammar-practice-todos
5421 grammar practice todos
2026-02-02 16:51:59 -05:00
ggurdin
7ad158a1c9
fluffychat merge 2026-02-02 16:45:18 -05:00
ggurdin
b0e3bd9ca3
fluffychat merge 2026-02-02 16:09:32 -05:00
ggurdin
e8f829c47e
Merge commit 'b63a1d3e5c33f2a02141802f82498b2310e529b0' into fluffychat-merge-2 2026-02-02 15:59:27 -05:00
ggurdin
550c66c7b3
fluffychat merge 2026-02-02 15:59:07 -05:00
ggurdin
408f626d38
resolve conflicts 2026-02-02 15:43:56 -05:00
ggurdin
e65522b5dd
Merge commit 'aeb853cbd10aa73ea6584ae7a1cbe36c6f9afecd' into fluffychat-merge-2 2026-02-02 15:29:55 -05:00
ggurdin
91945792aa
resolve conflicts 2026-02-02 15:29:38 -05:00
ggurdin
e40a4790af
fluffychat merge 2026-02-02 14:14:42 -05:00
ggurdin
80468f916f
fluffychat merge 2026-02-02 13:43:29 -05:00
ggurdin
a641aa1b03
Merge branch 'main' into fluffychat-merge-2 2026-02-02 13:35:24 -05:00
ggurdin
34ba67983d
fix: update UI on reply / edit event update 2026-02-02 13:27:38 -05:00
ggurdin
04d7490e9d
fix typos, dispose value notifier 2026-02-02 12:53:32 -05:00