Commit graph

378 commits

Author SHA1 Message Date
ggurdin
f69ab79c9d made matrix profile save one json value instead of one value per field, added documentation to user controller and user model 2024-07-10 16:55:52 -04:00
ggurdin
9fa9078ea4 prevent adding a room to multiple spaces 2024-07-08 15:19:55 -04:00
William Jordan-Cooley
8ceb7851e5 refactoring of my analytics controller and related flows 2024-06-28 11:36:10 -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
9385ce693a merge conflicts 2024-06-21 16:16:06 -04:00
Kelrap
cbadc1999a Remove topic when selecting space 2024-06-21 09:26:41 -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
a2fb240c6e inital work to combine class and exchanges into generalized spaces 2024-06-19 12:18:18 -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
Kelrap
a2a31e526a Gray out buttons for spaces user isn't admin for 2024-06-17 12:25:05 -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
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
c9b6c52761 fluffychat merge 2024-06-17 09:22:04 -04:00
ggurdin
413d4adaec fluffychat merge 2024-06-17 09:05:27 -04:00
ggurdin
7b95e68a6e merge conflicts 2024-06-14 13:19:48 -04:00
ggurdin
95135273cd Merge branch 'main' into analytics-rooms-data 2024-06-14 12:18:25 -04:00
ggurdin
c96671b29b Don't show subspaces in top-level spaces lists 2024-06-14 09:32:47 -04:00
Kelrap
3f244f441f Show parents of spaces in Add to Space menu 2024-06-13 17:10:39 -04:00
ggurdin
a9105c0804 Merge branch 'main' into analytics-rooms-data 2024-06-13 16:37:22 -04:00
ggurdin
513226f2e4 merge conflicts 2024-06-13 16:35:39 -04:00
ggurdin
9b6466c09c Merge branch 'main' into analytics-rooms-data 2024-06-07 16:37:46 -04:00
ggurdin
363a91a193 allow leaving for all selected chats 2024-06-07 16:35:54 -04:00
ggurdin
c8aac0b450 merge conflict 2024-06-07 16:01:12 -04:00
ggurdin
20cdc3796a updates to how analytics events are processed, stored, and displayed. Added automatic updating of student analytics events. 2024-06-07 13:58:37 -04:00
ggurdin
199e71159d some small fix for archive/leave button PR 2024-06-06 16:37:14 -04:00
Kelrap
b889575d5f Merge branch 'archive-dif-from-leave' of https://github.com/pangeachat/client into archive-dif-from-leave 2024-06-06 15:50:30 -04:00
Kelrap
6b606ef2c7 Non=admins kicked when only admin leaves 2024-06-06 15:28:22 -04:00
ggurdin
877d3be965 merge conflicts 2024-06-06 13:28:24 -04:00
Kelrap
8cc377a3f4 Finish fixing capacity enforcement bugs 2024-06-06 11:58:11 -04:00
Kelrap
db61c1f1cf Fix some capacity enforcement bugs 2024-06-05 16:22:19 -04:00
ggurdin
7807e618b4 enable my analytics button for users in rooms 2024-06-05 09:26:48 -04:00
Kelrap
ff198f64bc Check capacity when joining room 2024-06-04 16:43:59 -04:00
Kelrap
2127277d81 Don't return to archived space view 2024-06-03 11:28:12 -04:00
Kelrap
5feaed1d42 Close chat selection menu asap 2024-05-31 14:17:45 -04:00
Kelrap
e4af2f764e Minor error/structure corrections 2024-05-30 13:53:18 -04:00
Kelrap
a2fde3d70c Consistently send double-check popup 2024-05-30 12:04:17 -04:00
Kelrap
b5a35ad723 Update archive implementation 2024-05-30 09:43:07 -04:00