ggurdin
|
eab4a314fd
|
resolved merge conflict
|
2024-11-04 13:46:22 -05:00 |
|
ggurdin
|
aa22cb8596
|
Merge pull request #772 from pangeachat/move-server-main
Move server main
|
2024-11-04 13:44:02 -05:00 |
|
ggurdin
|
94e52d8d9f
|
added pagination to constructs list in analytics popup to speed up rendering
|
2024-11-04 13:42:26 -05:00 |
|
ggurdin
|
506629b07f
|
long sentry error on missing grammar copy
|
2024-11-04 12:42:36 -05:00 |
|
ggurdin
|
4c26e4629a
|
more grammar copy updates
|
2024-11-04 12:30:37 -05:00 |
|
ggurdin
|
e7e5367595
|
added some missing grammar copy
|
2024-11-04 12:21:50 -05:00 |
|
Brord van Wierst
|
bdbcc820dc
|
Merge branch 'move-server-main' of https://github.com/pangeachat/client into move-server-main
|
2024-11-04 17:21:21 +01:00 |
|
Brord van Wierst
|
d0e306d0d0
|
correct url
|
2024-11-04 17:20:19 +01:00 |
|
ggurdin
|
d904c59d6a
|
added xp number to xp progress bar
|
2024-11-04 10:25:06 -05:00 |
|
ggurdin
|
7f651417fd
|
Merge branch '896-group-constructs-according-to-categories' of https://github.com/pangeachat/client into 896-group-constructs-according-to-categories
|
2024-11-04 09:51:29 -05:00 |
|
ggurdin
|
71b090683d
|
use ConstructIdentifier to sort constructs into groups
|
2024-11-04 09:51:09 -05:00 |
|
ggurdin
|
542958dcb3
|
cast subscription duration as enum value
|
2024-11-04 09:40:07 -05:00 |
|
Brord van Wierst
|
b1524bc7e7
|
Merge branch 'main' into move-server-main
|
2024-11-03 17:42:48 +01:00 |
|
Brord van Wierst
|
1a7a35fc22
|
Merge branch 'main' into move-server-main
|
2024-11-02 18:56:14 +01:00 |
|
William Jordan-Cooley
|
f989d3b466
|
update getGrammarCopy to use category, updated grammar copy
|
2024-11-01 17:21:16 -04:00 |
|
ggurdin
|
895f7afc7c
|
Merge pull request #902 from pangeachat/sentry
Sentry
|
2024-11-01 16:05:50 -04:00 |
|
ggurdin
|
dc68790c53
|
comment out unused typeahead widget
|
2024-11-01 16:05:16 -04:00 |
|
ggurdin
|
2a94d09968
|
backwards backwards compatibility for constructs category data
|
2024-11-01 16:04:53 -04:00 |
|
ggurdin
|
00cb1f1c75
|
handling for 'cat' model key
|
2024-11-01 15:23:06 -04:00 |
|
ggurdin
|
da6d64972b
|
add categories to analytics display
|
2024-11-01 15:19:52 -04:00 |
|
ggurdin
|
6b643a841a
|
make construct use category a String? instead of a list, set it to POS for vocab constructs
|
2024-11-01 13:59:23 -04:00 |
|
ggurdin
|
3a39a1aa85
|
Merge pull request #897 from pangeachat/sentry
Sentry
|
2024-11-01 12:00:07 -04:00 |
|
ggurdin
|
aa2f949e39
|
don't log error for message sent on or before september 25th without original sent, log senderID and timestamp in error message
|
2024-11-01 11:59:35 -04:00 |
|
ggurdin
|
a2175d5206
|
removed unused context variable from tokensGlobal function
|
2024-11-01 11:54:00 -04:00 |
|
William Jordan-Cooley
|
d9484776a5
|
grammar copy additions
|
2024-11-01 10:59:55 -04:00 |
|
ggurdin
|
d61d746cee
|
Merge pull request #895 from pangeachat/867-learning-analytics-main-menu-redesign
updates to main menu design
|
2024-11-01 10:56:05 -04:00 |
|
ggurdin
|
0a627ef856
|
updates to main menu design
|
2024-11-01 10:54:56 -04:00 |
|
ggurdin
|
5528ba70db
|
Merge pull request #882 from pangeachat/sentry
Sentry issue fixes
|
2024-11-01 10:31:40 -04:00 |
|
ggurdin
|
a4c346b07c
|
Merge branch 'main' into sentry
|
2024-11-01 10:31:33 -04:00 |
|
ggurdin
|
3cd8dfac6b
|
Merge pull request #878 from pangeachat/874-small-bugs-and-ux-issues-from-user-testing
start language assistance on enter
|
2024-11-01 10:31:14 -04:00 |
|
ggurdin
|
9a8d2d1408
|
Merge branch 'main' into 874-small-bugs-and-ux-issues-from-user-testing
|
2024-11-01 10:31:07 -04:00 |
|
ggurdin
|
de927aa6b4
|
resolve merge conflict
|
2024-11-01 10:30:22 -04:00 |
|
ggurdin
|
4dfc080b03
|
Merge pull request #881 from pangeachat/show-gained-points-in-one-place
decide whether to show points gain animation based on the origin of t…
|
2024-11-01 10:28:35 -04:00 |
|
ggurdin
|
ade8102830
|
Merge branch 'main' into show-gained-points-in-one-place
|
2024-11-01 10:28:28 -04:00 |
|
ggurdin
|
584dc94083
|
Merge pull request #893 from pangeachat/730-fix-accept-replacement
fix word sticking together, finally 🤯
|
2024-11-01 09:59:58 -04:00 |
|
ggurdin
|
5c239641ed
|
Merge branch 'main' into 730-fix-accept-replacement
|
2024-11-01 09:26:30 -04:00 |
|
ggurdin
|
0b8862751d
|
merge main into move-server-main
|
2024-11-01 09:20:06 -04:00 |
|
WilsonLe
|
cbec09fec7
|
fix word sticking together, finally 🤯
|
2024-11-01 11:21:01 +07:00 |
|
ggurdin
|
536b01c904
|
Merge pull request #892 from pangeachat/small-testing-fixes
updated chat description copy and added padding to move scrollbar out…
|
2024-10-31 16:42:59 -04:00 |
|
ggurdin
|
bda5cd4728
|
updated chat description copy and added padding to move scrollbar out of bot settings box
|
2024-10-31 16:42:33 -04:00 |
|
ggurdin
|
583e765831
|
Merge pull request #891 from pangeachat/dont-allow-wrong-choice-in-it
don't allow user to chose the incorrect choices in IT
|
2024-10-31 15:45:46 -04:00 |
|
ggurdin
|
80d9276f6e
|
don't allow user to chose the incorrect choices in IT
|
2024-10-31 15:44:41 -04:00 |
|
ggurdin
|
6872a0f9de
|
Merge pull request #889 from pangeachat/restrict-voice-button-width
restrict width of missing voice button
|
2024-10-31 15:02:49 -04:00 |
|
ggurdin
|
a0faa99730
|
restrict width of missing voice button
|
2024-10-31 15:01:56 -04:00 |
|
ggurdin
|
f8a9273d31
|
Merge pull request #887 from pangeachat/consistent-constructs-numbers
use filtered construct list and number of lemmas in learning analytic…
|
2024-10-31 14:47:57 -04:00 |
|
ggurdin
|
662098ee4c
|
use filtered construct list and number of lemmas in learning analytics view
|
2024-10-31 14:46:48 -04:00 |
|
ggurdin
|
db6b7fa7a8
|
Merge pull request #886 from pangeachat/remove-room-name-button
remove room details button because it's duplicate of button next to a…
|
2024-10-31 14:16:31 -04:00 |
|
ggurdin
|
aab41e2600
|
remove room details button because it's duplicate of button next to avatar
|
2024-10-31 14:15:53 -04:00 |
|
ggurdin
|
276bd5b983
|
Merge pull request #885 from pangeachat/dismiss-dialog-keyboard-on-top-outside
in conversation bot settings dialog, on tap outside textfield close m…
|
2024-10-31 14:11:08 -04:00 |
|
ggurdin
|
646272eae0
|
in conversation bot settings dialog, on tap outside textfield close mobile keyboard
|
2024-10-31 14:10:38 -04:00 |
|