Commit graph

902 commits

Author SHA1 Message Date
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
Christian Pauly f2d4a39fc0 Merge branch 'client-enhance-implement-thumbnails' into 'master'
[Client] Implement thumbnails

See merge request famedly/famedlysdk!261
2020-04-17 14:11:13 +00:00
Christian Pauly 81c12c81f2 [Client] Implement thumbnails 2020-04-17 14:11:13 +00:00
Christian Pauly 28dee0e2e3 Merge branch 'client-enhance-allow-060' into 'master'
[Client] Allow r0.6.0 to connect

See merge request famedly/famedlysdk!260
2020-04-10 06:43:06 +00:00
Christian Pauly 99b99e7ac9 [Client] Allow r0.6.0 to connect 2020-04-09 13:28:41 +00:00
Christian Pauly 31871235a5 Merge branch 'client-refactor-remove-lazyloadingcheck' into 'master'
[Client] Remove lazyloadingcheck

See merge request famedly/famedlysdk!257
2020-04-02 11:29:07 +00:00
Christian Pauly 7c7a0f15e5 [Client] Remove lazyloadingcheck 2020-04-02 11:29:07 +00:00
Christian Pauly 63a5d5dba3 Merge branch 'room-fix-restore-session' into 'master'
[Room] Fix restore session

See merge request famedly/famedlysdk!256
2020-04-02 08:39:00 +00:00
Christian Pauly 066dcbf395 [Room] Fix restore session 2020-04-02 08:39:00 +00:00
Christian Pauly 949146cbf9 Merge branch 'event-fix-download' into 'master'
[Event] Fix download

See merge request famedly/famedlysdk!255
2020-03-31 15:51:30 +00:00
Christian Pauly aba692ba81 [Event] Fix download 2020-03-31 17:47:19 +02:00
Christian Pauly ae94e290f7 Merge branch 'forwardkey-fix-setverified' into 'master'
[RoomKeyRequest] Fix forwardKey

See merge request famedly/famedlysdk!254
2020-03-31 15:22:59 +00:00
Christian Pauly 0dcc818365 [RoomKeyRequest] Fix forwardKey 2020-03-31 17:18:37 +02:00
Christian Pauly c04c287a28 Merge branch 'roomkeyrequest-fix-index' into 'master'
[RoomKeyRequest] Fix index

See merge request famedly/famedlysdk!253
2020-03-31 14:34:29 +00:00
Christian Pauly 5f140a62ad [RoomKeyRequest] Fix index 2020-03-31 16:30:00 +02:00
Christian Pauly d2807f75e0 Merge branch 'event-fix-sendtodevice' into 'master'
[Event] Fix send request cancellation

See merge request famedly/famedlysdk!252
2020-03-31 10:29:18 +00:00
Christian Pauly e098318a3f [Event] Fix send request cancellation 2020-03-31 12:24:53 +02:00
Christian Pauly 26a534f465 Merge branch 'room-enhance-send-file' into 'master'
[Room] Improved sendFileEvent

See merge request famedly/famedlysdk!251
2020-03-30 10:06:16 +00:00
Christian Pauly 82affbc14f [Room] Improved sendFileEvent 2020-03-30 11:59:24 +02:00
Christian Pauly 0266ab9659 Merge branch 'sdk-refactor-new-linter' into 'master'
[SDK] Refactoring with new linter rules

See merge request famedly/famedlysdk!250
2020-03-30 09:08:38 +00:00
Christian Pauly a3c5add79e [SDK] Refactoring with new linter rules 2020-03-30 09:08:38 +00:00
Christian Pauly 8129ac00a2 Merge branch 'client-fix-publish-keys' into 'master'
[Client] Fix publish keys

See merge request famedly/famedlysdk!249
2020-03-26 13:19:39 +00:00
Christian Pauly 887694bbf0 [Client] Fix publish keys 2020-03-26 14:15:08 +01:00
Christian Pauly d5df12d294 Merge branch 'client-fix-mark-keys-as-published' into 'master'
[Client] Fix mark keys as published

See merge request famedly/famedlysdk!248
2020-03-26 13:06:40 +00:00
Christian Pauly 1abda1fa13 [Client] Fix mark keys as published 2020-03-26 14:02:07 +01:00