Commit graph

1554 commits

Author SHA1 Message Date
Kelrap
59e521b69e Hide some Chat permission options 2024-06-26 12:27:45 -04:00
ggurdin
c304da4a65 Merge branch 'main' into practice 2024-06-25 15:46:36 -04:00
ggurdin
710a85f309
Merge branch 'main' into unenable-my-analytics 2024-06-25 15:21:06 -04:00
Kelrap
2cee0d374f Remove chat sorting edits 2024-06-25 14:51:47 -04:00
Kelrap
d959fdcc7b Checks if visible rooms for my analytics 2024-06-25 14:24:13 -04:00
ggurdin
401d8522f8 only show practice activity button if showMessageButtons is enabled 2024-06-25 12:53:54 -04:00
William Jordan-Cooley
54dfd9dd22 merged in main 2024-06-25 11:16:01 -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
05a6957141 merge conflicts 2024-06-24 13:15:00 -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
9385ce693a merge conflicts 2024-06-21 16:16:06 -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
cbadc1999a Remove topic when selecting space 2024-06-21 09:26:41 -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
19b7b70684 Show students class permissions 2024-06-20 12:18:41 -04:00
ggurdin
bbf2536669 Merge branch 'new-merge' into combine-into-spaces 2024-06-20 10:14:53 -04:00
ggurdin
11575b1a9a some updates to add to space toggles 2024-06-19 16:03:20 -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
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
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
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
ggurdin
fe54a71d33 small fixes for UI issues 2024-06-17 12:42:48 -04:00
Kelrap
a2a31e526a Gray out buttons for spaces user isn't admin for 2024-06-17 12:25:05 -04:00
ggurdin
abfde8b150 fluffychat merge 2024-06-17 11:20:34 -04:00
ggurdin
5a1a00426d fluffychat merge 2024-06-17 11:08:02 -04:00
ggurdin
3288fd6f2d fluffychat merge 2024-06-17 10:57:57 -04:00
ggurdin
5db8527ba5 fluffychat merge 2024-06-17 10:54:26 -04:00
ggurdin
6d3bb87bf6 fluffychat merge 2024-06-17 10:32:40 -04:00
ggurdin
cea14d388a fluffychat merge 2024-06-17 10:19:45 -04:00
Kelrap
aa5d09407e Make sure user has permission to add space child 2024-06-17 10:16:43 -04:00
Kelrap
4a0ee3665f Can't add subclass as parent space 2024-06-17 10:02:41 -04:00
ggurdin
ce3a88e7a7 fluffychat merge 2024-06-17 09:58:21 -04:00
ggurdin
540567bfe7 fluffychat merge 2024-06-17 09:40:07 -04:00
ggurdin
d701390c26 fluffychat merge 2024-06-17 09:25:18 -04:00
ggurdin
c9b6c52761 fluffychat merge 2024-06-17 09:22:04 -04:00
ggurdin
dd0250e52a fluffychat merge 2024-06-17 09:07:52 -04:00
ggurdin
413d4adaec fluffychat merge 2024-06-17 09:05:27 -04:00
ggurdin
d7307af58b fluffychat merge 2024-06-14 16:15:45 -04:00
ggurdin
0cb6fe6daf fluffychat merge 2024-06-14 16:12:51 -04:00
ggurdin
42bf07f477 fluffychat merge 2024-06-14 15:48:25 -04:00
ggurdin
7b95e68a6e merge conflicts 2024-06-14 13:19:48 -04:00