ggurdin
|
9eb40e2b21
|
removed duplicate emoji picker widgets and fixed name of variable in chat controller to resolve late initialization error when sending an emoji reaction
|
2024-09-05 15:33:43 -04:00 |
|
ggurdin
|
23a8e1f7ea
|
removes testing print statements
|
2024-09-05 15:11:32 -04:00 |
|
ggurdin
|
8605202c63
|
added back 'remove from space' option in chat list item dropdown
|
2024-09-05 15:11:03 -04:00 |
|
ggurdin
|
af83ea1212
|
only go to space details on navigate to space if in column mode
|
2024-09-05 14:28:01 -04:00 |
|
ggurdin
|
6b730e6d94
|
revert change to iOS minimum deployment version, as sentry package requires a higher version
|
2024-09-05 14:27:37 -04:00 |
|
ggurdin
|
5461813352
|
when navigating to space, go to the space details page
|
2024-09-05 13:14:19 -04:00 |
|
ggurdin
|
4a252729ff
|
updated space view to auto-reload on space child update
|
2024-09-05 13:06:22 -04:00 |
|
ggurdin
|
9f9ea4786a
|
replaced app ID in build.gradle
|
2024-09-05 10:14:03 -04:00 |
|
ggurdin
|
85b501e180
|
re-enabled code related to recent updates to matrix SDK
|
2024-09-05 10:11:09 -04:00 |
|
ggurdin
|
c91391b274
|
fluffychat merge - resolve conflicts
|
2024-09-05 09:26:26 -04:00 |
|
ggurdin
|
c11c9cb28b
|
fluffychat merge - resolve conflicts
|
2024-09-05 09:19:46 -04:00 |
|
ggurdin
|
c58226807a
|
fluffychat merge - resolve conflicts
|
2024-09-05 09:13:08 -04:00 |
|
ggurdin
|
5e347144aa
|
fluffychat merge - resolve conflicts
|
2024-09-05 09:01:34 -04:00 |
|
ggurdin
|
035a708ee8
|
Merge commit '8418b66224a41cd3433a931467d899936c7956a9' into merge
|
2024-09-04 16:07:36 -04:00 |
|
ggurdin
|
d806d06c2d
|
fluffychat merge - resolve conflicts
|
2024-09-04 16:07:22 -04:00 |
|
ggurdin
|
eabd5b10ae
|
re-enable recording on web
|
2024-09-04 16:06:57 -04:00 |
|
ggurdin
|
5089446aee
|
Merge commit '7fa54b0a8f949b91f14cd7cb4c5c769e0e0463d8' into merge
|
2024-09-04 16:05:26 -04:00 |
|
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 |
|