Commit graph

13280 commits

Author SHA1 Message Date
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
5e586cf39d
fluffychat merge 2026-02-03 11:38:44 -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
ab94c4be33
Merge pull request #5560 from pangeachat/5550-pre-edit-messages-show-in-chat-search
fix: filter edited events from search results
2026-02-03 10:40:21 -05:00
ggurdin
8612f989c6
fix: filter edited events from search results 2026-02-03 10:39:43 -05:00
ggurdin
71670728ff
Merge pull request #5559 from pangeachat/5551-password-recovery-page-behavior
fix: don't show error on cancel add recovery email
2026-02-03 10:30:15 -05:00
ggurdin
386275270f
fix: don't show error on cancel add recovery email 2026-02-03 10:28:47 -05:00
ggurdin
1393fa69f2
Merge pull request #5558 from pangeachat/5552-click-multiple-times-to-close-word-card
fix: one click to close word card in activity vocab
2026-02-03 10:04:15 -05:00
ggurdin
5817ee5f0a
fix: one click to close word card in activity vocab 2026-02-03 10:03:45 -05:00
ggurdin
bf609f1b5f
Merge pull request #5557 from pangeachat/5553-activity-image-chat-background-setting-not-working
fix: move use activity image background setting into pangea user-spec…
2026-02-03 09:41:58 -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
ef09e58e94
Merge pull request #5556 from pangeachat/5555-users-genders-should-be-a-dictionary-keyed-by-user-id
fix: update data type of user genders in bot options model
2026-02-03 09:17:12 -05:00
ggurdin
93c8393ab7
fix: update data type of user genders in bot options model 2026-02-03 09:16:38 -05:00
ggurdin
d5512aa923
fluffychat merge 2026-02-02 16:56:17 -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
82878d7be4
fluffychat merge 2026-02-02 16:10:32 -05:00
ggurdin
b0e3bd9ca3
fluffychat merge 2026-02-02 16:09:32 -05:00
ggurdin
e6eff7b989
fluffychat merge 2026-02-02 16:00:48 -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
dcccb0ef05
Merge commit '5a7a76ff3a7b9228dd442c295cb1c60ff0849e00' into fluffychat-merge-2 2026-02-02 15:44:22 -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
db19ceab6f
Merge commit 'c06b2cf640f315070291a4676c13f44cfcb31fdb' into fluffychat-merge-2 2026-02-02 14:17:18 -05:00
ggurdin
e40a4790af
fluffychat merge 2026-02-02 14:14:42 -05:00
ggurdin
098fcff4c5
Merge commit '3d0a3ee2264430720329aefd1e10ac27f57c258f' into fluffychat-merge-2 2026-02-02 13:43:45 -05:00
ggurdin
80468f916f
fluffychat merge 2026-02-02 13:43:29 -05:00
ggurdin
458e4c5df2
fluffychat merge 2026-02-02 13:37:24 -05:00
ggurdin
a641aa1b03
Merge branch 'main' into fluffychat-merge-2 2026-02-02 13:35:24 -05:00
ggurdin
a41d96dff3
Merge pull request #5549 from pangeachat/5548-edit-section-of-input-bar-not-going-away-automatically
fix: update UI on reply / edit event update
2026-02-02 13:30:24 -05:00
ggurdin
34ba67983d
fix: update UI on reply / edit event update 2026-02-02 13:27:38 -05:00
ggurdin
2fa8b3a511
Merge pull request #5420 from pangeachat/5399-more-intentional-request-to-allow-notifications
5399 more intentional request to allow notifications
2026-02-02 12:56:16 -05:00
ggurdin
04d7490e9d
fix typos, dispose value notifier 2026-02-02 12:53:32 -05:00
ggurdin
1522dd46d1
move try-catch into request permission function 2026-02-02 12:27:32 -05:00
ggurdin
af948eb35d
fix login redirect 2026-02-02 12:21:17 -05:00
Ava Shilling
9717719ec1 Merge branch 'main' into 5421-grammar-practice-todos 2026-02-02 11:34:21 -05:00
Ava Shilling
92aff09a69 fix: missing line 2026-02-02 11:34:15 -05:00
Ava Shilling
d1c6effb2a chore: add morphExampleInfo to activity model 2026-02-02 11:33:32 -05:00
ggurdin
138e0d93e5
notification page navigation 2026-02-02 10:43:36 -05:00
ggurdin
85c3ff3590
Merge branch 'main' into 5399-more-intentional-request-to-allow-notifications 2026-01-30 16:21:51 -05:00
ggurdin
84ab4ea6eb
Merge pull request #5544 from pangeachat/merge-prod-into-main
Merge prod into main
2026-01-30 16:07:57 -05:00
ggurdin
468050027b
Merge branch 'production' into merge-prod-into-main 2026-01-30 16:07:23 -05:00
ggurdin
b66aa5f9db
fix: update room summary model (#5543) 2026-01-30 16:06:40 -05:00