1660 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Benoit Marty	b5f2f01c8d	Merge branch 'hotfix/dimensionConverter' into develop	2019-09-24 14:28:51 +02:00
Benoit Marty	21d808c1ce	Fix crash: MergedHeaderItem was missing dimensionConverter	2019-09-24 14:28:34 +02:00
Benoit Marty	1e963bc0dc	Fix crash: MergedHeaderItem was missing dimensionConverter	2019-09-24 14:23:13 +02:00
Benoit Marty	0d80750507	Create interface for UiStateRepository and an implementation with SharedPrefs	2019-09-24 13:43:50 +02:00
Benoit Marty	1c9cf7a810	Dagger code cleanup	2019-09-24 13:40:03 +02:00
ganfra	c6d01fbcf4	ReadMarker: extract from ViewModel the jump to read marker visibility logic as it's easier to deal with.	2019-09-24 12:57:32 +02:00
Benoit Marty	9e1ded941f	Persist active tab between sessions (#503)	2019-09-24 12:29:37 +02:00
Benoit Marty	af433266c8	Move currentDisplayMode to the ViewState	2019-09-24 11:32:55 +02:00
ganfra	05d09bf950	Merge branch 'develop' into feature/read_marker	2019-09-24 11:10:59 +02:00
Benoit Marty	6890f83810	Cleanup dead code	2019-09-24 10:47:29 +02:00
Benoit Marty	51568c30a6	Version++	2019-09-24 10:23:51 +02:00
Benoit Marty	cc832633a5	Merge branch 'release/0.6.0'	2019-09-24 10:22:42 +02:00
Benoit Marty	e019ec6596	Merge branch 'release/0.6.0' into develop	2019-09-24 10:22:42 +02:00
Benoit Marty	eadea9016b	Prepare release 0.6.0	2019-09-24 10:22:36 +02:00
Benoit Marty	6422d946c9	Merge pull request #584 from vector-im/feature/hasUnread ... isEventRead() returns true if the event has been sent by the user	2019-09-24 10:17:52 +02:00
Benoit Marty	5cc3dc00e3	Merge pull request #581 from vector-im/feature/talk_back ... Fix a few accessibility issues	2019-09-24 10:06:28 +02:00
Benoit Marty	5a2a9f908a	isEventRead() returns true if the event has been sent by the user	2019-09-24 10:04:57 +02:00
Benoit Marty	c1f2e9f171	Fix a few accessibility issues - home menu (best compromise)	2019-09-23 17:48:13 +02:00
ganfra	f6d34ec7fd	Timeline: update state management	2019-09-23 17:43:37 +02:00
Benoit Marty	620ba279d8	Fix a few accessibility issues	2019-09-23 16:32:54 +02:00
Benoit Marty	3fcfa33364	Merge pull request #573 from vector-im/feature/notif_invit ... Clean up push rules management and fixes several issues	2019-09-23 16:23:35 +02:00
Benoit Marty	546da0f173	Merge branch 'develop' into feature/notif_invit	2019-09-23 16:23:22 +02:00
Benoit Marty	001711d5a3	Merge pull request #574 from vector-im/feature/big_emoji ... Embiggen messages with multiple emojis also for edited messages	2019-09-23 16:22:53 +02:00
Benoit Marty	8e1a964679	After Ganfra's review	2019-09-23 15:08:18 +02:00
Benoit Marty	b25a130db1	Rename DimensionUtils to DimensionConverter, and inject resources instead of context.	2019-09-23 14:39:52 +02:00
Benoit Marty	8a9e6497e8	Merge pull request #578 from vector-im/feature/fix_focus_login ... Fix infinite focus on HS field	2019-09-23 10:05:43 +02:00
Valere	47e3797b7e	Fix infinite focus on HS field	2019-09-23 09:44:32 +02:00
Benoit Marty	5cbc90e06a	Embiggen messages with multiple emojis also for edited messages (#458) ... And daggerize DimensionUtils	2019-09-20 19:22:42 +02:00
ganfra	b6e18e4a8f	Timeline: add badge also when unread without notif	2019-09-20 18:34:58 +02:00
ganfra	7e29665fd0	Timeline: add some comments and checks	2019-09-20 18:34:31 +02:00
Benoit Marty	e04bf31faa	Fix wrong "no network" banner	2019-09-20 18:18:55 +02:00
Benoit Marty	d25cf79b07	Cleanup	2019-09-20 17:50:57 +02:00
Benoit Marty	faa8e6bbb2	m.notice messages trigger push notifications (#238)	2019-09-20 17:50:57 +02:00
Benoit Marty	d3d4deb884	Rework Action (better kotlin code)	2019-09-20 17:50:57 +02:00
Benoit Marty	f6b8e0c479	Fix issue: push rules was not retrieved after a clear cache. ... We now store push rules from the sync response	2019-09-20 17:50:57 +02:00
Benoit Marty	2a726f54a2	Remove userId from PushRulesEntity and PusherEntity objects	2019-09-20 17:50:15 +02:00
Benoit Marty	1197d4021d	Fix regression on PushRulesApi	2019-09-20 17:50:15 +02:00
Benoit Marty	03f8120b7d	Create enum for Push rules. Also add some TODOs	2019-09-20 17:50:15 +02:00
Benoit Marty	acd7a709de	Dagger: create @UserId to inject userId	2019-09-20 17:50:15 +02:00
Benoit Marty	5651ea515b	Merge pull request #570 from vector-im/feature/left_group ... Handle left group from sync	2019-09-20 17:44:13 +02:00
Benoit Marty	9794b3a49d	Fix compilation issue of F-Droid build	2019-09-20 17:35:10 +02:00
Benoit Marty	b3e1c3969d	Little changes after review	2019-09-20 17:34:50 +02:00
ganfra	90eeb68d36	Timeline: fix permalink towards an hidden event	2019-09-20 17:22:04 +02:00
ganfra	d1ff3314a7	Timeline : add badge on jump to bottom view	2019-09-19 19:12:45 +02:00
Benoit Marty	f24bed17a2	Add missing issue number	2019-09-19 17:56:34 +02:00
Benoit Marty	a993a30203	Handle left group from sync	2019-09-19 17:08:22 +02:00
ganfra	ea0809ff87	Merge branch 'develop' into feature/read_marker	2019-09-19 16:57:00 +02:00
ganfra	9668487b6b	Timeline/Read: update read receipt locally to	2019-09-19 16:17:58 +02:00
Benoit Marty	91cc78d2ad	Merge pull request #552 from vector-im/feature/draft ... Save draft of a message when exiting a room with non empty composer (#329)	2019-09-19 13:11:35 +02:00
Benoit Marty	562acc9702	Save Draft only when app goes to background.	2019-09-19 13:09:08 +02:00