Commit graph

6491 commits

Author SHA1 Message Date
Dominic Fischer
33a5cc1488 Remove redundant returns
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
2020-11-27 13:18:07 +00:00
Dominic Fischer
92ceb0e8fb Convert IntegrationManagerService to suspend functions
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
2020-11-26 21:17:58 +00:00
Valere
4c599d3d40
Merge pull request #2451 from vector-im/feature/bca/fix_update_profile_no_rooms
Fix / update profile when no rooms
2020-11-26 15:09:40 +01:00
Valere
67057bfac4
Merge pull request #2417 from vector-im/feature/bca/quick_invite_dm_tab
Feature/bca/quick invite dm tab
2020-11-26 14:58:14 +01:00
Valere
fbc3f47eeb Fix / update profile when no rooms 2020-11-26 14:34:45 +01:00
Valere
bcd86977d2 Fix test + lint 2020-11-25 17:17:48 +01:00
Valere
a8b5a5227f Code review update 2020-11-25 15:47:27 +01:00
Benoit Marty
c0a83d1916
Merge pull request #2429 from vector-im/feature/bca/e2e_logs
Better e2e log reporting
2020-11-24 17:04:11 +01:00
Benoit Marty
920856512e
Merge pull request #2433 from EdGeraghty/patch-1
Disable native dialler integration on jitsi widget
2020-11-24 16:45:12 +01:00
Ed Geraghty
b125b47366
Update CHANGES.md
Signed-off-by: Ed Geraghty <ed@geraghty.london>
2020-11-23 00:01:05 +00:00
Ed Geraghty
bc6debea89
Disable native dialler integration on jitsi widget
Native dialler integration breaks the jitsi widget for those of us with non-vanilla telephony frameworks.

Disabling this integration (as is default on the Jitsi Meet Android app) allows us to also join conference calls, with no adverse effect on those for whom it already works.

Signed-off-by: Ed Geraghty <ed@geraghty.london>
2020-11-22 23:13:01 +00:00
Valere
1f69c7e992 Better e2e log reporting 2020-11-20 17:37:20 +01:00
Valere
d9757cc660 Fix lint 2020-11-20 16:23:04 +01:00
Valere
1cb3522e73 Fix string 2020-11-20 15:46:21 +01:00
Valere
7583b0a358 Fix rebase 2020-11-20 15:17:35 +01:00
Valere
77863e2e88 copy tweaks 2020-11-20 14:50:21 +01:00
Valere
564404d4ae Design review 2020-11-20 14:50:21 +01:00
Valere
e2320cd3b2 Upgrade to new design input 2020-11-20 14:50:21 +01:00
Valere
fd92d6559c Refact move utility method open settings 2020-11-20 14:50:21 +01:00
Valere
6146925757 Better error handling Rx call 2020-11-20 14:50:21 +01:00
Valere
baef9f5aa7 Fix permission handling + share my code by text 2020-11-20 14:50:21 +01:00
Benoit Marty
ae6de8fdf1 Small cleanup 2020-11-20 14:50:21 +01:00
Benoit Marty
b888d13e62 Use orEmpty() 2020-11-20 14:50:21 +01:00
Benoit Marty
1070c23608 QR code invite flow support - invite friends
Author: Valere
2020-11-20 14:50:21 +01:00
TR-SLimey
e8d084b855 Add ability to share profile by QR code 2020-11-20 14:49:39 +01:00
Benoit Marty
5b278f704c
Merge pull request #2427 from vector-im/feature/bma/dominaezz_cleanup
Feature/bma/dominaezz cleanup
2020-11-20 14:11:53 +01:00
Benoit Marty
a87e44bae4
Merge pull request #2416 from vector-im/feature/bma_create_room_form
Improve create room form
2020-11-20 13:57:46 +01:00
Benoit Marty
85bc5f54aa
Merge branch 'develop' into feature/bma_create_room_form 2020-11-20 13:57:35 +01:00
Benoit Marty
41f46d0810
Merge pull request #2367 from vector-im/feature/bma/sanity_test
Feature/bma/sanity test
2020-11-20 13:56:49 +01:00
Benoit Marty
9ce1222fd0 Kotlin optimization form #1435 2020-11-20 09:07:29 +01:00
Benoit Marty
8fb3c68573 Kotlin optimization form #1435 2020-11-20 09:05:53 +01:00
Benoit Marty
eb7ee49096 Kotlin optimization form #1435 2020-11-20 09:04:04 +01:00
Benoit Marty
084b2e8e04
Merge pull request #2373 from vector-im/feature/bma/fix_crash
Feature/bma/fix crash
2020-11-19 18:44:58 +01:00
Benoit Marty
675e4579ac
Merge branch 'develop' into feature/bma/fix_crash 2020-11-19 18:44:17 +01:00
Benoit Marty
d2880432da
Merge pull request #2366 from vector-im/feature/bma/cleanup
Feature/bma/cleanup
2020-11-19 17:49:17 +01:00
Benoit Marty
6daae83c3a
Merge pull request #2383 from vector-im/feature/bma/crop_issue
Try to fix cropped image in timeline (#2126)
2020-11-19 17:29:49 +01:00
Benoit Marty
f9e4b689b7
Merge branch 'develop' into feature/bma/crop_issue 2020-11-19 17:25:36 +01:00
Benoit Marty
2c30050f3d
Merge pull request #2384 from vector-im/feature/bma/upgrade
Un configure the template, to be able to upgrade Android Studio
2020-11-19 17:18:08 +01:00
Benoit Marty
13530abdeb
Merge pull request #2372 from vector-im/feature/fix_user_vs_room_member
Feature/fix user vs room member
2020-11-19 17:15:42 +01:00
Benoit Marty
5eb50750e2
Merge branch 'develop' into feature/fix_user_vs_room_member 2020-11-19 17:02:35 +01:00
Benoit Marty
9ef873526a
Merge pull request #2371 from vector-im/feature/ons/fix_badge_color
Exclude yourself when decorating rooms which are direct or <=2 members.
2020-11-19 17:01:20 +01:00
Benoit Marty
0046fe25c5
Merge branch 'develop' into feature/ons/fix_badge_color 2020-11-19 17:00:49 +01:00
Benoit Marty
fdb13f0b77
Merge pull request #2385 from vector-im/feature/bma/fdroid_60_timeout
F-Droid version: ensure timeout of sync request can be more than 60 s…
2020-11-19 16:59:40 +01:00
Benoit Marty
a552c57d67
Merge pull request #2409 from vector-im/gradlew-update-6.7.1
Updates Gradle Wrapper from 6.7 to 6.7.1
2020-11-19 15:32:22 +01:00
Benoit Marty
d5f83acaf5
Merge pull request #2414 from Dominaezzz/suspend_functions_2
Convert PushRuleService to suspend functions
2020-11-19 15:32:01 +01:00
Benoit Marty
c50c028c9e Code quality 2020-11-19 15:22:24 +01:00
Benoit Marty
465b33b006
Merge pull request #2407 from vector-im/feature/bma/move_enable_encryption
Move "Enable Encryption" from room setting screen to room profile screen
2020-11-19 15:17:13 +01:00
Benoit Marty
4df68479ac
Merge pull request #2369 from vector-im/feature/bca/quick_invite_room_tile
EmptyRoom tile with quick actions
2020-11-19 09:46:25 +01:00
Benoit Marty
3ec25f3634
Merge pull request #2413 from Dominaezzz/suspend_functions
Convert Group to suspend functions
2020-11-19 02:05:06 +01:00
Benoit Marty
c29e4648ea Small cleanup 2020-11-18 18:13:49 +01:00