1873 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
ganfra	cbdbe5033f	Merge pull request #664 from vector-im/feature/room_list_actions ... Feature/room list actions	2019-11-07 15:45:45 +01:00
ganfra	61ac250e2b	Merge branch 'develop' into feature/room_list_actions	2019-11-07 15:43:21 +01:00
ganfra	04f72dfcb8	Clean code after Benoit's review	2019-11-07 15:19:12 +01:00
Benoit Marty	10ca5d94ea	Fix issue after rebase	2019-11-07 14:29:08 +01:00
Benoit Marty	c5b8c69ae5	Merge pull request #668 from vector-im/feature/block_user ... Block user and display ignored users list	2019-11-07 14:28:23 +01:00
Benoit Marty	d3d7f7cc61	Split long lines	2019-11-07 14:18:57 +01:00
Benoit Marty	b6bb714264	Display name and avatar of the user	2019-11-07 14:18:57 +01:00
Benoit Marty	a87310ac15	update comment	2019-11-07 14:18:57 +01:00
Benoit Marty	032e1b3d19	ktlint	2019-11-07 14:18:57 +01:00
Benoit Marty	d9f15c1d21	Block user possibility after reporting event content	2019-11-07 14:18:57 +01:00
Benoit Marty	99d09f71ad	Changelog	2019-11-07 14:18:57 +01:00
Benoit Marty	9c952b6bc8	Display ignored users list	2019-11-07 14:18:57 +01:00
Benoit Marty	fbae3d27c2	Ignore/Unignore userIds	2019-11-07 14:13:29 +01:00
Benoit Marty	2f7d1f9f01	Ignored Users account data	2019-11-07 14:13:29 +01:00
Benoit Marty	114101699d	Fix potential ignoring of account data (return@foreach)	2019-11-07 14:13:29 +01:00
Benoit Marty	f5c0dcb5ea	Merge pull request #670 from vector-im/feature/fragment_factory ... Feature/fragment factory	2019-11-07 13:59:46 +01:00
Benoit Marty	241220ce1f	remove unused import	2019-11-07 13:59:21 +01:00
Benoit Marty	98d97e574c	Fix regression when filtering emojis	2019-11-07 12:23:21 +01:00
Benoit Marty	96e610970a	Finish the work	2019-11-07 12:08:17 +01:00
Benoit Marty	2027802f82	Add debug screen for all SAS emoji	2019-11-07 10:37:49 +01:00
ganfra	54f93db632	RoomDetail : enter/exit special mode without waiting for draft to update	2019-11-06 20:08:19 +01:00
ganfra	3af7ca9ab0	Retrofit: lazy init okhttp	2019-11-06 20:07:28 +01:00
ganfra	93ef3edab3	Remove some use of sync write in realm	2019-11-06 18:47:11 +01:00
Benoit Marty	c85852262e	Remove bad value	2019-11-06 18:28:16 +01:00
Benoit Marty	d0c3271628	Import string from Riot-Android and fix #671	2019-11-06 18:19:37 +01:00
ganfra	ad9a48d5fa	Clean code	2019-11-05 18:36:30 +01:00
ganfra	219d1383e5	Fragments: use FragmentContainerView	2019-11-05 18:13:55 +01:00
ganfra	8871280fab	Fragments: use constructor injections in most of the Fragments	2019-11-05 18:12:04 +01:00
Benoit Marty	fb3e953e28	Merge pull request #667 from vector-im/feature/realm_cleanup ... Import change form https://github.com/matrix-org/matrix-android-sdk/pull/505	2019-11-05 12:13:25 +01:00
Benoit Marty	10712fd6ab	ktlint	2019-11-05 12:13:06 +01:00
Benoit Marty	9d478dbfe2	Import change form https://github.com/matrix-org/matrix-android-sdk/pull/505	2019-11-05 11:18:22 +01:00
ganfra	3013d67c16	Fragment factory: start including the new version with FragmentFactory [WIP]	2019-11-04 19:33:56 +01:00
Benoit Marty	bee8c2d159	Ensure color is retrieved from current theme, even when theme change	2019-11-04 18:12:24 +01:00
ganfra	945e5d5a74	Merge branch 'develop' into feature/room_list_actions	2019-11-04 17:17:43 +01:00
ganfra	93df8c56a8	Fix compilation error and use mockk instead of manual mocking (prone to error)	2019-11-04 17:09:03 +01:00
Benoit Marty	cd1a964067	Merge pull request #649 from vector-im/feature/spoiler_support ... Support spoilers in messages	2019-11-04 16:54:43 +01:00
Benoit Marty	e4b829f0cf	Lift of 'return'	2019-11-04 16:53:51 +01:00
Benoit Marty	7206d84a6b	Add FIXME	2019-11-04 16:51:45 +01:00
Benoit Marty	b3233d3eb7	Change spoiler bg colors	2019-11-04 16:50:32 +01:00
Valere	3c4c0ed46a	Add /spoiler command	2019-11-04 16:50:32 +01:00
Valere	24f1262005	Merge refactoring	2019-11-04 16:49:53 +01:00
Benoit Marty	86667a6d8a	Passes text color instead of context	2019-11-04 16:49:53 +01:00
Benoit Marty	42e0d0f769	Improve code to check url validity	2019-11-04 16:49:53 +01:00
Valere	e976055253	Support spoilers in messages	2019-11-04 16:49:53 +01:00
Benoit Marty	84d6c8ec16	Merge pull request #646 from vector-im/feature/search_reaction ... Search reaction by name/keywords	2019-11-04 15:51:24 +01:00
Benoit Marty	9fdfd091ac	Merge branch 'develop' into feature/search_reaction	2019-11-04 15:51:16 +01:00
ganfra	e66766f41c	Update CHANGES	2019-11-04 15:12:30 +01:00
ganfra	6177e69855	Merge branch 'develop' into feature/room_list_actions	2019-11-04 15:11:20 +01:00
ganfra	5c71cabb5f	Clean code	2019-11-04 15:08:08 +01:00
ganfra	6ebe5532c5	Room list actions: use new strings	2019-11-04 14:59:12 +01:00