Commit Graph

3345 Commits

Author SHA1 Message Date
Christian Pauly
a56a455e6b Merge branch 'soru/better-key-sharing' into 'master'
Ignore key sharing requests by others than us

See merge request ChristianPauly/fluffychat-flutter!83
2020-06-24 19:23:13 +00:00
Sorunome
d2ed760ce7
Ignore key sharing requests by others than us 2020-06-24 21:10:54 +02:00
Christian Pauly
dfc3521d36 Merge branch 'krille/fix-app-bar' into 'master'
Fix app bar

See merge request ChristianPauly/fluffychat-flutter!82
2020-06-24 13:15:36 +00:00
Christian Pauly
4b5746d6f5 Fix app bar 2020-06-24 15:04:58 +02:00
Christian Pauly
e2ec3ff15f Merge branch 'krille/design-improvements' into 'master'
Krille/design improvements

See merge request ChristianPauly/fluffychat-flutter!81
2020-06-24 07:42:28 +00:00
Christian Pauly
a263da8bf8 Krille/design improvements 2020-06-24 07:42:28 +00:00
Christian Pauly
cc95f119b3 Merge branch 'ChristianPauly-master-patch-44815' into 'master'
Fix sort order

See merge request ChristianPauly/fluffychat-flutter!80
2020-06-20 11:29:12 +00:00
Christian Pauly
49040f2b97 Fix sort order 2020-06-20 11:19:10 +00:00
Christian Pauly
68425e05d6 Merge branch 'ChristianPauly-master-patch-57217' into 'master'
Update README.md

See merge request ChristianPauly/fluffychat-flutter!79
2020-06-20 10:20:17 +00:00
Christian Pauly
b0dd550772 Merge branch 'krille/update-french-translation' into 'master'
Update french translation for testing

See merge request ChristianPauly/fluffychat-flutter!78
2020-06-20 10:17:51 +00:00
Christian Pauly
118dcf0eff Update README.md 2020-06-20 10:09:19 +00:00
Christian Pauly
7a47adb290 Update french translation for testing 2020-06-20 12:06:55 +02:00
Christian
ef9a402ec2
Translated using Weblate (French)
Currently translated at 100.0% (248 of 248 strings)

Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/fr/
2020-06-20 12:03:33 +02:00
Christian Pauly
6fc5fc54dd Minor design and UX improvements 2020-06-20 11:46:12 +02:00
Christian Pauly
90e92e7982 Clean up design 2020-06-20 11:35:54 +02:00
Christian Pauly
c0429c1e93 Merge branch 'krille/implement-file-picker-web' into 'master'
Implement file picker web

See merge request ChristianPauly/fluffychat-flutter!77
2020-06-20 09:32:49 +00:00
Christian Pauly
2d83df34c0 Implement file picker web 2020-06-20 09:32:49 +00:00
Christian Pauly
bcda0bbd5f Fix top list 2020-06-19 15:10:26 +02:00
Christian Pauly
0b22e9ea82 Merge branch 'soru/text-capitalize' into 'master'
proper capitalize main input field

Closes #70 and #92

See merge request ChristianPauly/fluffychat-flutter!74
2020-06-18 18:32:12 +00:00
Christian Pauly
7df97ff914 Merge branch 'soru/fix-typo' into 'master'
Currenlty active --> Currently active

Closes #88

See merge request ChristianPauly/fluffychat-flutter!75
2020-06-18 18:31:58 +00:00
Sorunome
6244f36fbb Currenlty active --> Currently active 2020-06-18 18:31:58 +00:00
Christian Pauly
26329f89b0 Merge branch 'soru/update-html-parser' into 'master'
Update flutter_matrix_html

See merge request ChristianPauly/fluffychat-flutter!76
2020-06-18 18:31:44 +00:00
Christian Pauly
1bd36023e7 Big refactoring 2020-06-18 13:39:24 +02:00
Sorunome
45bbe21009
Update flutter_matrix_html 2020-06-15 21:00:09 +02:00
Sorunome
f86ca81333
proper capitalize main input field 2020-06-14 17:12:27 +02:00
Christian Pauly
35beaa4492 Merge branch 'soru/update-sdk' into 'master'
move to new sdk

See merge request ChristianPauly/fluffychat-flutter!71
2020-06-10 08:07:02 +00:00
Sorunome
abb728295c move to new sdk 2020-06-10 08:07:01 +00:00
Christian Pauly
b66c2e0e81 Update .gitlab-ci.yml 2020-05-23 09:05:05 +00:00
Christian Pauly
1da152e308 Merge branch 'ChristianPauly-master-patch-00672' into 'master'
Update CI for branches

See merge request ChristianPauly/fluffychat-flutter!70
2020-05-23 09:02:41 +00:00
Christian Pauly
7730c7c005 Update CI for branches 2020-05-23 08:52:11 +00:00
Christian Pauly
150fe64352 Merge branch 'soru/unsupported-room-version' into 'master'
handle if lastEvent is null

Closes #66

See merge request ChristianPauly/fluffychat-flutter!69
2020-05-23 08:36:53 +00:00
Sorunome
21a2ec5b2f handle if lastEvent is null 2020-05-23 08:36:53 +00:00
Christian Pauly
cdcd462ea5 Hide unknown event types 2020-05-22 12:54:29 +02:00
Christian Pauly
7ffb875d67 Add code formatting 2020-05-22 12:21:16 +02:00
Christian Pauly
95b1e9566b Merge branch 'MTRNord/upload-to-fdroid-repo' into 'master'
Add upload to fdroid repo CI task

See merge request ChristianPauly/fluffychat-flutter!62
2020-05-20 19:33:36 +00:00
Marcel
d60b4b2d74 Add upload to fdroid repo CI task 2020-05-20 19:33:36 +00:00
Christian Pauly
ea724b485d Update lib/views/chat.dart 2020-05-20 19:23:55 +00:00
Christian Pauly
28abc02da5 Update pubspec.yaml 2020-05-20 17:31:37 +00:00
Christian Pauly
b6fcc32041 Merge branch 'krille/fix-image-viewer' into 'master'
Fix imageviewer

See merge request ChristianPauly/fluffychat-flutter!67
2020-05-20 17:29:26 +00:00
Christian Pauly
c409345f22 Fix imageviewer 2020-05-20 17:29:26 +00:00
Christian Pauly
c10f462661 Merge branch 'krille/add-pwa-support' into 'master'
Add pwa support

See merge request ChristianPauly/fluffychat-flutter!65
2020-05-20 15:58:49 +00:00
Christian Pauly
b786e2878f Add pwa support 2020-05-20 17:48:16 +02:00
Christian Pauly
ad1fb98d59 Merge branch 'ChristianPauly-master-patch-82433' into 'master'
Update SDK

See merge request ChristianPauly/fluffychat-flutter!64
2020-05-20 07:10:13 +00:00
Christian Pauly
c5412d0c10 Update .gitlab-ci.yml
Deleted assets/js/package/olm.js
2020-05-20 07:10:13 +00:00
Christian Pauly
334bb9c664 Fix missing message 2020-05-17 10:29:03 +02:00
Christian Pauly
e5f8d1c0eb Merge branch 'babolivier/fr_translation' into 'master'
Add French translations

See merge request ChristianPauly/fluffychat-flutter!59
2020-05-17 08:18:31 +00:00
Brendan Abolivier
44a05b7d5b Add French translations 2020-05-17 08:18:31 +00:00
Christian Pauly
fac0f23fee Update pubspec.yaml 2020-05-17 08:17:43 +00:00
Christian Pauly
e37a79a65e Merge branch 'MTRNord/new-fdroid-repo-link' into 'master'
Update F-Droid Link

See merge request ChristianPauly/fluffychat-flutter!61
2020-05-16 19:09:11 +00:00
Marcel
a7270c08c3 Update F-Droid Link 2020-05-16 18:29:47 +00:00