Commit graph

11767 commits

Author SHA1 Message Date
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
e80e3ba1b8
Merge branch 'main' into learning-analytics-summary 2024-09-04 10:31:41 -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
2e597a55a2
merge main into learning analytics and resolve conflicts 2024-09-04 09:48:33 -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
krille-chan
d70d8803c2
build: Build linux with Flutter 3.24.1 2024-09-01 09:16:37 +02:00
Krille-chan
f9e143fd91
Merge pull request #1306 from weblate/weblate-fluffychat-translations
Translations update from Hosted Weblate
2024-08-31 15:02:25 +02:00
Krille-chan
6bdeba7cd7
Merge pull request #1269 from selfisekai/flutter-3.24
chore: upgrade flutter to 3.24
2024-08-31 15:02:09 +02:00
krille-chan
3e06537d1b
chore: Follow up vm service 2024-08-31 15:01:57 +02:00
krille-chan
bff1f8c696
build: follow up vm service 2024-08-31 15:01:09 +02:00
krille-chan
ca33a2dbda
build: Prepare flutter 3.24 2024-08-31 15:00:33 +02:00
Krille-chan
11d548bed3
Merge pull request #1298 from krille-chan/krille/fix-build-linux-flutter-3-24-1
build: Fix build linux after flutter 3.24.1 and add handy_window
2024-08-31 14:29:31 +02:00
krille-chan
3ce4df8425
build: Fix build linux after flutter 3.24.1 and add handy_window 2024-08-31 14:18:34 +02:00
Ihor Hordiichuk
14a8e1a09c
Translated using Weblate (Ukrainian)
Currently translated at 100.0% (663 of 663 strings)

Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/uk/
2024-08-31 05:09:24 +02:00
josé m
bbecaf4016
Translated using Weblate (Galician)
Currently translated at 100.0% (663 of 663 strings)

Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/gl/
2024-08-31 05:09:23 +02:00
ggurdin
57b1ef04ef
Merge branch 'main' into learning-analytics-summary 2024-08-30 14:41:00 -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
14ba8bf47b
merge main into analytics branch 2024-08-30 10:28:56 -04:00