Commit graph

3886 commits

Author SHA1 Message Date
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
Kelrap
a2a31e526a Gray out buttons for spaces user isn't admin for 2024-06-17 12:25:05 -04:00
ggurdin
d9e225b385 Merge commit '79ecfd96fafbe43aded159f11552df44d97492bd' into new-merge 2024-06-17 11:22:38 -04:00
ggurdin
abfde8b150 fluffychat merge 2024-06-17 11:20:34 -04:00
ggurdin
81b4159fe7 Merge commit '70ee24fa59ad6af41c151bdb6676d88e6b60ab33' into new-merge 2024-06-17 11:11:01 -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
971c74f6a6 fluffychat merge 2024-06-17 09:17:05 -04:00
ggurdin
923e2cc8f2 fluffychat merge 2024-06-17 09:11:34 -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
Krille
5998c9e29e
fix: Add missing unlock button to lockscreen textfield 2024-06-17 08:07:34 +02: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
c13afdea3a fluffychat merge 2024-06-14 15:51:12 -04:00
ggurdin
42bf07f477 fluffychat merge 2024-06-14 15:48:25 -04:00
ggurdin
5a2c5155c5 fluffychat commits 2024-06-14 15:39:27 -04:00
ggurdin
cec3d7f710
Merge branch 'main' into only-replace-correct 2024-06-14 13:32:13 -04:00
ggurdin
9153623a93 change deprecated class 2024-06-14 13:29:41 -04:00
Kelrap
671d27cd23 Un-unenables replace button on incorrect select 2024-06-14 13:24:52 -04:00
ggurdin
4dd2ef1f90
Merge branch 'main' into handles-stand-out 2024-06-14 13:20:42 -04:00
ggurdin
3925a700d9
Merge branch 'main' into show-subspace-parents 2024-06-14 13:20:12 -04:00
ggurdin
7b95e68a6e merge conflicts 2024-06-14 13:19:48 -04:00
ggurdin
e1f258075a
Merge branch 'main' into handles-stand-out 2024-06-14 13:13:48 -04:00
ggurdin
64e35d746a
Merge branch 'main' into fix-toolbar-text-color 2024-06-14 13:09:52 -04:00
ggurdin
cce5b483e1 Merge branch 'main' into fix-span-cache 2024-06-14 13:08:09 -04:00
ggurdin
01dc89f199 clear cache on send and before getting language help, update span data hashcode 2024-06-14 13:07:26 -04:00
Kelrap
1e0a5e71fd Shorten parent names 2024-06-14 13:00:21 -04:00
Kelrap
0983b11857 Bot_style uses theme color for text 2024-06-14 12:39:32 -04:00