Commit Graph

11935 Commits (998ffb00edb8cdc2355758c5f26dd8bf534b4006)
 

Author SHA1 Message Date
ggurdin 82337da852
Merge commit '48ec98c614cc8dceae1c5628cdceac1cec29d8cc' into fluffychat-merge 4 months ago
ggurdin 30efe73dc4
fluffychat merge 4 months ago
ggurdin 2017c72179
fluffychat merge 4 months ago
ggurdin 06d756681a
fluffychat merge 4 months ago
ggurdin 6c20c0e313
Merge commit 'aa4a575c5c099100767a095cf2c431adbed18b79' into fluffychat-merge 4 months ago
ggurdin 612ab99ea8
fluffychat merge 4 months ago
ggurdin 6e5643b262
fluffychat merge 4 months ago
ggurdin 2f857f8703
fluffychat merge 4 months ago
ggurdin 3b33e92ffc
fluffychat merge 4 months ago
ggurdin c7350dcadd
Merge commit 'e1ec87d3aaae00eb030bcfda28ec8f247e2c3346' into fluffychat-merge 4 months ago
ggurdin d5759a95bc
Merge commit '37d313c27116840d59866b541876e5a248f534a7' into fluffychat-merge 4 months ago
ggurdin 182269da97
merge main 4 months ago
ggurdin 5fb447336c
chore: wait for analytics box to init before fetching locally cached analytics (#3365) 4 months ago
ggurdin 12752ef38e
chore: don't call lemma_defintion for all tokens when opening toolbar (#3364) 4 months ago
ggurdin 78b77cfe2e
chore: make toolbar key constant to prevent rebuilds (#3361) 4 months ago
Kelrap 9bebe88b96
Change gradient direction, give icon background circle (#3359)
Co-authored-by: ggurdin <46800240+ggurdin@users.noreply.github.com>
4 months ago
ggurdin f50f202c03
chore: save lemma edits to database (#3360) 4 months ago
ggurdin 41830f2f2d
chore: react to new token selection when token is initally selected (#3358) 4 months ago
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>
4 months ago
ggurdin b0ad8a625c
chore: updates to buttons in activity dialog, added regenerate button, don't reset generator input fields when pressing back button (#3356) 4 months ago
ggurdin 57f4d66cca
chore: fix the spelling of some grammar categories (#3351) 4 months ago
ggurdin 9ccd18e08d
chore: wrap analytics page in SafeArea (#3350) 4 months ago
Kelrap 4858e06295
Uses lowercase versions of lemma/form when comparing (#3346) 4 months ago
avashilling 66e4cbc6af
feat: add star and morph icon rain when new grammar concept unlocked (#3338) 4 months ago
ggurdin f71121ae2a
Merge pull request #3335 from pangeachat/3223-marking-new-forms-and-simple-satisfying-collection-mechanic
3223 marking new forms and simple satisfying collection mechanic
4 months ago
ggurdin 491c13b28f
chore: fix jerking animation in word card 4 months ago
ggurdin ca71286e40
resolve merge conflict 4 months ago
ggurdin b3846c5b6e
Merge pull request #3336 from pangeachat/3322-chat-message-search-showing-non-messages
chore: filter out non-visible events from search results
4 months ago
ggurdin 7dc4645dcb
chore: filter out non-visible events from search results 4 months ago
avashilling 15b1e68b74 clarify variable names and format code 4 months ago
ggurdin 82db672f85
Merge pull request #3334 from pangeachat/3331-clicking-analytics-header-items-navigates-to-full-page-display
chore: redirect to analytics page instead of opening analytics popup
4 months ago
ggurdin a840146d04
Merge branch 'main' into 3331-clicking-analytics-header-items-navigates-to-full-page-display 4 months ago
ggurdin 280f54b55c
chore: redirect to analytics page instead of opening analytics popup 4 months ago
ggurdin ce9b125161
Merge pull request #3333 from pangeachat/new-message-overlay
chore: some positioning fixes
4 months ago
ggurdin 3b22d6b1c4
chore: some positioning fixes 4 months ago
ggurdin 40f71896fb
Merge pull request #3332 from pangeachat/message-overlay-experiment
refactor: new message selection mode
4 months ago
ggurdin 4f5c113021
resolve merge conflict 4 months ago
ggurdin aeb92b1b89
refactor: new message selection mode 4 months ago
avashilling 608ab95f1f Merge branch 'main' into 3223-marking-new-forms-and-simple-satisfying-collection-mechanic 4 months ago
avashilling 71e1423fd9 make overlay separate/stacked on top of word card 4 months ago
avashilling cec627386b small fixes and refactoring
Change how NewWordOverlay is called and remove redundant variables, take repeat tokens/lemma out of newTokens on click
4 months ago
ggurdin 9719c06f9b
Merge pull request #3325 from pangeachat/3324-decrease-levelup-confetti-after-a-few-seconds
3324 decrease levelup confetti after a few seconds
4 months ago
ggurdin 46ce65479e
Merge branch 'main' into 3324-decrease-levelup-confetti-after-a-few-seconds 4 months ago
ggurdin 5898b2a04e
Merge pull request #3326 from pangeachat/3215-activity-generation-edit-ui-and-text
chore: updates to activity generator UI
4 months ago
ggurdin 44982e8b84
chore: updates to activity generator UI 4 months ago
avashilling 6166511e10 small change to avoid null reference 4 months ago
avashilling aeaa4321d2 chore: decrease and stop confetti a few seconds after level up 4 months ago
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
4 months ago
ggurdin c377cc8976
Merge pull request #3323 from pangeachat/limit-search-name
Limit space taken up by chat search result's sender name
4 months ago
ggurdin 8520e3d59e
chore: simplify pangea comments 4 months ago