997 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
ganfra	604de7eebc	Dagger: fix some merging issues	2019-06-28 09:35:34 +02:00
ganfra	f18bc9bd00	Dagger: fix no session	2019-06-27 19:12:46 +02:00
ganfra	f91959ea96	Merge branch 'develop' into feature/dagger	2019-06-27 18:57:49 +02:00
ganfra	2063a3e535	Merge branch 'develop' into feature/dagger	2019-06-27 18:56:23 +02:00
Benoit Marty	a1c22c9aa6	Remove useless property for a SDK	2019-06-27 18:25:50 +02:00
Valere	d5625b95fe	Fix / use senderId when display name cannot be resolved	2019-06-27 17:58:11 +02:00
Benoit Marty	d205f63928	Debounce click on room	2019-06-27 17:32:49 +02:00
Benoit Marty	bd8d6f92da	Update wording	2019-06-27 16:04:02 +02:00
Benoit Marty	f9c8e4f85a	Show disclaimer at first launch (Fixes #215)	2019-06-27 16:01:11 +02:00
ganfra	1fa7b7367a	Dagger: merge develop compiling now.	2019-06-27 15:25:01 +02:00
Valere	0765d6d1da	Fix / Action bottom sheet show preview for encrypted messages	2019-06-27 15:21:10 +02:00
Benoit Marty	f98f0e1a87	Merge pull request #232 from vector-im/feature/settings_v2_clean_notif ... Cleans notification pref screen	2019-06-27 14:12:12 +02:00
Valere	fb7ada72dd	Fix / register/unregister pusher	2019-06-27 14:08:54 +02:00
Valere	338de3ebf5	Cleans notification pref screen ... + fix troubleshoots	2019-06-27 12:21:38 +02:00
Benoit Marty	fb43c87107	Merge pull request #231 from vector-im/feature/fcm_privacy ... Upgrade firebase messaging version and disable Firebase Analytics	2019-06-27 11:55:19 +02:00
Benoit Marty	f092c40999	Merge pull request #228 from vector-im/feature/settings_v2 ... Split settings into sub sections	2019-06-27 11:54:03 +02:00
Benoit Marty	f414f46cba	General setting: avatar and display name	2019-06-27 11:53:28 +02:00
Benoit Marty	9ec364b60e	Merge pull request #226 from vector-im/feature/notification_beta ... Notification beta	2019-06-27 10:46:27 +02:00
Benoit Marty	ae7e617fdd	Rename and format and remove duplicate EventType.REDACTION	2019-06-27 10:46:04 +02:00
Benoit Marty	d1642c928a	Move specific classes for FDroid into FDroid variant source code	2019-06-27 10:46:04 +02:00
Benoit Marty	5e619f2593	Upgrade firebase messaging version and disable Firebase Analytics	2019-06-27 10:42:36 +02:00
Benoit Marty	679a4c7f31	Add ignored users icon in the root settings	2019-06-27 10:17:57 +02:00
Benoit Marty	76b890fe06	Merge pull request #230 from vector-im/feature/e2e_hint ... Change hint for encrypted room (fix #210)	2019-06-26 21:05:19 +02:00
ganfra	b2d2582e0f	Merge branch 'develop' into feature/dagger [WIP]	2019-06-26 20:58:46 +02:00
Valere	715b44ec79	Merge pull request #229 from vector-im/feature/update_icons ... Feature/update icons	2019-06-26 19:30:55 +02:00
Benoit Marty	25b7bf76bf	Change hint for encrypted room (fix #210)	2019-06-26 18:49:55 +02:00
Benoit Marty	b69940a5da	Hide some settings for notifications	2019-06-26 18:28:45 +02:00
Benoit Marty	28f2bb3ebd	Use im.vector.riotredesign.core.preference.VectorPreferenceCategory	2019-06-26 18:15:50 +02:00
Valere	6bf940bedf	Updated login logo	2019-06-26 18:09:42 +02:00
Benoit Marty	56fc223930	Add missing point in the interrogation point	2019-06-26 18:00:51 +02:00
Valere	3e00576230	New status bar notification icons	2019-06-26 17:55:07 +02:00
ganfra	6e7adaec59	Dagger: prepare for multi session [WIP]	2019-06-26 17:51:24 +02:00
Benoit Marty	9fd9124643	Disable some unimplemented pref	2019-06-26 17:43:36 +02:00
Benoit Marty	ad3d303405	Fix issue in notification preference	2019-06-26 17:37:03 +02:00
Benoit Marty	7c47c6a033	split preference (Kotlin)	2019-06-26 17:20:26 +02:00
Valere	33f17e4c5c	Quick Fix / DI crash when not logged in	2019-06-26 17:15:10 +02:00
Valere	289b2a4eb1	Launch icons update	2019-06-26 17:14:28 +02:00
Benoit Marty	e63f51821f	split preference (XML)	2019-06-26 15:26:08 +02:00
Benoit Marty	8370f4fc76	rename file	2019-06-26 15:05:07 +02:00
Benoit Marty	5feebeba01	Integrate new icons for preference root screen	2019-06-26 15:01:46 +02:00
Benoit Marty	0c0ef38b4f	Fix notification on FDroid	2019-06-26 13:32:55 +02:00
Benoit Marty	bec5ca1420	Merge pull request #213 from vector-im/feature/notification_alpha ... Riot X alpha - Notification phase 1	2019-06-26 13:30:22 +02:00
Benoit Marty	895f0f0079	Fix compilation issue on FDroid	2019-06-26 12:21:30 +02:00
Benoit Marty	134c2fcd42	Notification: Fix TestAccountSettings test	2019-06-26 12:19:54 +02:00
Benoit Marty	2625e11508	rename method	2019-06-26 12:19:54 +02:00
Benoit Marty	9fa3a75fb6	Notification: display room avatar	2019-06-26 12:19:54 +02:00
Benoit Marty	b388be93c8	Notification: better code	2019-06-26 12:19:54 +02:00
Benoit Marty	5a1242109d	Notification: display rooms and users' avatars	2019-06-26 12:19:54 +02:00
Benoit Marty	4f0ed402bf	Notification: cleanup	2019-06-26 12:19:54 +02:00
Benoit Marty	f6c500d120	Notification: dismiss all on sign out	2019-06-26 12:19:54 +02:00