Commit graph

3923 commits

Author SHA1 Message Date
ggurdin
9385ce693a merge conflicts 2024-06-21 16:16:06 -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
5a163145c2
Merge branch 'main' into archive-subspaces-properly 2024-06-21 14:45:32 -04:00
ggurdin
e5ac6516da show the user the click instruction card when they first see a message 2024-06-21 14:37:39 -04:00
Kelrap
2ed11d6d74 Doesn't treat subspaces like subchats 2024-06-21 14:14:17 -04:00
ggurdin
f3502aa3e6
Merge branch 'main' into age-page-readable 2024-06-21 13:48:04 -04:00
ggurdin
852eff0f47
Merge branch 'main' into choreo-notes 2024-06-21 13:34:32 -04:00
WilsonLe
0ae37cba93 add discussion topic and keywords min max lines with max length 2024-06-21 12:27:34 -04:00
Kelrap
3ffdd6f264 Use more readable text and selection color 2024-06-21 11:49:35 -04:00
Kelrap
651b7514ed Fix list concurrently edited error 2024-06-21 09:35:30 -04:00
Kelrap
cbadc1999a Remove topic when selecting space 2024-06-21 09:26:41 -04:00
Kelrap
f1281d744f Fixed subscription card overflow 2024-06-20 17:06:26 -04:00
ggurdin
a3763f0306 merge conflicts, also translate to l2 in message translation card if original sent lang code is null 2024-06-20 14:53:04 -04:00
Kelrap
3b7fdf8207 Let new spaces have permissions edited 2024-06-20 13:49:53 -04:00
ggurdin
fcca323b69 Updated how analytics are saved to work better with the switch over to using user’s language settings instead of class-level language settings 2024-06-20 13:15:32 -04:00
Kelrap
19b7b70684 Show students class permissions 2024-06-20 12:18:41 -04:00
ggurdin
0830c093b3 Merge branch 'new-merge' into combine-into-spaces 2024-06-20 11:18:37 -04:00
ggurdin
dcb2490ec5 oops, don't show igc button is auto-igc is enabled 2024-06-20 11:18:08 -04:00
Kelrap
d3d2fab377 Merge branch 'new-merge' of https://github.com/pangeachat/client into new-merge 2024-06-20 10:58:51 -04:00
Kelrap
dd4ba75fbf Fix room unlocking bug 2024-06-20 10:58:35 -04:00
ggurdin
59a88d4d76 Merge branch 'new-merge' into combine-into-spaces 2024-06-20 10:54:18 -04:00
ggurdin
731d7919e5 don't show igc button if all language tools are disabled or if the user is unsubscribed 2024-06-20 10:53:08 -04:00
ggurdin
c1a06b8e3d updated addMissingRoomRules function for combined spaces 2024-06-20 10:41:52 -04:00
ggurdin
bbf2536669 Merge branch 'new-merge' into combine-into-spaces 2024-06-20 10:14:53 -04:00
ggurdin
879f8fc1c8 merge main 2024-06-20 10:14:25 -04:00
ggurdin
652eb77dd5 include all choice list info in span caching, and moved span caching to a seperate file 2024-06-20 10:05:49 -04:00
Kelrap
f4bbac63e0 Updates changed country in learning settings 2024-06-19 16:33:15 -04:00
ggurdin
11575b1a9a some updates to add to space toggles 2024-06-19 16:03:20 -04:00
Kelrap
0da687a3f3 Make capacity button action null for students 2024-06-19 15:52:20 -04:00
William Jordan-Cooley
631d751887 documentation in choreo record 2024-06-19 15:33:52 -04:00
Kelrap
1f73058fb4 Merge branch 'new-merge' of https://github.com/pangeachat/client into new-merge 2024-06-19 15:28:14 -04:00
Kelrap
9a2bf1edf1 Remove 'm.call.invite' from chat permission list 2024-06-19 15:26:42 -04:00
ggurdin
9c21ac3f8f Merge branch 'new-merge' into combine-into-spaces 2024-06-19 15:26:15 -04:00
ggurdin
2c82dfc7d7 added completer to updateAnalytics function to prevent it running many times in a row, also save empty analytics data once to indicate that chats have been checked and none was found 2024-06-19 15:12:08 -04:00
ggurdin
6b17343cca oops, only set activeSpaceId to null 2024-06-19 14:38:53 -04:00
ggurdin
c16533ecff set activeSpaceId to null after navigating to all chats 2024-06-19 13:21:29 -04:00
ggurdin
eedb050ce1 merge main 2024-06-19 12:34:08 -04:00
ggurdin
e7f1dcf6a3 merge main 2024-06-19 12:28:14 -04:00
ggurdin
4a11fc0272
Merge branch 'main' into web-recording 2024-06-19 12:19:10 -04:00
ggurdin
a2fb240c6e inital work to combine class and exchanges into generalized spaces 2024-06-19 12:18:18 -04:00
Kelrap
ebf6c88932 Fix edited messages not showing 2024-06-19 11:16:57 -04:00
Kelrap
718a998576 Fix room locking bugs 2024-06-18 15:57:06 -04:00
Kelrap
1cf0caf48d Fix archiving bugs 2024-06-18 15:15:30 -04:00
Kelrap
59ab741168 Added explanatory comments 2024-06-18 14:10:18 -04:00
ggurdin
75f64e57d0 don't show child and parent events in chat list subtitles 2024-06-18 12:14:00 -04:00
ggurdin
1faf151001 after joining a space, open space details 2024-06-18 12:07:25 -04:00
ggurdin
c2245f045f enables recording on web 2024-06-18 10:16:17 -04:00
Kelrap
990980155e Fix caching issues 2024-06-17 15:51:44 -04:00
ggurdin
fe54a71d33 small fixes for UI issues 2024-06-17 12:42:48 -04:00