Commit graph

1494 commits

Author SHA1 Message Date
ggurdin
6d3bb87bf6 fluffychat merge 2024-06-17 10:32:40 -04:00
ggurdin
cea14d388a fluffychat merge 2024-06-17 10:19:45 -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
ggurdin
95135273cd Merge branch 'main' into analytics-rooms-data 2024-06-14 12:18:25 -04:00
ggurdin
37f4bb053c If in IT mode, change 'write a message...' to it instructions 2024-06-14 10:18:03 -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
7163076390 Merge branch 'main' into analytics-rooms-data 2024-06-12 14:43:12 -04:00
ggurdin
7dc8ee238b
Merge pull request #314 from pangeachat/no-duplicate-selection
No duplicate selection
2024-06-10 16:52:24 -04:00
Kelrap
96da73c2e9 Edited displayname shows when return to settings 2024-06-10 15:46:13 -04:00
Kelrap
429d4a97ec Check for eventId match when selecting/deselecting 2024-06-10 13:24:58 -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
cee91bc276 merge conflict 2024-06-07 15:52:53 -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
Kelrap
bb01635c9f Fixed text selection, removed translationEnabled 2024-06-07 10:35:02 -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
Kelrap
7fd7ec2d7c Add capacity option when creating room 2024-06-05 13:34:12 -04:00
ggurdin
83b30dc084 add call to language detection after send without IGC 2024-06-05 10:51:26 -04:00
ggurdin
7807e618b4 enable my analytics button for users in rooms 2024-06-05 09:26:48 -04:00
ggurdin
bdeb3d3b8f merge main 2024-06-05 09:24:51 -04:00
Kelrap
ff198f64bc Check capacity when joining room 2024-06-04 16:43:59 -04:00
ggurdin
4efe1b474c merge conflicts 2024-06-04 16:16:56 -04:00
Kelrap
215686f4a4 Add capacity field, fix details page permissions 2024-06-04 14:59:17 -04:00
ggurdin
5bf5c904fa merged in main branch 2024-06-03 12:52:50 -04:00
ggurdin
7a43706b79
Merge pull request #242 from pangeachat/reorganize-extensions
Splits extensions into multiple smaller files
2024-06-03 12:31:27 -04:00
ggurdin
0f3e1d2cad merge conflicts 2024-06-03 12:31:06 -04:00
ggurdin
ef7cb67981
Merge branch 'main' into invite-bugs-fix 2024-06-03 12:04:26 -04:00
ggurdin
12e364a32d move student summary analytics events to analytics rooms 2024-06-03 11:47:33 -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
2db8c9397f Removed code that was messing with invites 2024-05-31 13:06:48 -04:00
Kelrap
9c0523d208 Invitation page returns to details 2024-05-30 14:41:47 -04:00