5305 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Benoit Marty	0f1e348ac4	Merge pull request #2010 from vector-im/feature/fix_send_room_v6 ... Feature/fix send room v6	2020-08-27 18:14:58 +02:00
Benoit Marty	67bde947f9	Merge pull request #2009 from vector-im/feature/joining_room ... Feature/joining room	2020-08-27 18:11:42 +02:00
ganfra	28a1cf6982	Join room: clean up after benoit's remarks	2020-08-27 11:44:21 +02:00
ganfra	9c1c9f96e1	Room v6: finish cleaning up	2020-08-27 10:34:40 +02:00
ganfra	3c0177c2dd	Update CHANGES	2020-08-26 19:25:20 +02:00
ganfra	dc4135b506	Remove unnecessary code now we have an other way to keep number types	2020-08-26 19:21:41 +02:00
ganfra	cefdbe1d08	Add CheckNumberType in json to fix sending in room v6	2020-08-26 19:21:14 +02:00
Benoit Marty	95e80f0263	Merge pull request #2001 from vector-im/feature/mention_display_name ... Fix mention display name	2020-08-26 17:35:23 +02:00
Benoit Marty	013f51f0c4	Merge branch 'develop' into feature/mention_display_name	2020-08-26 17:35:16 +02:00
Benoit Marty	75911ba4c0	Merge pull request #2008 from vector-im/feature/sas_emoji ... Create a script to import SAS strings (#1909)	2020-08-26 17:34:43 +02:00
Benoit Marty	b3edc439cf	Merge pull request #1997 from vector-im/feature/switch_language ... Switch language and font size settings fixes	2020-08-26 17:34:26 +02:00
Benoit Marty	7ef08579ef	Merge branch 'develop' into feature/switch_language	2020-08-26 17:34:17 +02:00
ganfra	b39a86edbd	Merge branch 'develop' into feature/joining_room	2020-08-26 17:06:31 +02:00
ganfra	9c151417a8	Update CHANGES	2020-08-26 17:03:51 +02:00
ganfra	5d8d9cb19c	Clean files	2020-08-26 17:02:24 +02:00
ganfra	b986bfd509	Permalink: handle via parameters	2020-08-26 16:37:48 +02:00
Benoit Marty	28ae10a4aa	Merge pull request #2007 from vector-im/feature/icons ... Feature/icons	2020-08-26 16:04:36 +02:00
Benoit Marty	39fa7d850a	Merge branch 'develop' into feature/icons	2020-08-26 16:04:27 +02:00
Benoit Marty	25ea221d47	Create a script to import SAS strings (#1909) ... It will be run at the next Weblate sync, since we have to remove previous translations	2020-08-26 16:02:58 +02:00
Benoit Marty	a4e495edd3	Merge pull request #2006 from vector-im/feature/long_click ... Add long click gesture to copy userId, user display name, room name, …	2020-08-26 13:23:31 +02:00
Benoit Marty	8b009304ad	Merge pull request #2004 from vector-im/feature/fix_ucrop ... Increase version of uCrop library which supports Android 10.	2020-08-26 13:22:56 +02:00
Benoit Marty	249f268fb5	Fix bad color for settings icon on Android < 24 (#1786)	2020-08-26 12:55:49 +02:00
Benoit Marty	9f3f981ab0	Use cached Views	2020-08-26 12:54:01 +02:00
Benoit Marty	ef912e066b	Remove unused resource	2020-08-26 12:29:46 +02:00
Benoit Marty	d014872e3b	Add long click gesture to copy userId, user display name, room name, room topic and room alias (#1774)	2020-08-26 11:57:27 +02:00
Onuray Sahin	776d892d27	Increase version of uCrop library which supports Android 10.	2020-08-26 12:27:12 +03:00
ganfra	9970398cf2	Join room: add "UnknownItem" to public room list	2020-08-25 20:20:14 +02:00
Benoit Marty	a5f537f251	Merge pull request #1996 from johnjohndoe/file-extensions ... Use File extension functions to make code more concise.	2020-08-25 18:09:00 +02:00
Benoit Marty	6376ba2516	Improve wording (visible in debug screen)	2020-08-25 17:48:12 +02:00
Benoit Marty	5e0fc3e17f	Rename class	2020-08-25 17:34:43 +02:00
Benoit Marty	1a068ee191	Add more tests	2020-08-25 17:34:02 +02:00
Benoit Marty	8226f60fad	Refactor test to avoid duplicated code	2020-08-25 17:31:51 +02:00
Benoit Marty	2e618999d9	Words containing my name should not trigger notifications (Fixes #1781) ... It adds a specific behavior for rule with id RuleIds.RULE_ID_CONTAIN_USER_NAME	2020-08-25 17:26:54 +02:00
Benoit Marty	bf7a096a18	Refactor: Remove duplicated declaration for Actions	2020-08-25 17:01:55 +02:00
Benoit Marty	0d9885a1e0	Refactor: Remove duplicated declaration for RuleIds	2020-08-25 16:53:12 +02:00
Benoit Marty	aca8fd7f3d	Refactor: Kotlin style	2020-08-25 16:18:44 +02:00
Benoit Marty	f5ea4fb6ac	Refactor: Extract method to dedicated files	2020-08-25 16:15:42 +02:00
Benoit Marty	7b5c74f81c	Refactor: Condition is now an interface	2020-08-25 16:14:14 +02:00
Benoit Marty	558e11a364	Refactor: move Kind to its own file	2020-08-25 16:01:34 +02:00
ganfra	8f1eff8782	Start reusing RoomPreview for joining room not joined	2020-08-25 12:35:35 +02:00
ganfra	c1c8c04567	Room detail: Fix roomId not set up when activity is restored	2020-08-25 12:31:55 +02:00
Benoit Marty	cb7a1bc9c3	Fix FontSize issue (#1483, #1787)	2020-08-24 18:32:08 +02:00
Benoit Marty	52cf4d24d3	Fix switch language issue	2020-08-24 18:32:08 +02:00
Tobias Preuss	ed98613b2d	Use File extension functions to make code more concise. ... + This change replaces a few usages of ByteArrayInputStream, FileInputStream, FileOutputStream with their equivalent Kotlin extension functions.	2020-08-24 18:01:30 +02:00
Benoit Marty	116e6fb3c0	Call restart() extension	2020-08-24 15:50:47 +02:00
Benoit Marty	efa3aa5cf8	Stop using internal context of VectorLocal in CallHeadsUpActionReceiver...	2020-08-24 15:08:52 +02:00
Benoit Marty	69e9a79ac1	Inject StringProvider instead of Context	2020-08-24 14:49:42 +02:00
Benoit Marty	96cf5d2105	Cleanup: propoerly inject things to PushRulesFragment and move PushRulesController to its own file	2020-08-24 14:32:43 +02:00
Benoit Marty	f745e22a52	Merge pull request #1983 from vector-im/feature/live_display_name ... Make user displayName live in the setting, it should fix #1926	2020-08-24 13:43:08 +02:00
Benoit Marty	50495ef604	Improve algo	2020-08-24 11:12:19 +02:00