Commit Graph

8523 Commits (5e347144aa650c41be4c36d22b23b99582ef6d72)
 

Author SHA1 Message Date
ggurdin 5e347144aa
fluffychat merge - resolve conflicts 1 year ago
ggurdin 035a708ee8
Merge commit '8418b66224a41cd3433a931467d899936c7956a9' into merge 1 year ago
ggurdin d806d06c2d
fluffychat merge - resolve conflicts 1 year ago
ggurdin eabd5b10ae
re-enable recording on web 1 year ago
ggurdin 5089446aee
Merge commit '7fa54b0a8f949b91f14cd7cb4c5c769e0e0463d8' into merge 1 year ago
ggurdin 03da94ff41
fluffychat merge - resolve conflicts 1 year ago
ggurdin 1b03644380
fluffychat merge - resolve conflicts 1 year ago
ggurdin 8b20cce186
Merge commit 'd0e1e0229c2d6b8c00e3278d71651003614e38d2' into merge 1 year ago
ggurdin 468f906de6
fluffychat merge - resolve conflicts 1 year ago
ggurdin 6a83249236
fluffychat merge - resolve conflicts 1 year ago
ggurdin 346cd1ab5f
fluffychat merge - resolve conflicts 1 year ago
ggurdin 31412c2a13
fluffychat merge - resolve conflicts 1 year ago
ggurdin 7bf3a9ab94
fluffychat merge - resolve conflicts 1 year ago
ggurdin 1903d2fefc
fluffychat merge - resolve conflicts 1 year ago
ggurdin 4fccd5fed0
fluffychat merge - resolve conflicts 1 year ago
ggurdin 9efe214b6d
Merge commit '83490de6fd967ba8545d5960c0a6cebd410e0580' into merge 1 year ago
ggurdin c60c68f24e
Merge commit '8dd43d8a7fb6d69abd5bdb454476dfc2ab0bb79c' into merge 1 year ago
ggurdin cca5bb382f
fluffychat merge - resolve conflicts 1 year ago
ggurdin 3e09a2fe7d
fluffychat merge - resolve conflicts 1 year ago
ggurdin 2a710841a6
fluffychat merge - resolve conflicts 1 year ago
ggurdin 82fa80160f
fluffychat merge - resolve conflicts 1 year ago
ggurdin 4b15b8fab4
fluffychat merge - resolve conflicts 1 year ago
ggurdin 8de69e4c03
Merge commit '3e0d103594899f14678a65e4cdf304d85bb68469' into merge 1 year ago
ggurdin 492a3d5095
Merge commit '0bf387da14c562eae21b36897a53a300ea5b6717' into merge 1 year ago
ggurdin 5ea202062c
fluffychat merge - resolve conflicts 1 year ago
ggurdin 40768f9859
fluffychat merge - resolve conflicts 1 year ago
ggurdin 5e59a3168a
fluffychat merge - resolve conflicts 1 year ago
ggurdin 9d5cc4fef1
Merge commit 'fbf2a069ed323a59e15018b1c10b63f07abe7bf9' into merge 1 year ago
ggurdin 0a9f7470a2
fluffychat merge - resolve conflicts 1 year ago
ggurdin ebc4a88d4e
fluffychat merge - resolve conflicts 1 year ago
ggurdin 816fe43d3e
fluffychat merge - resolve conflicts 1 year ago
ggurdin e393f80dc1
Merge commit 'd74a3e28f697a0e2130498d63a69adf88a06456b' into merge 1 year ago
ggurdin deb2e655d6
fluffychat merge - resolve conflicts 1 year ago
ggurdin 12a849e222
Merge commit 'b847dcf6fe41bda7b0785233ffed7da9e45bd60b' into merge 1 year ago
ggurdin 2a83d3099f
Merge pull request #654 from pangeachat/html-message-toolbar
enable toolbar on click for html messages
1 year ago
ggurdin 03e04ee752
improved text selection handling, added text selection handling for HTML messages, clear selection on close overlay 1 year ago
ggurdin bb0a499654
Merge branch 'main' into html-message-toolbar 1 year ago
ggurdin 0661930c57
Merge pull request #655 from pangeachat/upgrade-matrix-sdk
upgrade to the most recent version of our fork of the matrix sdk
1 year ago
ggurdin 4fe9b05c89
upgrade to the most recent version of our fork of the matrix sdk 1 year ago
ggurdin 11627c2bfb
enable toolbar on click for html messages 1 year ago
ggurdin b75abc1c63
Merge pull request #651 from pangeachat/account-for-sidebar
Account for sidebar
1 year ago
ggurdin 660c49873b
removed expanded widget wrapping overlay stack that caused crash in release mode 1 year ago
ggurdin 5e145837d2
add padding to reaction picker 1 year ago
ggurdin 269ae5b2eb
Merge pull request #648 from pangeachat/account-for-sidebar
account for chat details column showing in message overlay
1 year ago
ggurdin a1ee965b9e
account for chat details column showing in message overlay 1 year ago
ggurdin 8ae98a84b6
Merge pull request #548 from pangeachat/toolbar-selection
Combines toolbar with selection view
1 year ago
ggurdin 9f641633e4
merge main branch into combined selection view branch 1 year ago
ggurdin 5dbf127a30
Merge pull request #644 from pangeachat/merge-in-dev-changes
Merge in dev changes
1 year ago
William Jordan-Cooley 381769a6e4
adding user id to igc request 1 year ago
ggurdin cace965456
wrap chat input row in stateful widget and rebuild on choreo update to keep hint text and send button up-to-date 1 year ago