Commit Graph

776 Commits

Author SHA1 Message Date
Christian Pauly 729f1f3b78 Merge branch 'ChristianPauly-master-patch-10044' into 'master'
Update lib/src/room.dart

See merge request famedly/famedlysdk!288
2020-05-14 07:26:48 +00:00
Christian Pauly 7485637340 Update lib/src/room.dart 2020-05-14 07:21:52 +00:00
Christian Pauly aa8cdb10b0 Merge branch 'ChristianPauly-master-patch-71946' into 'master'
Update lib/src/room.dart

See merge request famedly/famedlysdk!287
2020-05-14 07:11:13 +00:00
Christian Pauly eada53b15f Update lib/src/room.dart 2020-05-14 07:06:18 +00:00
Christian Pauly 2525b3d9f1 Merge branch 'ChristianPauly-master-patch-59640' into 'master'
Update lib/src/utils/pusher.dart

See merge request famedly/famedlysdk!286
2020-05-12 11:24:32 +00:00
Christian Pauly 7d0c45e3ae Update lib/src/utils/pusher.dart 2020-05-12 11:19:26 +00:00
Christian Pauly fe1bd350ec Merge branch 'krille/add-get-pushers' into 'master'
Implement getPushers

See merge request famedly/famedlysdk!285
2020-05-12 11:08:04 +00:00
Christian Pauly 4253f0ce9a Implement getPushers 2020-05-12 13:03:02 +02:00
Christian Pauly 4b2d4913b3 Merge branch 'soru/markdown' into 'master'
add markdown parsing

See merge request famedly/famedlysdk!282
2020-05-09 14:00:46 +00:00
Sorunome 2352eb406a add markdown parsing 2020-05-09 14:00:46 +00:00
Christian Pauly 05c99d2b04 Merge branch 'ChristianPauly-master-patch-03593' into 'master'
Fix CI

See merge request famedly/famedlysdk!283
2020-05-09 13:24:14 +00:00
Christian Pauly 10ccbf915f Fix CI 2020-05-09 13:24:14 +00:00
Christian Pauly 73ed5ed093 Merge branch 'ChristianPauly-master-patch-01115' into 'master'
Update pubspec.yaml

See merge request famedly/famedlysdk!279
2020-05-06 10:21:18 +00:00
Christian Pauly 915cb1c32c Update pubspec.yaml 2020-05-06 10:16:42 +00:00
Christian Pauly d2f2690dd4 Merge branch 'krille/add-localization-stuff' into 'master'
Implement localized String represantions

See merge request famedly/famedlysdk!278
2020-05-06 10:13:30 +00:00
Christian Pauly 9944844cc3 Implement localized String represantions 2020-05-06 10:13:30 +00:00
Christian Pauly c2bc27abfd Merge branch 'krille/fix-download' into 'master'
Fix downloadanddecrypt

See merge request famedly/famedlysdk!277
2020-05-05 07:11:49 +00:00
Christian Pauly fae6661b04 Fix downloadanddecrypt 2020-05-05 09:07:09 +02:00
Christian Pauly cdadbe88a8 Merge branch 'krille/non-blurry-thumbnails' into 'master'
Fix blurry thumbnails

See merge request famedly/famedlysdk!276
2020-05-04 14:03:07 +00:00
Christian Pauly c22090a68d Fix blurry thumbnails 2020-05-04 14:03:07 +00:00
Christian Pauly 8433527ea6 Merge branch 'ChristianPauly-master-patch-89882' into 'master'
Update lib/src/room.dart

See merge request famedly/famedlysdk!275
2020-05-04 08:42:42 +00:00
Christian Pauly 07badfc9a9 Update lib/src/room.dart 2020-05-04 08:38:12 +00:00
Christian Pauly 12303f51fe Merge branch 'krille/thumbnail-fix-quality' into 'master'
Fix thumbnail quality and update e2ee

See merge request famedly/famedlysdk!274
2020-05-04 07:37:32 +00:00
Christian Pauly 06f650cf57 Fix thumbnail quality and update e2ee 2020-05-04 09:33:10 +02:00
Christian Pauly 5afea11898 Merge branch 'krille/thumbnail-correct-scaling' into 'master'
Fix thumbnail scaling

See merge request famedly/famedlysdk!273
2020-05-04 07:27:39 +00:00
Christian Pauly 2064f53c34 Fix thumbnail scaling 2020-05-04 09:22:44 +02:00
Christian Pauly 197838b028 Merge branch 'krille/thumbnail-size-fix' into 'master'
Make thumbnail width height and quality configurable

See merge request famedly/famedlysdk!272
2020-05-04 07:03:23 +00:00
Christian Pauly 0e3fabcef3 Make thumbnail width height and quality configurable 2020-05-04 08:59:05 +02:00
Christian Pauly ed86466a19 Merge branch 'krille/send-image-size' into 'master'
Make thumbnailsize configurable

See merge request famedly/famedlysdk!271
2020-05-04 06:51:55 +00:00
Christian Pauly f65ef4cdcf Make thumbnailsize configurable 2020-05-04 08:46:53 +02:00
Christian Pauly 19f0f23719 Merge branch 'krille/fix-clear-rooms' into 'master'
Fix clear rooms

See merge request famedly/famedlysdk!270
2020-05-04 06:23:47 +00:00
Christian Pauly 6f9a52bb5a Fix clear rooms 2020-05-04 08:19:15 +02:00
Christian Pauly a72f25dcfa Merge branch 'fix-messages-filter' into 'master'
[Room] Send correct filter on the messages endpoint

See merge request famedly/famedlysdk!269
2020-05-02 05:02:11 +00:00
Marcel 811589a895 [Room] Send correct filter on the messages endpoint
Took 6 minutes
2020-05-02 05:02:11 +00:00
Christian Pauly 714a8538eb Merge branch 'krille/add-change-password-feature' into 'master'
Add change password feature

See merge request famedly/famedlysdk!268
2020-04-28 14:30:42 +00:00
Christian Pauly 4405e933dd Add change password feature 2020-04-28 16:23:01 +02:00
Christian Pauly 1265ebf7da Merge branch 'ChristianPauly-master-patch-43099' into 'master'
Make MAX_FILE_SIZE overrideable and reduce to 1mb

See merge request famedly/famedlysdk!267
2020-04-28 11:55:36 +00:00
Christian Pauly 28a6ffaf24 Make MAX_FILE_SIZE overrideable and reduce to 1mb 2020-04-28 11:55:36 +00:00
Christian Pauly b70ccd875d Merge branch 'ChristianPauly-master-patch-31988' into 'master'
Fix profile uri parse

See merge request famedly/famedlysdk!266
2020-04-28 11:40:42 +00:00
Christian Pauly e3ced175de Fix profile uri parse 2020-04-28 11:36:20 +00:00
Christian Pauly 96d2a2a0b4 Merge branch 'mxcontent-refactor-uri-extension' into 'master'
[MxContent] Switch to Uri Extension

See merge request famedly/famedlysdk!265
2020-04-24 09:43:30 +00:00
Christian Pauly 6f5ebe4681 [MxContent] Switch to Uri Extension 2020-04-24 09:24:06 +02:00
Christian Pauly e8611217e4 Merge branch 'user-feature-format-displayname' into 'master'
[User] Format displayname

See merge request famedly/famedlysdk!258
2020-04-23 09:46:10 +00:00
Christian Pauly 0e61885821 [User] Format displayname 2020-04-23 09:46:10 +00:00
Christian Pauly 1a94d7d145 Merge branch 'matrixfiles-fix-thumbnails' into 'master'
[MatrixFile] Fix thumbnail encoding

See merge request famedly/famedlysdk!264
2020-04-23 08:18:34 +00:00
Christian Pauly 7ce5002237 [MatrixFile] Fix thumbnail encoding 2020-04-23 08:18:33 +00:00
Christian Pauly 78667536c5 Merge branch 'encryption-fix-relatesto' into 'master'
[Room] Fix relates to key while encryption

See merge request famedly/famedlysdk!263
2020-04-20 10:56:36 +00:00
Christian Pauly 69b13bb24d [Room] Fix relates to key while encryption 2020-04-20 10:56:36 +00:00
Christian Pauly a4e75cb6f2 Merge branch 'thumbnail-fix-info-size' into 'master'
[Thumbnail] Fix info size

See merge request famedly/famedlysdk!262
2020-04-17 14:55:34 +00:00
Christian Pauly 757f61d890 [Thumbnail] Fix info size 2020-04-17 16:51:01 +02:00