1815 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Valere	1b394527b6	cleaning + code review	2019-08-28 10:22:51 +02:00
Valere	a8f1388721	Merge pull request #520 from vector-im/feature/read_receipts_511 ... Improve read receipt design	2019-08-28 10:17:56 +02:00
Valere	166be4e289	Improve read receipt design	2019-08-28 09:56:10 +02:00
Valere	b49ccefe63	Merge pull request #521 from vector-im/feature/fix_dome_video_wont_play ... Some video won't play	2019-08-28 03:43:35 -04:00
Valere	825760d17e	Fix / regression on e2e reply and edit of reply	2019-08-27 17:05:04 +02:00
Valere	b5af62c3ea	Some video won't play ... VideoView fails to play some remote uri video on some device. For now video is downloaded locally in internal cache then played. This offers basic support before full media preview implementation	2019-08-27 16:50:02 +02:00
Valere	a51d96bf00	Merge pull request #325 from vector-im/feature/non_unicode_reaction ... Accept non unicode reactions	2019-08-27 08:10:51 -04:00
Valere	7e142d201d	Use EmojiCompat to build EmojiSpans from text	2019-08-27 11:06:52 +02:00
Valere	2be6058971	accept non unicode reactions	2019-08-27 10:58:21 +02:00
Valere	49d73f360e	Merge pull request #494 from vector-im/feature/fix_441 ... Fix text diff removed linebreak	2019-08-27 04:36:03 -04:00
Valere	bd88d85a21	Merge branch 'develop' into feature/fix_441	2019-08-27 04:35:17 -04:00
Valere	be4fc5cce6	Merge pull request #493 from vector-im/feature/fix_358 ... Date change message repeats for each redaction until a normal message	2019-08-27 04:34:35 -04:00
Valere	704da1be55	Merge branch 'develop' into feature/fix_358	2019-08-27 04:34:24 -04:00
Valere	5d002532d3	Merge pull request #495 from vector-im/feature/fix_423 ... Slide-in reply icon is distorted	2019-08-27 04:22:02 -04:00
Valere	d4161e9a1a	Fix text diff removed linebreak	2019-08-27 10:17:42 +02:00
Valere	7966ebef03	Date change message repeats for each redaction until a normal message	2019-08-27 10:16:11 +02:00
Valere	ed5faca5d2	Slide-in reply icon is distorted	2019-08-27 10:06:20 +02:00
ganfra	51a4c93676	Read markers: continue working on ui	2019-08-23 16:54:32 +02:00
ganfra	d8f449388c	Read marker: start working on it (no UI)	2019-08-20 18:30:24 +02:00
Benoit Marty	8ca829d538	An error was displayed by mistake	2019-08-19 17:22:04 +02:00
ganfra	e7819ce678	Merge pull request #496 from vector-im/feature/di_clean ... Dagger clean	2019-08-19 16:41:50 +02:00
ganfra	5402902bc2	Merge branch 'develop' into feature/di_clean	2019-08-19 15:04:26 +02:00
ganfra	bc1350aaf5	Merge pull request #484 from vector-im/feature/timeline_read_receipts ... Feature/timeline read receipts	2019-08-19 14:29:59 +02:00
ganfra	fd74e3dfb1	Read receipts: clean code after review	2019-08-19 14:08:15 +02:00
ganfra	e0628da1cb	Dagger: use AssistedInjectModule for viewModel + use AssistedFactory for room dependencies	2019-08-14 19:09:56 +02:00
Benoit Marty	aa4e74e986	Merge pull request #487 from vector-im/feature/fix_ui_issues ... Feature/fix ui issues	2019-08-14 18:20:08 +02:00
Benoit Marty	6cc0c0672e	Merge pull request #474 from vector-im/feature/dev_suffix ... Automatic "-dev" version suffix on non master branch	2019-08-14 18:15:44 +02:00
ganfra	501474b720	Fix code quality issues	2019-08-14 14:53:40 +02:00
ganfra	e11c66035c	Theme: the action menu text items should use colorAccent	2019-08-14 14:19:21 +02:00
ganfra	3d2d219d79	Room list: let the fab animation be quicker	2019-08-14 14:18:56 +02:00
ganfra	63af03bedd	List: add overScroll	2019-08-14 14:18:42 +02:00
ganfra	d3827b8673	Read receipts: branch settings to show/hide them	2019-08-14 10:51:09 +02:00
Benoit Marty	4ca2531e47	develop branch will have version code from timestamp, to ensure each build from CI has a incremented versionCode ... Other branches (master, features, etc.) will have version code based on application version.	2019-08-14 10:45:17 +02:00
ganfra	4e8dc72439	Update CHANGES	2019-08-13 15:17:04 +02:00
ganfra	25a4240a5a	Merge branch 'develop' into feature/timeline_read_receipts	2019-08-13 15:16:10 +02:00
ganfra	b9cfda23b6	Read receipts: just juste invisible on hidden avatars, to have a bigger touch zone	2019-08-13 15:06:00 +02:00
ganfra	06dcf75a32	Read receipts: fix not appearing RR	2019-08-13 12:06:49 +02:00
ganfra	21deb2551d	Read receipts: handle read receipts set on filtered events + let BottomSheet takes a snapshot instead of being live.	2019-08-12 17:59:07 +02:00
ganfra	70639f180c	Read receipts: add read receipts bottom sheet	2019-08-08 19:59:20 +02:00
ganfra	1dbb02a80d	Read receipts: create custom view to use it wherever we want easily	2019-08-08 17:51:06 +02:00
ganfra	825463d9cd	Change package for NotificationAreaView	2019-08-08 17:50:33 +02:00
ganfra	c313ce78cb	Read receipts: sort descending by timestamp	2019-08-08 17:49:50 +02:00
ganfra	39f58d048b	Read receipts: fix dummy being overrided	2019-08-08 17:49:31 +02:00
Benoit Marty	3f792c7a84	Automatic "-dev" version suffix on non master branch	2019-08-08 16:57:03 +02:00
Benoit Marty	347dcb469a	Version++	2019-08-08 16:47:13 +02:00
Benoit Marty	9cd69d1e33	Merge branch 'release/0.3.0'	2019-08-08 16:45:03 +02:00
Benoit Marty	79fb1985aa	Merge branch 'release/0.3.0' into develop	2019-08-08 16:45:02 +02:00
Benoit Marty	e216cd15a8	Prepare release 0.3.0	2019-08-08 16:44:53 +02:00
Benoit Marty	37fde374b3	Merge pull request #469 from vector-im/feature/versionCode_auto ... Ensure versionCode is the wanted one for GPlay and F-Droid build	2019-08-08 16:32:10 +02:00
Benoit Marty	f7b471f141	Stop using BuildConfig.VERSION_CODE, it is not the correct value	2019-08-08 16:31:45 +02:00