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
4169 commits 161 branches 158 tags 270 MiB
Commit graph

4169 commits

This branch
This branch
All branches
Author SHA1 Message Date
Benoit Marty
62f352243d
Merge pull request #1448 from vector-im/feature/fix 
Feature/fix
 2020-06-08 18:10:06 +02:00
Benoit Marty
1ad19b5e93
Merge branch 'develop' into feature/fix 2020-06-08 18:09:57 +02:00
Benoit Marty
e7ba0a5c60
Merge pull request #1449 from vector-im/feature/fix_1444 
Wrong /query request (#1444)
 2020-06-08 18:07:23 +02:00
Benoit Marty
050407f7c7
Merge branch 'develop' into feature/fix_1444 2020-06-08 18:07:15 +02:00
Benoit Marty
dffe096c59
Merge pull request #1451 from vector-im/feature/sso_redirect 
Correctly handle SSO login redirection
 2020-06-08 18:06:00 +02:00
Benoit Marty
19e1683106 Move class LoginFlowType to api package 2020-06-08 09:16:31 +02:00
Benoit Marty
5c538c7865 Clarify type when retrieving supported login flow (be conform to the spec) 2020-06-08 09:11:23 +02:00
Benoit Marty
ee23967afe I made a mistake: registration step m.login.token type is not the same that login request. 2020-06-08 08:53:06 +02:00
Benoit Marty
b48eb6e9cc SSO Update the documentation 2020-06-05 19:14:31 +02:00
Benoit Marty
f3a2c467ed small typo 2020-06-05 12:21:58 +02:00
Benoit Marty
088e8bc9f9 Add some comment 2020-06-05 10:09:49 +02:00
Benoit Marty
3714323d74 Rename Constants 2020-06-05 01:16:19 +02:00
Benoit Marty
d70b19fa93 SSO login is now performed in the default browser (#1400) - WIP 
Use ChromeCustomTabs to host the SSO web page
 2020-06-05 01:14:35 +02:00
Benoit Marty
ae7a52cecf Correctly handle SSO login redirection 2020-06-04 16:55:27 +02:00
Benoit Marty
2e244dd448
Merge pull request #1446 from vector-im/feature/various_fixes 
Hide left rooms in breadcrumbs (#766)
 2020-06-04 15:07:45 +02:00
Benoit Marty
1ad77530aa Use RoomSummaryQueryParams as per Ganfra's excellent suggestion 2020-06-04 14:36:51 +02:00
Benoit Marty
e44963728f
Merge pull request #1450 from vector-im/feature/navigation_bar 
Fix bad color contrast for navigation and status bar
 2020-06-04 14:31:06 +02:00
Benoit Marty
3b256a708e Fix status bar icon contrast on API in [21,23[ 2020-06-04 12:55:27 +02:00
Benoit Marty
aea517515c Fix navigation bar icon contrast on API in [21,27[ (#1342) 2020-06-04 12:50:42 +02:00
Benoit Marty
f28889284d Wrong /query request (#1444) 2020-06-04 11:59:04 +02:00
Valere
240f1f51b9
Merge pull request #1437 from vector-im/feature/fix_1169 
Fix / reply ux stays too long
 2020-06-04 11:44:53 +02:00
Valere
05efd7423e
Merge branch 'develop' into feature/fix_1169 2020-06-04 11:44:32 +02:00
Valere
2adb5af051 update change log 2020-06-04 11:43:47 +02:00
Benoit Marty
8b7e5e527a Make Credentials.homeServer optional because it is deprecated (#1443) 
It is never used currently in RiotX, but if homeserver does not sent it, it would crash.
 2020-06-04 11:41:32 +02:00
Benoit Marty
c3d8916802 fix param name 2020-06-04 11:40:38 +02:00
Benoit Marty
a3fd49499b Hide left rooms in breadcrumbs (#766) 2020-06-04 08:59:01 +02:00
Benoit Marty
3dc2cd4d7a Disable one code check 2020-06-03 18:54:03 +02:00
Benoit Marty
0b738e3d9e
Merge pull request #1409 from vector-im/feature/markdown_test 
Send plain text in the body
 2020-06-03 18:45:06 +02:00
Benoit Marty
b29c2b2de4 Send plain text in the body 
According to https://matrix.org/docs/spec/client_server/latest#m-room-message-msgtypes, the plain text version of the HTML should be provided in the body.

Also create MarkdownParser class to be able to unit test it.
 2020-06-03 18:44:35 +02:00
Benoit Marty
40f2d19f81
Merge pull request #1415 from vector-im/feature/signup_username_digit 
Temporary fix to show error when user is creating an account on matrix.org with userId containing only digits (#1410)
 2020-06-03 18:41:55 +02:00
Benoit Marty
2e997f2c67 Wrong issue number 2020-06-03 18:41:27 +02:00
Benoit Marty
0fd50892af Temporary fix to show error when user is creating an account on matrix.org with userId containing only digits (#1410) 2020-06-03 18:41:07 +02:00
Benoit Marty
55bd346cb2
Merge pull request #1425 from vector-im/feature/integration_manager 
Feature/integration manager
 2020-06-03 18:10:03 +02:00
ganfra
0724ac133b Widget notice: capitalize first letter 2020-06-03 15:22:20 +02:00
ganfra
0507fa5b0e Widgets: clean again after Benoit's review 2020-06-03 12:00:52 +02:00
Benoit Marty
617e945afa
Merge pull request #1436 from vector-im/feature/Fix_1430_X_made_no_change 
Hide "X made no changes" event by default in timeline (#1430)
 2020-06-03 09:47:51 +02:00
Benoit Marty
870c4bf765 Check that content is not null 2020-06-03 09:32:20 +02:00
Benoit Marty
9a592e9c7e Create IsUselessResolver object 2020-06-03 01:13:02 +02:00
ganfra
53592ac404 Fix lint issues 2020-06-02 20:28:18 +02:00
ganfra
d8848a6062 Merge branch 'develop' into feature/integration_manager 2020-06-02 20:26:03 +02:00
ganfra
173c1d3a6e Integration: make the default urls modifiable from MatrixConfiguration 2020-06-02 20:05:00 +02:00
ganfra
c815c4080d Widget: changes naming algorithm (align on web) 2020-06-02 19:51:16 +02:00
Valere
c09626182c Fix / reply ux stays too long 2020-06-02 19:31:25 +02:00
ganfra
65c6ce3033 Merge branch 'feature/integration_manager' of github.com:vector-im/riotX-android into feature/integration_manager 2020-06-02 19:02:31 +02:00
ganfra
06cc2f527e Clean after Benoit's review 2020-06-02 19:02:21 +02:00
ganfra
9da5061689
Update CHANGES.md 
Co-authored-by: Benoit Marty <benoitm@matrix.org>
 2020-06-02 16:37:51 +02:00
ganfra
82b4415f7d Widget: fix loading widgets without scalar token 2020-06-02 16:02:10 +02:00
Benoit Marty
3f1e5b9b1e Hide "X made no changes" event by default in timeline (#1430) 2020-06-02 15:54:01 +02:00
Benoit Marty
1b95d98ccd
Merge pull request #1423 from vector-im/feature/invalidate 
Yet another cleanup PR
 2020-06-02 14:42:51 +02:00
Benoit Marty
e2e1925796 Restore .observeOn(AndroidSchedulers.mainThread()) 2020-06-02 14:24:29 +02:00