5811 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Benoit Marty	762bfc4fcc	Merge pull request #2193 from vector-im/gradlew-update-6.6.1 ... Updates Gradle Wrapper from 5.6.4 to 6.6.1.	2020-10-01 14:44:55 +02:00
gradle-update-robot	39532fc2aa	Update Gradle Wrapper from 5.6.4 to 6.6.1. ... Signed-off-by: gradle-update-robot <gradle-update-robot@regolo.cc>	2020-10-01 00:53:05 +00:00
Valere	b6b73f2361	Merge pull request #2187 from vector-im/feature/forgot_pass_reset_all_4S ... Feature/forgot pass reset all 4 s	2020-09-30 18:22:48 +02:00
Benoit Marty	37d6a9b722	ktlint	2020-09-30 18:20:42 +02:00
Benoit Marty	2a2187196f	Merge pull request #2190 from vector-im/feature/utd_pagination ... Feature/utd pagination	2020-09-30 18:19:00 +02:00
Benoit Marty	881ebff015	Changelog and small improvement	2020-09-30 18:11:30 +02:00
ganfra	f0272fd283	UTD pagination: clean up and add developer settings to enable complete history	2020-09-30 17:56:50 +02:00
ganfra	0a0330a48c	UTD : when reaching UTD and invite state event, stop back pagination	2020-09-30 17:54:16 +02:00
Benoit Marty	c09d308df8	Merge pull request #2176 from vector-im/feature/fix_dm_wordings ... Wording differentiation for DM "chat" instead of "room"	2020-09-30 17:50:58 +02:00
Benoit Marty	482bb51640	More cleanup	2020-09-30 17:50:36 +02:00
Benoit Marty	ee56307ccc	No warning when cancelling the Reset of 4s	2020-09-30 16:47:34 +02:00
Benoit Marty	18950a6b46	Some cleanup	2020-09-30 16:36:17 +02:00
Valere	a4e163885d	Better rotation support	2020-09-30 16:17:28 +02:00
Benoit Marty	108a31eca3	Avoid long lines	2020-09-30 15:31:33 +02:00
Benoit Marty	7f26dbe260	Fix compil issue	2020-09-30 15:23:27 +02:00
Benoit Marty	5e2f65ab7a	Split long lines	2020-09-30 12:46:28 +02:00
Benoit Marty	c5459cdde4	Use RoomSummaryHolder if available	2020-09-30 12:39:36 +02:00
Benoit Marty	f58829130a	More cleanup	2020-09-30 12:30:21 +02:00
Benoit Marty	42a3a64b0d	Better way to get direct state of the room (using view state)	2020-09-30 12:26:25 +02:00
Benoit Marty	1986de36a6	Better wording for DM creation (note: this event is hidden in the timeline by default)	2020-09-30 12:12:44 +02:00
Benoit Marty	84202adc5b	Add braces to multiline if else	2020-09-30 11:54:23 +02:00
Benoit Marty	07446d2d41	Embedded if	2020-09-30 11:50:07 +02:00
Benoit Marty	14162ecaa0	Add missing case	2020-09-30 11:47:37 +02:00
Benoit Marty	2f054cd438	Fix mistake	2020-09-30 11:45:21 +02:00
Benoit Marty	b5311aa3df	Simple code	2020-09-30 11:42:07 +02:00
Valere	3642ca5b4a	cleaning	2020-09-30 11:05:06 +02:00
Valere	2908a5d345	Added first ui bootstrap test	2020-09-30 10:13:59 +02:00
Benoit Marty	d225fb7df0	Update Changelog	2020-09-30 10:08:26 +02:00
Onuray Sahin	5d18a7cc82	Lint fixes.	2020-09-30 10:07:20 +02:00
Onuray Sahin	07976988d9	Use RoomSummary to check if the room is direct.	2020-09-30 10:07:20 +02:00
Onuray Sahin	2a96b2c68e	Differentiate wordings for the room profile screen.	2020-09-30 10:07:20 +02:00
Onuray Sahin	3a9e6fa97f	Changelog added.	2020-09-30 10:07:20 +02:00
Onuray Sahin	24fcb3f58f	Differentiate wordings for direct rooms.	2020-09-30 10:07:20 +02:00
Benoit Marty	5beaa93437	Merge pull request #2162 from gradle-update/develop ... Add workflow for Update Gradle Wrapper Action.	2020-09-30 09:49:00 +02:00
Benoit Marty	415fb3a432	Merge pull request #2186 from vector-im/feature/bma_intent ... Finish what has been started on #1376: use Intent.ACTION_GET_CONTENT …	2020-09-30 09:48:10 +02:00
Valere	1e3bdd6a2e	Fix test	2020-09-29 18:00:15 +02:00
Cristian Greco	68907ff6c0	Merge remote-tracking branch 'upstream/develop' into develop	2020-09-29 17:40:55 +02:00
Valere	9f26d015ba	Update change log ... Fixes #2052	2020-09-29 17:07:56 +02:00
Valere	c20517599e	Add option to reset 4S if lost pass/key	2020-09-29 17:05:29 +02:00
Benoit Marty	0bb75eed1f	Finish what has been started on #1376: use Intent.ACTION_GET_CONTENT instead of Intent.ACTION_OPEN_DOCUMENT for other pickers	2020-09-29 16:41:55 +02:00
Benoit Marty	2b90f1395f	Merge pull request #1376 from dkanada/patch-1 ... Fix gallery intent for certain apps	2020-09-29 16:29:21 +02:00
Benoit Marty	51f225056c	Merge branch 'develop' into patch-1	2020-09-29 16:28:58 +02:00
Benoit Marty	7a494db40b	Merge pull request #2167 from vector-im/feature/ui_test ... Feature/ui test	2020-09-29 16:13:54 +02:00
Benoit Marty	487bbe42a9	Merge branch 'develop' into feature/ui_test	2020-09-29 16:13:44 +02:00
Benoit Marty	ab74f6c1a8	Merge pull request #2165 from vector-im/feature/timeline_scroll_opti ... Feature/timeline scroll opti	2020-09-29 16:11:57 +02:00
Benoit Marty	2def7f3910	PR Review	2020-09-29 16:10:54 +02:00
ganfra	11a4704161	Clean files and update CHANGES	2020-09-29 15:42:48 +02:00
ganfra	8bc0afa75e	Timeline: add glide preloading	2020-09-29 15:42:21 +02:00
ganfra	3f5b1083f3	Timeline: add a prefetch backward item	2020-09-29 15:42:21 +02:00
Benoit Marty	435724ffa9	Merge pull request #2182 from vector-im/feature/bma_hs_diag ... Create a script to help getting public information form any homeserver	2020-09-29 15:39:15 +02:00