13225 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
Benoit Marty	785f33177d	Notification: open room and clear drawer - Smart reply - Mark as read - dismiss all	2019-06-26 12:19:54 +02:00
Benoit Marty	328f090723	Code quality: i18n	2019-06-26 12:19:54 +02:00
Benoit Marty	ce3242c748	Code quality: preference	2019-06-26 12:19:54 +02:00
Benoit Marty	71ae99012b	Code review and cleanup	2019-06-26 12:19:54 +02:00
Benoit Marty	ab0141a5c6	Fix issue after rebase	2019-06-26 12:19:54 +02:00
Valere	abb1c3f3c4	Fix / try to get edited message content first	2019-06-26 12:19:54 +02:00
Valere	1feb1f9c3f	Fix test	2019-06-26 12:19:54 +02:00
Valere	090ee1d4e9	Fix / ignore message sent by me in push rules	2019-06-26 12:19:54 +02:00
Valere	7821ca12fd	Fix / fetch from realm without copy (proxy error)	2019-06-26 12:19:54 +02:00
Valere	c01af6ac78	Stop notification using preference when disabled	2019-06-26 12:19:54 +02:00
Valere	74099be316	Remove / Add pusher from enable notif preference ... +Added Retrofit/Moshi null serializer for pusher kind	2019-06-26 12:19:54 +02:00
Valere	4e6b34b9d1	Fix issues on Notification Event resolver	2019-06-26 12:19:54 +02:00
Valere	6743dc6273	Set sync timeout to 30s when in foreground	2019-06-26 12:19:54 +02:00
Valere	288ebe48fd	Doc / quick fixes	2019-06-26 12:19:54 +02:00
Valere	9ae9830de4	Fix / compilation in gplay flavor	2019-06-26 12:19:54 +02:00
Valere	0584fc3666	Get real push rules from server and evaluate them	2019-06-26 12:19:54 +02:00
Valere	2e417a9143	Basic FCM vs fdroid mode	2019-06-26 12:19:54 +02:00
Valere	0e46fc4c0a	WIP	2019-06-26 12:19:54 +02:00
Benoit Marty	79735c6338	Introduce activity-alias for Launcher Activity	2019-06-26 12:16:05 +02:00
Valere	4505d13385	Fix / SAS verification infinite waiting on last step ... Missing state update to verified after mac verification	2019-06-26 10:46:58 +02:00
Valere	8fe0bd5abe	Merge pull request #214 from vector-im/feature/update_quick_reactions ... Feature/ Update quick reactions	2019-06-25 15:47:17 +02:00
Valere	98176b9760	Cleaning (code review)	2019-06-25 15:45:44 +02:00