147 commits

Author	SHA1	Message	Date
SpiritCroc	933a79527c	Increment version	2020-06-06 10:08:32 +02:00
SpiritCroc	8cf2a51588	Merge tag 'v0.21.0' into sc ... Conflicts: vector/src/main/java/im/vector/riotx/features/configuration/VectorConfiguration.kt vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsPreferencesFragment.kt vector/src/main/java/im/vector/riotx/features/themes/ThemeUtils.kt vector/src/main/res/layout/item_timeline_event_base.xml vector/src/main/res/layout/item_timeline_event_redacted_stub.xml	2020-06-05 16:28:18 +02:00
SpiritCroc	761580c930	Increment version	2020-05-29 15:01:10 +02:00
SpiritCroc	3b5c092759	Increment version	2020-05-28 11:12:28 +02:00
SpiritCroc	c755c5de0a	Merge tag 'v0.20.0' into sc	2020-05-28 09:26:11 +02:00
Benoit Marty	f0f3e8ddb9	Uploads: auto-review	2020-05-25 17:05:17 +02:00
Benoit Marty	0992e76800	Uploads: add screen - WIP	2020-05-25 16:54:08 +02:00
SpiritCroc	81ac31a044	Add own versioning	2020-05-16 12:37:56 +02:00
Benoit Marty	48e58967b2	Version++	2020-05-15 15:48:15 +02:00
SpiritCroc	ce48360022	Increase minSdk to 21 ... Allows to more easily use new mechanisms added in SDK 21. Additionally, sdk 19 is not supported either way: Caused by: java.lang.IllegalStateException: Expected Android API level 21+ but was 19 at okhttp3.internal.platform.AndroidPlatform.<clinit>(AndroidPlatform.kt:232)	2020-05-14 15:42:27 +02:00
SpiritCroc	f13a647a4b	Rebrand	2020-05-12 16:03:33 +02:00
Benoit Marty	6843ea113b	Version++	2020-05-04 16:06:41 +02:00
Benoit Marty	9c8ff7de7f	Add Android test for EmojiDataSource	2020-04-28 14:15:50 +02:00
Onuray Sahin	8a4a288074	Merge branch 'develop' into feature/target-sdk-29	2020-04-08 14:15:02 +03:00
Valere	6474735662	Fix / devtools was not showing all json numbers	2020-04-03 10:31:44 +02:00
onurays	12429d8091	Merge develop into the branch.	2020-03-26 14:39:50 +03:00
Onuray Sahin	3bb5e127d6	Merge pull request #1155 from vector-im/feature/multipicker ... Multiple attachment picker implementation	2020-03-26 14:30:02 +03:00
onurays	c63f3edb06	Initial fixes to support targetSdk 29.	2020-03-26 12:06:50 +03:00
Valere	b56a41bec7	Custom alert design	2020-03-24 14:56:57 +01:00
onurays	f7fd23b153	App integration to the new multipicker library.	2020-03-23 16:31:32 +03:00
onurays	6db0de321c	Initial implementation of multipicker.	2020-03-20 12:12:59 +03:00
Valere	d3d6d44665	Post rebase fix	2020-03-17 14:40:05 +01:00
Valere	fc6225a7ac	Gossiping refactoring	2020-03-17 14:40:05 +01:00
Valere	20dbe2dd0d	version ++	2020-03-17 14:18:08 +01:00
Valere	78d90c8f04	prepare release 0.18.1	2020-03-17 11:46:42 +01:00
Valere	54eca7525e	Version ++	2020-03-11 16:24:49 +01:00
onurays	05683967c0	Code review fixes.	2020-03-06 12:07:38 +01:00
Benoit Marty	9bb4c7ed25	Version++	2020-02-27 12:34:33 +01:00
Benoit Marty	f8276e48e3	add kluent for test	2020-02-18 14:09:42 +01:00
Benoit Marty	13d3aa9ff1	Merge branch 'develop' into feature/attachment_process	2020-02-17 13:48:21 +01:00
Benoit Marty	db19ab0531	Merge branch 'develop' into feature/4s_msc1946	2020-02-14 17:45:44 +01:00
Benoit Marty	1660a0f846	Version++	2020-02-14 15:16:00 +01:00
Valere	61ea4191dc	Update json viewer lib	2020-02-14 10:48:18 +01:00
Valere	bf06b57bad	Refactor Account Data ... Auto stash before rebase of "develop"	2020-02-14 10:48:18 +01:00
Ganard	a26e959430	Attachements: introduce structure for preview, cropping and compressing	2020-02-13 19:51:20 +01:00
Benoit Marty	a7274b9df0	Version++	2020-02-10 21:41:59 +01:00
Ganard	e6cd8a3a86	Merge develop into feature/stabilization_2	2020-02-03 13:59:20 +01:00
Benoit Marty	5fb4f274f9	Version ++	2020-02-02 08:00:57 +01:00
Benoit Marty	435d8cbc55	Prepare v0.14.1	2020-02-02 07:55:46 +01:00
Benoit Marty	9e15891053	Version++	2020-02-01 17:21:41 +01:00
Benoit Marty	53e36dca9c	ZXing 3.3.3 because of https://github.com/zxing/zxing/issues/1170	2020-02-01 13:52:33 +01:00
Ganard	ec6d78bf96	Merge branch 'develop' into feature/stabilization_2	2020-01-31 15:47:33 +01:00
ganfra	9fc3fa7f19	Update some libs and remove incremental from dagger	2020-01-29 21:14:38 +01:00
Valere	109ff4f908	Merge branch 'cross_signing' into xsigning_sdk	2020-01-28 11:33:54 +01:00
Benoit Marty	c1259161e5	QRCode: generate and scan QRCodes	2020-01-22 15:03:56 +01:00
Benoit Marty	dca950140d	Merge branch 'develop' into feature/version_name	2020-01-22 11:45:27 +01:00
Benoit Marty	f5e6b4b857	F-Droid: fix the "-dev" issue in version name (#815)	2020-01-20 16:08:57 +01:00
Benoit Marty	8c32796d5c	Ensure builds are reproducible (#842)	2020-01-17 16:06:58 +01:00
Benoit Marty	d1699279fe	Version++	2020-01-17 14:25:25 +01:00
Benoit Marty	717965bc37	Update comment	2020-01-13 15:12:39 +01:00