Commit graph

6471 commits

Author SHA1 Message Date
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
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
Benoit Marty
9ed8f26d7c Make the room default avatar clickable to set it (as per the small picto)
And do some cleanup
2020-11-18 18:13:49 +01:00
Benoit Marty
b82b378cfe Cleanup and changelog 2020-11-18 18:13:49 +01:00
Benoit Marty
1eac90e5b1 Use plurals for proper i18n 2020-11-18 18:13:49 +01:00
Valere
206e68b1d2 Unused val 2020-11-18 18:13:49 +01:00
Valere
1de5cd2e61 Code review 2020-11-18 18:13:49 +01:00
Valere
264bc52bcc WIP review 2020-11-18 18:13:49 +01:00
Valere
2626a761ea EmptyRoom tile with quick actions 2020-11-18 18:13:49 +01:00
Dominic Fischer
1359c6be1d Missed a spot
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
2020-11-18 15:40:22 +00:00
Benoit Marty
ca0da2c509
Merge pull request #2405 from Dominaezzz/suspend_functions_1
Convert DraftService to suspend functions
2020-11-18 16:00:33 +01:00
Benoit Marty
57d55e05e7 Update comment 2020-11-18 15:36:05 +01:00
Benoit Marty
702d21fbc3 No encryption for public room (#1314) 2020-11-18 15:27:59 +01:00
Dominic Fischer
796ba72bde Reorder
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
2020-11-18 14:27:46 +00:00
Dominic Fischer
92a6e9ea5a Remove redundant return
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
2020-11-18 14:23:59 +00:00
Dominic Fischer
822ce41b54 Remove redundant return
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
2020-11-18 14:22:07 +00:00
Benoit Marty
0c7f4c2af5 Reset error in the form 2020-11-18 15:13:43 +01:00
Benoit Marty
4e1783f856
Merge pull request #2415 from Dominaezzz/suspend_functions_3
Convert SearchService to suspend functions
2020-11-18 15:08:38 +01:00
Benoit Marty
f6aee3d64e Cleanup 2020-11-18 14:54:01 +01:00
Benoit Marty
514263ae12 Room creation Fragment: no more "Retry" action, loading and error displayed in a dialog 2020-11-18 14:51:10 +01:00
Benoit Marty
507d5d3758 Warn the user if room alias is not empty and he wants to leave the form. 2020-11-18 14:21:53 +01:00
Benoit Marty
16b6678aa2 CreateRoomFragment: use argument instead of Activity ViewModel to pass the initial room name 2020-11-18 14:14:43 +01:00