Commit graph

7719 commits

Author SHA1 Message Date
ggurdin
db3da2a2e2
Merge branch 'main' into edit-chat-permissions 2024-06-26 13:47:07 -04:00
ggurdin
35f5731f41
Merge pull request #393 from pangeachat/analytics-target-languages
populate space analytics language dropdown from space student's analy…
2024-06-26 13:27:12 -04:00
ggurdin
51d684ac81
Merge branch 'main' into analytics-target-languages 2024-06-26 13:26:58 -04:00
ggurdin
3bcd13255e
Merge pull request #396 from pangeachat/igc-tweaks
Igc-tweaks
2024-06-26 13:26:23 -04:00
ggurdin
5ca912838f
Merge branch 'main' into igc-tweaks 2024-06-26 13:26:00 -04:00
Kelrap
59e521b69e Hide some Chat permission options 2024-06-26 12:27:45 -04:00
William Jordan-Cooley
c9d1b72773 igc tweaks 2024-06-26 11:34:41 -04:00
ggurdin
8fba3b667e
Merge pull request #394 from pangeachat/practice
for now, don't show the next activity after submitting an activity
2024-06-25 17:15:19 -04:00
ggurdin
19bf01421f for now, don't show the next activity after submitting an activity 2024-06-25 17:14:51 -04:00
ggurdin
eb0fdbd833
Merge pull request #302 from pangeachat/practice
[WIP] Practice
2024-06-25 15:47:19 -04:00
ggurdin
c304da4a65 Merge branch 'main' into practice 2024-06-25 15:46:36 -04:00
William Jordan-Cooley
22af3d096a merged and resolved conflicy 2024-06-25 15:33:30 -04:00
William Jordan-Cooley
a9ee9061b3 fixing latestResponse 2024-06-25 15:24:58 -04:00
ggurdin
fffa902939
Merge pull request #389 from pangeachat/unenable-my-analytics
Better filter for my analytics button
2024-06-25 15:21:12 -04:00
ggurdin
710a85f309
Merge branch 'main' into unenable-my-analytics 2024-06-25 15:21:06 -04:00
ggurdin
1b69e1a329
Merge pull request #391 from pangeachat/remove-sorting
Remove sorting
2024-06-25 15:20:11 -04:00
ggurdin
76d26f1c0c populate space analytics language dropdown from space student's analytics rooms 2024-06-25 15:19:27 -04:00
Kelrap
2cee0d374f Remove chat sorting edits 2024-06-25 14:51:47 -04:00
ggurdin
2227c9d22d update activity data when activity event id changes, show last activity if there are no incomplete activities 2024-06-25 14:41:45 -04:00
Kelrap
d959fdcc7b Checks if visible rooms for my analytics 2024-06-25 14:24:13 -04:00
ggurdin
965308d628 show next activity after completing activity 2024-06-25 14:12:33 -04:00
ggurdin
50af1e5508 make practice card text bot style, change opacity of icon buttons based on if they're available / enabled 2024-06-25 13:20:58 -04:00
ggurdin
401d8522f8 only show practice activity button if showMessageButtons is enabled 2024-06-25 12:53:54 -04:00
William Jordan-Cooley
f667a35dce hide generation button 2024-06-25 12:19:27 -04:00
William Jordan-Cooley
54dfd9dd22 merged in main 2024-06-25 11:16:01 -04:00
William Jordan-Cooley
9c75d4e2d5 debugging why certain activities would not show 2024-06-25 10:52:16 -04:00
ggurdin
99a4ea0e8d
Merge pull request #376 from pangeachat/combine-into-spaces
Combine into spaces
2024-06-25 10:48:49 -04:00
ggurdin
ca15a0816c
Merge branch 'main' into combine-into-spaces 2024-06-25 10:48:12 -04:00
ggurdin
244c4b78dd if room rules editor key has state, use that to set the rules editor inital rules in new space page 2024-06-25 09:52:41 -04:00
ggurdin
16a8383e72 added language dropdown to space analytics list and made timespan dropdown functional, updated fetching of space analytics 2024-06-25 09:28:31 -04:00
ggurdin
f6572d3127 on igc button long press, show user language dialog 2024-06-25 09:25:46 -04:00
ggurdin
9c93f1c0bc
Merge pull request #384 from pangeachat/fix-convo-partner-overflow
Fix conversation partner search list overflow
2024-06-24 16:20:12 -04:00
ggurdin
817f45709f uncommented debug statement in construct model 2024-06-24 16:16:24 -04:00
ggurdin
6a18967baf don't have unk langCode to analytics room, fallback to user's target language 2024-06-24 15:29:26 -04:00
Kelrap
64f5f47819 Shorten names in list, ellipses if too long 2024-06-24 15:12:01 -04:00
ggurdin
05a6957141 merge conflicts 2024-06-24 13:15:00 -04:00
ggurdin
3b91eea43d
Merge pull request #382 from pangeachat/update-min-ios
fix iOS version error after updating firebase packages
2024-06-24 12:55:04 -04:00
ggurdin
36ebf4bec8 fix iOS version error after updating firebase packages 2024-06-24 12:54:34 -04:00
ggurdin
b4f8bbe04d
Merge pull request #379 from pangeachat/renderbox-error
don't calculate page size if renderbox isn't yet laid out and don't s…
2024-06-24 12:02:24 -04:00
ggurdin
1d6db1aabf don't calculate page size if renderbox isn't yet laid out and don't show overlay if context is null 2024-06-24 11:49:22 -04:00
ggurdin
929843248c
Merge pull request #378 from pangeachat/prevent-analytics-reload
prevent auto-reload of analytics page when resizing screen, also reso…
2024-06-24 10:28:31 -04:00
ggurdin
8b5b9a96dc prevent auto-reload of analytics page when resizing screen, also resolved concurrent list modification error 2024-06-24 10:27:51 -04:00
William Jordan-Cooley
15f493709f client set up to recieve and display multiple choice questions with some display tweaks 2024-06-23 14:09:26 -04:00
William Jordan-Cooley
d6a56cbd43 successfully received/completed bot-generated practice activity 2024-06-22 13:26:12 -04:00
ggurdin
9385ce693a merge conflicts 2024-06-21 16:16:06 -04:00
ggurdin
27504ee6af
Merge pull request #370 from pangeachat/368-turn-bot-invite-ui-to-a-button
add discussion topic and keywords min max lines with max length
2024-06-21 16:06:36 -04:00
Wilson
44d4083eec
Merge branch 'main' into 368-turn-bot-invite-ui-to-a-button 2024-06-21 15:14:19 -04:00
WilsonLe
506a23368a reimplement invite bot ui from toggle to invite button with confirm dialog 2024-06-21 15:05:55 -04:00
ggurdin
a82cadcbcc
Merge pull request #373 from pangeachat/archive-subspaces-properly
Archive subspaces properly
2024-06-21 14:46:12 -04:00
ggurdin
5a163145c2
Merge branch 'main' into archive-subspaces-properly 2024-06-21 14:45:32 -04:00