Commit Graph

8042 Commits

Author SHA1 Message Date
Benoit Marty 3b16351308 Fix bad theme change for the MainActivity 2021-03-19 13:36:24 +01:00
Benoit Marty 80db39a934 No alert possible in SignedOutActivity 2021-03-19 13:15:13 +01:00
Benoit Marty ec50f891a2 Improve description format 2021-03-18 19:22:29 +01:00
Benoit Marty a3c331019d Remove roomId from DevTools item (copy/paste error) 2021-03-18 19:18:12 +01:00
Benoit Marty 89eea7cbdd
Merge pull request #3026 from vector-im/feature/bma/missing_shield
Display the room shield in all room setting screens
2021-03-18 19:01:07 +01:00
Benoit Marty 9f47598950 Display the room shield in all room setting screens 2021-03-18 18:01:21 +01:00
Benoit Marty c1254ed5b1
Merge pull request #3012 from vector-im/dependabot/gradle/io.mockk-mockk-1.11.0
Bump mockk from 1.10.6 to 1.11.0
2021-03-18 13:12:10 +01:00
Benoit Marty d51f632404
Merge pull request #3011 from vector-im/dependabot/gradle/io.mockk-mockk-android-1.11.0
Bump mockk-android from 1.10.6 to 1.11.0
2021-03-18 13:11:59 +01:00
Benoit Marty 2f2bc758d7
Merge pull request #3022 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.20
Bump libphonenumber from 8.12.19 to 8.12.20
2021-03-18 13:11:41 +01:00
Benoit Marty 3078adf0da Version++ 2021-03-18 10:40:33 +01:00
Benoit Marty ab120d32e2 Merge branch 'release/1.1.3' into develop 2021-03-18 10:35:10 +01:00
Benoit Marty 1eda7fa5bb Prepare release 1.1.3 2021-03-18 10:35:03 +01:00
Benoit Marty ef6e57066b
Merge pull request #3018 from vector-im/feature/bma/improve_perf
Fix issue with Realm in UpdateTrustWorker
2021-03-18 10:27:54 +01:00
dependabot[bot] 8e85d5515d
Bump libphonenumber from 8.12.19 to 8.12.20
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.19 to 8.12.20.
- [Release notes](https://github.com/google/libphonenumber/releases)
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md)
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.19...v8.12.20)

Signed-off-by: dependabot[bot] <support@github.com>
2021-03-18 07:18:33 +00:00
Benoit Marty bab01ea309
Merge branch 'develop' into feature/bma/improve_perf 2021-03-17 18:10:14 +01:00
Benoit Marty 6aeca212f4
Merge pull request #3008 from vector-im/feature/fga/fix_ui_timeline
Feature/fga/fix UI timeline
2021-03-17 15:20:21 +01:00
Benoit Marty 67ff43cecc Changelog 2021-03-17 15:04:39 +01:00
Benoit Marty 1f82b1442d
Merge branch 'develop' into feature/fga/fix_ui_timeline 2021-03-17 15:03:22 +01:00
Benoit Marty 192fc6fd94 Use minimum delay accepted by the Work library. The current value is 10_000 and smaller value will be ignored.
It will remove the warning "W/WM-WorkSpec: Backoff delay duration less than minimum value"
2021-03-17 14:54:15 +01:00
Benoit Marty a4f6fe0cd2 Cleanup 2021-03-17 12:43:05 +01:00
Benoit Marty 616d3c1988 Fix IllegalStateException in UpdateTrustWorker
Also split into 2 methods
2021-03-17 12:42:28 +01:00
ganfra 174e938b5b Fix padding layout 2021-03-17 11:44:22 +01:00
Benoit Marty e89e0724a0 limit log 2021-03-17 11:04:17 +01:00
Benoit Marty 1d1f78a020 Timber.d instead of Timber.v 2021-03-17 10:39:25 +01:00
dependabot[bot] 118ea4b0b2
Bump mockk from 1.10.6 to 1.11.0
Bumps [mockk](https://github.com/mockk/mockk) from 1.10.6 to 1.11.0.
- [Release notes](https://github.com/mockk/mockk/releases)
- [Commits](https://github.com/mockk/mockk/compare/1.10.6...1.11.0)

Signed-off-by: dependabot[bot] <support@github.com>
2021-03-17 07:08:12 +00:00
dependabot[bot] f230830763
Bump mockk-android from 1.10.6 to 1.11.0
Bumps [mockk-android](https://github.com/mockk/mockk) from 1.10.6 to 1.11.0.
- [Release notes](https://github.com/mockk/mockk/releases)
- [Commits](https://github.com/mockk/mockk/compare/1.10.6...1.11.0)

Signed-off-by: dependabot[bot] <support@github.com>
2021-03-17 07:07:15 +00:00
Benoit Marty 5edf7ca520 Version++ 2021-03-16 22:31:25 +01:00
Benoit Marty f12720aeb3 Merge branch 'release/1.1.2' into develop 2021-03-16 22:08:39 +01:00
Benoit Marty 2d64fe96c1 Prepare release 1.1.2 2021-03-16 22:08:29 +01:00
ganfra 616a46294c Update CHANGES 2021-03-16 20:14:20 +01:00
ganfra c9691b04ad Timeline: fix separators background 2021-03-16 20:11:10 +01:00
ganfra 1bc431198e Timeline: fix ripple on text item 2021-03-16 20:10:47 +01:00
Benoit Marty 5ce984ce3f
Merge pull request #3006 from vector-im/feature/bca/fix_video_wont_play
Regression: Video will not play upon tap
2021-03-16 18:32:20 +01:00
Valere 3b5dacd7e2
Merge branch 'develop' into feature/bca/fix_video_wont_play 2021-03-16 16:15:24 +01:00
Benoit Marty f90bc17eb3
Merge pull request #3005 from vector-im/feature/bma/restore_code
Restore code
2021-03-16 15:54:57 +01:00
Valere a52d20eeff Regression: Video will not play upon tap 2021-03-16 15:26:06 +01:00
Benoit Marty b3ccd788f6
Merge pull request #2997 from ShadowJonathan/no-bold
Change ISSUE_TEMPLATE bold lines to proper headers
2021-03-16 15:03:15 +01:00
Benoit Marty 12b927f951
Merge pull request #3004 from vector-im/feature/bca/workaround_stuck_message
Quick Work around to remove stuck messages
2021-03-16 15:01:02 +01:00
Benoit Marty e541a3b962
Merge branch 'develop' into feature/bca/workaround_stuck_message 2021-03-16 15:00:55 +01:00
Benoit Marty 9492887345 Restore call to clearUnavailableServersList() removed by mistake
See https://github.com/vector-im/element-android/pull/3001#pullrequestreview-613195611
2021-03-16 14:53:15 +01:00
Benoit Marty 641ce206c2 Move change to correct release version (#3001) 2021-03-16 14:48:27 +01:00
Benoit Marty 4273a6a1be
Merge pull request #3001 from timokoesters/fix-parsing-servername
fix: make cross signing work with server names containing :
2021-03-16 14:46:47 +01:00
Benoit Marty c80564e1b1
Merge pull request #2989 from vector-im/feature/bma/rr
Feature/bma/rr
2021-03-16 14:46:23 +01:00
Benoit Marty 431d450fec
Merge branch 'develop' into feature/bma/rr 2021-03-16 14:46:10 +01:00
Benoit Marty a30660ed43 Cleanup 2021-03-16 14:44:40 +01:00
Valere b93200f371 unused params 2021-03-16 14:31:37 +01:00
Benoit Marty 4ad0eb3db2
Merge pull request #2999 from vector-im/feature/bma/shields
Shields optimization
2021-03-16 13:31:56 +01:00
Benoit Marty cb17fa60dc Ganfra's review: delete files after the Realm transaction 2021-03-16 13:29:38 +01:00
Valere 5b94540f76 Quick Work around to remove stuck messages 2021-03-16 12:16:11 +01:00
Benoit Marty e8bb3d81ed Ganfra's review: inject Moshi Moshi 2021-03-16 12:15:28 +01:00