mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-11-28 21:48:50 +03:00
Code Issues Projects Releases Packages Wiki Activity
8955 commits 161 branches 158 tags 270 MiB
Commit graph

5557 commits

Author SHA1 Message Date
Benoit Marty
b44c1a1c77
Merge pull request #3383 from vector-im/feature/fga/authenticated_jitsi 
Feature/fga/authenticated jitsi
 2021-05-25 10:24:54 +02:00
Benoit Marty
6706a88a21
Merge pull request #3188 from vector-im/feature/bma/login_v2 
Login v2 - WIP
 2021-05-21 14:55:22 +02:00
Benoit Marty
40bb58c9cb
Merge branch 'develop' into feature/bca/fix_3371 2021-05-21 14:53:21 +02:00
Benoit Marty
697b9ff535
Merge branch 'develop' into feature/bca/spaces_quick_fixes 2021-05-21 14:49:12 +02:00
Valere
ba96626bd0 Code review 2021-05-21 11:46:55 +02:00
Benoit Marty
048c13af50 Fix issue after rebase 2021-05-21 11:46:28 +02:00
Valere
2f3f0c294c Code review 2021-05-21 11:46:28 +02:00
Valere
ae5a5ec92b Spaces | Personal spaces add DM - Web Parity #3271 2021-05-21 11:46:13 +02:00
Valere
abf7e275a7 Fix / Improve 'Leave Space' UX/UI #3359 2021-05-21 11:46:13 +02:00
Valere
8d3167cb66 Code review 2021-05-21 11:42:01 +02:00
Valere
cb6f414c60 Fix | Explore room list: the RoomId is displayed instead of name (#3371) 2021-05-21 11:40:09 +02:00
Benoit Marty
0424d03bcc Fix lint and tools issue 2021-05-21 11:37:16 +02:00
Valere
bcf755407b code review 2021-05-21 11:37:16 +02:00
Valere
1b16d287e8 review 2021-05-21 11:34:51 +02:00
Valere
0d0b6a8810 Fix empty states for spaces 2021-05-21 11:32:34 +02:00
ganfra
03f81258c4 Jitsi auth: clean after Benoits review 2021-05-20 20:16:37 +02:00
ganfra
894af10934 Jitsi auth: fix some mistakes and gives the jwt to Jitsi 2021-05-20 18:53:56 +02:00
Benoit Marty
201f4c342a Fix lint issue 2021-05-20 18:51:09 +02:00
Benoit Marty
df13b32a5c
Merge pull request #3373 from vector-im/feature/bma/del_tag 
Implement a workaround to render <del> and <u> in the timeline (#1817)
 2021-05-20 15:34:38 +02:00
Benoit Marty
a7c1dc5cd9
Merge branch 'develop' into feature/bma/login_v2 2021-05-20 15:18:18 +02:00
Benoit Marty
5d7acad75c
Merge pull request #3366 from vector-im/dependabot/gradle/androidx.appcompat-appcompat-1.3.0 
Bump appcompat from 1.2.0 to 1.3.0
 2021-05-20 15:07:27 +02:00
Benoit Marty
4ba40b1d34 Disable LoginFlowV2 to merge it on develop 2021-05-20 13:56:41 +02:00
Benoit Marty
b11e6a2b26 ktlint 2021-05-20 13:53:51 +02:00
Benoit Marty
4cf38951ef Fix warning after bump appcompat from 1.2.0 to 1.3.0 2021-05-20 13:00:49 +02:00
ganfra
82c50b7c1d Jitsi auth: introduce JitsiService and JWT token creation 2021-05-19 18:19:49 +02:00
Benoit Marty
25f7f29d94 Implement a workaround to render <del> and <u> in the timeline (#1817) 2021-05-19 15:15:34 +02:00
Benoit Marty
566369cccd Split long lines 2021-05-19 12:03:47 +02:00
Benoit Marty
3d174b0a25 Cleanup and properly inject the controller 2021-05-19 11:54:19 +02:00
Benoit Marty
8114d52d7d Change related to Epoxy 4.6.0 upgrade - step 2: small API change 2021-05-19 11:43:42 +02:00
Benoit Marty
9a9edd979d Change related to Epoxy 4.6.0 upgrade - step 1.1: handle DSL restriction, other error 2021-05-19 11:05:52 +02:00
Benoit Marty
a0d04c40e9 Change related to Epoxy 4.6.0 upgrade - step 1: handle DSL restriction 2021-05-19 11:00:20 +02:00
dependabot[bot]
5629d30932
Bump appcompat from 1.2.0 to 1.3.0 
Bumps appcompat from 1.2.0 to 1.3.0.

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-19 06:20:33 +00:00
Benoit Marty
9d7f092016 Ignore lint false positive 2021-05-18 21:23:50 +02:00
dependabot[bot]
e5cc6ceba7
Bump epoxy_version from 4.5.0 to 4.6.1 
Bumps `epoxy_version` from 4.5.0 to 4.6.1.

Updates `epoxy` from 4.5.0 to 4.6.1
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/compare/4.5.0...4.6.1)

Updates `epoxy-glide-preloading` from 4.5.0 to 4.6.1
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/compare/4.5.0...4.6.1)

Updates `epoxy-processor` from 4.5.0 to 4.6.1
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/compare/4.5.0...4.6.1)

Updates `epoxy-paging` from 4.5.0 to 4.6.1
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/compare/4.5.0...4.6.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-18 18:18:15 +00:00
Benoit Marty
0041743bf9
Merge pull request #3348 from vector-im/feature/bca/spaces_fix_invites 
Fix space invite issues
 2021-05-18 13:56:01 +02:00
Benoit Marty
36f397be48
Merge branch 'develop' into dependabot/gradle/kotlin_version-1.5.0 2021-05-17 12:15:19 +02:00
Benoit Marty
00b4ab8db9 ktlint 2021-05-17 11:39:42 +02:00
Benoit Marty
37cc0dc8b6 Ignore lint issues false positive 2021-05-17 10:25:31 +02:00
Valere
7f3d899521
Merge branch 'develop' into feature/bca/spaces_fix_invites 2021-05-17 09:14:37 +02:00
Valere
39b89ff103 Code review 2021-05-14 18:54:11 +02:00
Valere
14629f2041 Fix space invite issues 2021-05-14 17:15:41 +02:00
Benoit Marty
535d266cc2 Remove usage of GlobalScope 2021-05-14 15:56:51 +02:00
Benoit Marty
1f7482922d Remove usage of GlobalScope 2021-05-14 15:44:53 +02:00
Benoit Marty
8211cc266f Remove usage of GlobalScope 2021-05-14 15:26:16 +02:00
Benoit Marty
0437814479 Remove usage of GlobalScope 2021-05-14 15:24:04 +02:00
Benoit Marty
1e708b113b Remove usage of GlobalScope 2021-05-14 15:20:22 +02:00
Benoit Marty
25b4c32fd0 Remove usage of GlobalScope 2021-05-14 15:19:04 +02:00
Benoit Marty
0711ecc7f4 Remove usage of GlobalScope - I guess for those ones this is OK... 2021-05-14 15:10:36 +02:00
Benoit Marty
4112d28127 Remove usage of GlobalScope 2021-05-14 14:56:31 +02:00
Benoit Marty
555eada37a Remove usage of GlobalScope 2021-05-14 14:55:02 +02:00