Commit graph

6460 commits

Author SHA1 Message Date
ggurdin
6881565513
fluffychat merge 2025-07-08 10:27:34 -04:00
ggurdin
fe5afb8e89
Merge commit '7d798c57704cc38a39df3cd21be17d8ae52230b3' into fluffychat-merge 2025-07-08 10:02:18 -04:00
ggurdin
e61ad45e0d
fluffychat merge 2025-07-08 10:01:59 -04:00
ggurdin
7d5d8b3813
Merge commit '5b726d58b69e7a8ac02485498066fd13bfa6b9a0' into fluffychat-merge 2025-07-08 09:58:54 -04:00
ggurdin
82337da852
Merge commit '48ec98c614cc8dceae1c5628cdceac1cec29d8cc' into fluffychat-merge 2025-07-08 09:58:26 -04:00
ggurdin
30efe73dc4
fluffychat merge 2025-07-08 09:58:07 -04:00
ggurdin
2017c72179
fluffychat merge 2025-07-08 09:56:23 -04:00
ggurdin
06d756681a
fluffychat merge 2025-07-08 09:55:33 -04:00
ggurdin
612ab99ea8
fluffychat merge 2025-07-08 09:52:41 -04:00
ggurdin
6e5643b262
fluffychat merge 2025-07-08 09:41:34 -04:00
ggurdin
2f857f8703
fluffychat merge 2025-07-08 09:37:55 -04:00
ggurdin
3b33e92ffc
fluffychat merge 2025-07-08 09:32:14 -04:00
ggurdin
c7350dcadd
Merge commit 'e1ec87d3aaae00eb030bcfda28ec8f247e2c3346' into fluffychat-merge 2025-07-08 09:20:20 -04:00
ggurdin
d5759a95bc
Merge commit '37d313c27116840d59866b541876e5a248f534a7' into fluffychat-merge 2025-07-08 09:20:02 -04:00
ggurdin
182269da97
merge main 2025-07-08 09:19:17 -04:00
ggurdin
5fb447336c
chore: wait for analytics box to init before fetching locally cached analytics (#3365) 2025-07-07 16:57:32 -04:00
ggurdin
12752ef38e
chore: don't call lemma_defintion for all tokens when opening toolbar (#3364) 2025-07-07 16:46:38 -04:00
ggurdin
78b77cfe2e
chore: make toolbar key constant to prevent rebuilds (#3361) 2025-07-07 15:16:19 -04:00
Kelrap
9bebe88b96
Change gradient direction, give icon background circle (#3359)
Co-authored-by: ggurdin <46800240+ggurdin@users.noreply.github.com>
2025-07-07 14:53:31 -04:00
ggurdin
f50f202c03
chore: save lemma edits to database (#3360) 2025-07-07 14:48:00 -04:00
ggurdin
41830f2f2d
chore: react to new token selection when token is initally selected (#3358) 2025-07-07 13:45:10 -04:00
Kelrap
8dc1df1fef
Only shows text messages in chat search (#3355)
* Only shows text messages in chat search

* chore: simplify exclusion criteria for message search

---------

Co-authored-by: ggurdin <ggurdin@gmail.com>
Co-authored-by: ggurdin <46800240+ggurdin@users.noreply.github.com>
2025-07-07 12:44:11 -04:00
ggurdin
b0ad8a625c
chore: updates to buttons in activity dialog, added regenerate button, don't reset generator input fields when pressing back button (#3356) 2025-07-07 12:39:26 -04:00
ggurdin
57f4d66cca
chore: fix the spelling of some grammar categories (#3351) 2025-07-07 11:05:04 -04:00
ggurdin
9ccd18e08d
chore: wrap analytics page in SafeArea (#3350) 2025-07-07 11:00:29 -04:00
Kelrap
4858e06295
Uses lowercase versions of lemma/form when comparing (#3346) 2025-07-07 10:50:35 -04:00
avashilling
66e4cbc6af
feat: add star and morph icon rain when new grammar concept unlocked (#3338) 2025-07-07 09:43:52 -04:00
ggurdin
491c13b28f
chore: fix jerking animation in word card 2025-07-03 15:45:36 -04:00
ggurdin
ca71286e40
resolve merge conflict 2025-07-03 15:16:57 -04:00
ggurdin
7dc4645dcb
chore: filter out non-visible events from search results 2025-07-03 14:59:51 -04:00
avashilling
15b1e68b74 clarify variable names and format code 2025-07-03 14:46:16 -04:00
ggurdin
a840146d04
Merge branch 'main' into 3331-clicking-analytics-header-items-navigates-to-full-page-display 2025-07-03 14:39:38 -04:00
ggurdin
280f54b55c
chore: redirect to analytics page instead of opening analytics popup 2025-07-03 14:39:12 -04:00
ggurdin
3b22d6b1c4
chore: some positioning fixes 2025-07-03 14:31:24 -04:00
ggurdin
4f5c113021
resolve merge conflict 2025-07-03 12:37:11 -04:00
ggurdin
aeb92b1b89
refactor: new message selection mode 2025-07-03 12:36:21 -04:00
avashilling
608ab95f1f Merge branch 'main' into 3223-marking-new-forms-and-simple-satisfying-collection-mechanic 2025-07-03 12:31:23 -04:00
avashilling
71e1423fd9 make overlay separate/stacked on top of word card 2025-07-03 11:44:59 -04:00
avashilling
cec627386b small fixes and refactoring
Change how NewWordOverlay is called and remove redundant variables, take repeat tokens/lemma out of newTokens on click
2025-07-02 16:58:41 -04:00
ggurdin
46ce65479e
Merge branch 'main' into 3324-decrease-levelup-confetti-after-a-few-seconds 2025-07-02 16:02:58 -04:00
ggurdin
44982e8b84
chore: updates to activity generator UI 2025-07-02 15:56:27 -04:00
avashilling
6166511e10 small change to avoid null reference 2025-07-02 15:44:21 -04:00
avashilling
aeaa4321d2 chore: decrease and stop confetti a few seconds after level up 2025-07-02 15:29:14 -04:00
avashilling
1a08dda0ad add slightly different animation for smaller screens when not in column mode
vocab seed goes towards top right of card rather than top left of chat view, since there are no vocab stats on small screens
2025-07-02 15:02:17 -04:00
ggurdin
8520e3d59e
chore: simplify pangea comments 2025-07-02 14:47:28 -04:00
Kelrap
c46236bb6c Limit space taken up by chat search result's sender name 2025-07-02 13:54:11 -04:00
ggurdin
9250d5681f
chore: account for column width when calculating maxWidth for message bubble with extra content 2025-07-02 13:15:24 -04:00
ggurdin
ad877bfd43
chore: fix autoplay bot messages on android 2025-07-02 13:03:28 -04:00
ggurdin
12e6eda303
Merge branch 'main' into load-level-xp 2025-07-02 12:47:20 -04:00
ggurdin
540c7b01f0
chore: move construct summary loading into widget 2025-07-02 12:47:00 -04:00