ggurdin
|
03da94ff41
|
fluffychat merge - resolve conflicts
|
2024-09-04 16:05:22 -04:00 |
|
ggurdin
|
1b03644380
|
fluffychat merge - resolve conflicts
|
2024-09-04 16:02:00 -04:00 |
|
ggurdin
|
8b20cce186
|
Merge commit 'd0e1e0229c2d6b8c00e3278d71651003614e38d2' into merge
|
2024-09-04 15:56:18 -04:00 |
|
ggurdin
|
468f906de6
|
fluffychat merge - resolve conflicts
|
2024-09-04 15:56:11 -04:00 |
|
ggurdin
|
6a83249236
|
fluffychat merge - resolve conflicts
|
2024-09-04 15:53:37 -04:00 |
|
ggurdin
|
346cd1ab5f
|
fluffychat merge - resolve conflicts
|
2024-09-04 15:48:51 -04:00 |
|
ggurdin
|
31412c2a13
|
fluffychat merge - resolve conflicts
|
2024-09-04 15:01:13 -04:00 |
|
ggurdin
|
7bf3a9ab94
|
fluffychat merge - resolve conflicts
|
2024-09-04 14:43:45 -04:00 |
|
ggurdin
|
1903d2fefc
|
fluffychat merge - resolve conflicts
|
2024-09-04 14:28:32 -04:00 |
|
ggurdin
|
4fccd5fed0
|
fluffychat merge - resolve conflicts
|
2024-09-04 14:18:10 -04:00 |
|
ggurdin
|
9efe214b6d
|
Merge commit '83490de6fd967ba8545d5960c0a6cebd410e0580' into merge
|
2024-09-04 14:01:56 -04:00 |
|
ggurdin
|
c60c68f24e
|
Merge commit '8dd43d8a7fb6d69abd5bdb454476dfc2ab0bb79c' into merge
|
2024-09-04 14:01:29 -04:00 |
|
ggurdin
|
cca5bb382f
|
fluffychat merge - resolve conflicts
|
2024-09-04 14:01:03 -04:00 |
|
ggurdin
|
3e09a2fe7d
|
fluffychat merge - resolve conflicts
|
2024-09-04 13:10:09 -04:00 |
|
ggurdin
|
2a710841a6
|
fluffychat merge - resolve conflicts
|
2024-09-04 12:53:01 -04:00 |
|
ggurdin
|
82fa80160f
|
fluffychat merge - resolve conflicts
|
2024-09-04 12:47:17 -04:00 |
|
ggurdin
|
4b15b8fab4
|
fluffychat merge - resolve conflicts
|
2024-09-04 12:21:29 -04:00 |
|
ggurdin
|
8de69e4c03
|
Merge commit '3e0d103594899f14678a65e4cdf304d85bb68469' into merge
|
2024-09-04 12:12:53 -04:00 |
|
ggurdin
|
492a3d5095
|
Merge commit '0bf387da14c562eae21b36897a53a300ea5b6717' into merge
|
2024-09-04 12:12:37 -04:00 |
|
ggurdin
|
5ea202062c
|
fluffychat merge - resolve conflicts
|
2024-09-04 12:12:32 -04:00 |
|
ggurdin
|
40768f9859
|
fluffychat merge - resolve conflicts
|
2024-09-04 12:00:32 -04:00 |
|
ggurdin
|
5e59a3168a
|
fluffychat merge - resolve conflicts
|
2024-09-04 11:14:42 -04:00 |
|
ggurdin
|
9d5cc4fef1
|
Merge commit 'fbf2a069ed323a59e15018b1c10b63f07abe7bf9' into merge
|
2024-09-04 11:07:24 -04:00 |
|
ggurdin
|
0a9f7470a2
|
fluffychat merge - resolve conflicts
|
2024-09-04 11:07:08 -04:00 |
|
ggurdin
|
ebc4a88d4e
|
fluffychat merge - resolve conflicts
|
2024-09-04 11:06:10 -04:00 |
|
ggurdin
|
816fe43d3e
|
fluffychat merge - resolve conflicts
|
2024-09-04 10:55:50 -04:00 |
|
ggurdin
|
e393f80dc1
|
Merge commit 'd74a3e28f697a0e2130498d63a69adf88a06456b' into merge
|
2024-09-04 10:52:59 -04:00 |
|
ggurdin
|
deb2e655d6
|
fluffychat merge - resolve conflicts
|
2024-09-04 10:52:47 -04:00 |
|
ggurdin
|
12a849e222
|
Merge commit 'b847dcf6fe41bda7b0785233ffed7da9e45bd60b' into merge
|
2024-09-04 10:43:04 -04:00 |
|
ggurdin
|
2a83d3099f
|
Merge pull request #654 from pangeachat/html-message-toolbar
enable toolbar on click for html messages
|
2024-09-04 10:31:02 -04:00 |
|
ggurdin
|
03e04ee752
|
improved text selection handling, added text selection handling for HTML messages, clear selection on close overlay
|
2024-09-04 10:20:22 -04:00 |
|
ggurdin
|
bb0a499654
|
Merge branch 'main' into html-message-toolbar
|
2024-09-04 09:56:08 -04:00 |
|
ggurdin
|
0661930c57
|
Merge pull request #655 from pangeachat/upgrade-matrix-sdk
upgrade to the most recent version of our fork of the matrix sdk
|
2024-09-04 09:43:39 -04:00 |
|
ggurdin
|
4fe9b05c89
|
upgrade to the most recent version of our fork of the matrix sdk
|
2024-09-04 09:43:12 -04:00 |
|
ggurdin
|
11627c2bfb
|
enable toolbar on click for html messages
|
2024-09-03 16:15:18 -04:00 |
|
ggurdin
|
b75abc1c63
|
Merge pull request #651 from pangeachat/account-for-sidebar
Account for sidebar
|
2024-09-03 11:22:58 -04:00 |
|
ggurdin
|
660c49873b
|
removed expanded widget wrapping overlay stack that caused crash in release mode
|
2024-09-03 11:22:17 -04:00 |
|
ggurdin
|
5e145837d2
|
add padding to reaction picker
|
2024-09-03 10:43:26 -04:00 |
|
ggurdin
|
269ae5b2eb
|
Merge pull request #648 from pangeachat/account-for-sidebar
account for chat details column showing in message overlay
|
2024-09-03 10:26:27 -04:00 |
|
ggurdin
|
a1ee965b9e
|
account for chat details column showing in message overlay
|
2024-09-03 10:25:55 -04:00 |
|
ggurdin
|
8ae98a84b6
|
Merge pull request #548 from pangeachat/toolbar-selection
Combines toolbar with selection view
|
2024-08-30 14:40:05 -04:00 |
|
ggurdin
|
9f641633e4
|
merge main branch into combined selection view branch
|
2024-08-30 10:49:43 -04:00 |
|
ggurdin
|
5dbf127a30
|
Merge pull request #644 from pangeachat/merge-in-dev-changes
Merge in dev changes
|
2024-08-30 10:16:26 -04:00 |
|
William Jordan-Cooley
|
381769a6e4
|
adding user id to igc request
|
2024-08-30 10:14:10 -04:00 |
|
ggurdin
|
cace965456
|
wrap chat input row in stateful widget and rebuild on choreo update to keep hint text and send button up-to-date
|
2024-08-30 10:11:43 -04:00 |
|
ggurdin
|
5c7a1f554b
|
added tooltip toggle status to matrix profile to prevent showing again after it's been dismissed
|
2024-08-30 10:11:32 -04:00 |
|
ggurdin
|
104750732b
|
made inline tooltip take up only one line, sped up animation when closing inline tooltip
|
2024-08-30 10:11:24 -04:00 |
|
Kelrap
|
8a947e83d9
|
Adds inline tooltip to IT bar
|
2024-08-30 10:11:15 -04:00 |
|
William Jordan-Cooley
|
41ce213553
|
show feedback in user l1
|
2024-08-30 10:11:00 -04:00 |
|
ggurdin
|
ccae4c8704
|
Merge pull request #643 from pangeachat/merge-in-dev-changes
Merge in dev changes
|
2024-08-30 10:05:48 -04:00 |
|