23694 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Benoit Marty	c3d945d6bb	Version++	2019-07-18 17:48:56 +02:00
Benoit Marty	df6080b1da	Merge branch 'release/0.2.0'	2019-07-18 17:47:39 +02:00
Benoit Marty	4c128602b2	Merge branch 'release/0.2.0' into develop	2019-07-18 17:47:39 +02:00
Benoit Marty	d609c49b31	Prepare release 0.2.0	2019-07-18 17:47:24 +02:00
ganfra	001603cf9a	Create direct room: add filtering and enhance design a bit	2019-07-18 17:42:22 +02:00
Valere	d87ee32422	Merge pull request #384 from vector-im/feature/edit_e2e ... Feature/edit e2e	2019-07-18 16:44:44 +02:00
Benoit Marty	f0671b9e73	"Riot X" -> "RiotX"	2019-07-18 14:28:46 +02:00
Benoit Marty	e218691bf2	Import strings and translation from Riot	2019-07-18 14:25:34 +02:00
Valere	9c67036c08	Fix / keyboard won't show when using reply from long tap menu	2019-07-18 12:13:17 +02:00
ganfra	62657538af	Merge pull request #389 from vector-im/feature/cleanup ... Do not show invitation in the filtered room list	2019-07-18 12:10:47 +02:00
Valere	5438207fba	faster animation for quick reply	2019-07-18 12:01:23 +02:00
Benoit Marty	fe88aaffbd	Inject RoomListNameFilter	2019-07-18 11:39:13 +02:00
Benoit Marty	21ba72e5e7	Do not show invitation in the filtered room list	2019-07-18 11:34:49 +02:00
Benoit Marty	d48ae967bd	Remove dead code	2019-07-18 11:11:42 +02:00
Benoit Marty	0afde3b021	Rename class member for code clarity	2019-07-18 11:07:09 +02:00
Benoit Marty	49ae954183	Merge remote-tracking branch 'origin/develop' into develop	2019-07-18 10:58:40 +02:00
Benoit Marty	64bee91f7a	Merge pull request #387 from vector-im/feature/fix_sync_state ... Fix sync state progress bar	2019-07-18 10:57:46 +02:00
ganfra	4341b0d0f5	Merge branch 'develop' into feature/create_direct_room	2019-07-18 09:47:25 +02:00
Valere	51fdccb393	cleaning	2019-07-18 09:29:27 +02:00
ganfra	7e3b300130	Fix sync state progress bar	2019-07-17 19:45:35 +02:00
Benoit Marty	a98b324c89	Merge pull request #385 from vector-im/feature/invit_notif ... Cancel invitation notification when handling the invitation in the application	2019-07-17 18:39:40 +02:00
Benoit Marty	977721881f	Cancel invitation notification when handling the invitation in the application	2019-07-17 18:35:41 +02:00
ganfra	838003b68a	Create direct room: start creating all the required stuff	2019-07-17 18:30:14 +02:00
Valere	7d41352918	Fix / edit reply was quoting wrong text ... + e2e reply of edit	2019-07-17 16:46:56 +02:00
Valere	077396a832	E2E replies ... + Edit History / support e2e and use original event	2019-07-17 16:20:12 +02:00
Benoit Marty	32b79bd50e	Remove extra space around userId	2019-07-17 15:13:12 +02:00
Benoit Marty	844f6d16a4	Code quality	2019-07-17 15:05:29 +02:00
Benoit Marty	fc9ef579ca	Merge pull request #381 from vector-im/feature/room_members_perf ... Feature/room members perf	2019-07-17 15:01:06 +02:00
Benoit Marty	77fa5af1b8	Fix compilation issue after merge	2019-07-17 14:58:23 +02:00
ganfra	2948018453	Clean code after review	2019-07-17 14:56:00 +02:00
Benoit Marty	90d25ff45e	Code cleanup	2019-07-17 14:41:01 +02:00
Benoit Marty	173452d38c	Merge pull request #367 from Dominaezzz/kotlinify-3 ... Some more kotlinification.	2019-07-17 14:38:16 +02:00
Benoit Marty	a9f9083745	Merge pull request #374 from vector-im/feature/quick_fix_long_click_link ... WIP / Fix Copying link from a message shouldn't open context menu	2019-07-17 14:37:11 +02:00
Valere	22dc2a6790	Fix Copying link from a message shouldn't open context menu	2019-07-17 14:36:47 +02:00
Benoit Marty	927cd7285d	Merge pull request #378 from vector-im/feature/fix_sync_thread_wrong_autostart ... Fix / SyncThread was started in background	2019-07-17 14:32:19 +02:00
Benoit Marty	4d5bdecec6	Merge pull request #382 from vector-im/feature/better_long_tap_menu ... Feature/better long tap menu	2019-07-17 14:28:51 +02:00
Benoit Marty	0be987ac0d	Merge branch 'develop' into feature/better_long_tap_menu	2019-07-17 14:28:36 +02:00
Valere	4bfaa00be4	Fix / clean bad method name	2019-07-17 14:27:02 +02:00
Benoit Marty	8e78d8a58d	Merge pull request #380 from vector-im/feature/rs_crash_steve ... Fix a crash in notificationwhen display name is empty	2019-07-17 14:22:45 +02:00
Benoit Marty	e3e86c0a41	Merge pull request #383 from vector-im/feature/filter_params ... Pass filter to room directory screen or create room screen	2019-07-17 14:20:29 +02:00
Benoit Marty	8a5fddd952	Merge pull request #379 from vector-im/feature/small_fixes ... Fix bad View used for searching in room directory.	2019-07-17 14:19:37 +02:00
ganfra	208460850e	Dagger: activate incremental build	2019-07-17 14:16:20 +02:00
Benoit Marty	0ddef67cc9	Migrate to rxbinding 3 and fix bad layout for room directory filter (Fixes #349)	2019-07-17 14:16:20 +02:00
Benoit Marty	896e582a9c	Create style VectorSearchView	2019-07-17 14:16:20 +02:00
Benoit Marty	477920f411	Add some comment	2019-07-17 14:14:02 +02:00
Benoit Marty	c647648e79	Merge pull request #371 from vector-im/feature/composer_fix_edit_reply ... Feature/composer fix edit reply	2019-07-17 14:03:10 +02:00
Benoit Marty	b654025a3b	Fix alignment issue in toolbars	2019-07-17 12:38:35 +02:00
Benoit Marty	786a7d7560	Rename id	2019-07-17 12:20:11 +02:00
Benoit Marty	b935b9311e	Scroll the list to top after each new filter	2019-07-17 12:18:45 +02:00
Benoit Marty	8e12f71535	Add top left back button	2019-07-17 12:16:10 +02:00