Commit Graph

2137 Commits

Author SHA1 Message Date
SpiritCroc c2e1a33864 Merge commit '67fc2feacb8e2563cc25f61ed6da48cb4de57ed7' into sc
Merge v1.0.5 pt. 1

Conflicts:
	vector/src/main/java/im/vector/riotx/features/settings/VectorPreferences.kt
	vector/src/main/res/layout/fragment_login_server_selection.xml
	vector/src/main/res/values/theme_dark.xml
	vector/src/main/res/values/theme_light.xml
2020-08-22 09:52:54 +02:00
SpiritCroc 72d2b1c9f1 Exclude state-events from room summaries and unread indicators
Related issue:
https://github.com/vector-im/element-android/issues/588
2020-08-15 17:13:20 +02:00
Benoit Marty 8cc12fb8d4 Only one token per request is possible so use `header` instead of `addHeader` 2020-08-03 17:33:24 +02:00
Benoit Marty 4cbb2f7d9d Cleanup 2020-08-03 17:33:24 +02:00
Benoit Marty 18c0f53764 Format 2020-08-03 17:33:24 +02:00
SpiritCroc 9f7bf14a22 Merge tag 'v1.0.3' into sc
1.0.3

Conflicts:
	vector/build.gradle
	vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewModel.kt
	vector/src/main/res/layout/fragment_login_server_selection.xml
	vector/src/main/res/layout/fragment_login_splash.xml
	vector/src/main/res/layout/item_login_header.xml
	vector/src/main/res/values/strings.xml
	vector/src/main/res/values/styles_login.xml
2020-07-31 11:22:57 +02:00
Valere 562cfce9e2 Support HS admin option to disable E2EE for DMs
Fixes #1794
2020-07-30 12:08:30 +02:00
Valere 5c32c7388a cleaning 2020-07-29 09:51:50 +02:00
Valere cbf43ea7b3 Session store migration 2020-07-29 09:50:12 +02:00
Valere a47ff99be7
Merge branch 'develop' into feature/fix_reply_tag 2020-07-28 16:58:00 +02:00
ganfra 5176a3e2aa
Merge branch 'develop' into feature/fix_timeline_loading 2020-07-28 16:30:34 +02:00
Valere 12e2a8ffc8 Allow call in all 2 participants rooms 2020-07-28 14:43:50 +02:00
SpiritCroc f28c43051a Add german translation missing for screenshot 2020-07-28 13:53:15 +02:00
ganfra 833f64fcec Fix timeline non loading when there are lots of filtered events 2020-07-28 11:49:45 +02:00
ganfra da06695ab7 Relation content should be checked in encrypted content and not the decrypted one 2020-07-24 18:31:01 +02:00
ganfra d7b44ba0cf
Merge branch 'develop' into feature/fix_reply_tag 2020-07-24 11:32:59 +02:00
ganfra 794b89c041 Reply: remove inner tags when replying 2020-07-23 18:23:49 +02:00
ganfra cac8099117 Local echo: use missing updateSendingInformation on RoomSummaryUpdater 2020-07-23 16:38:17 +02:00
ganfra aa5ae45a0c Add hasFailedSending in RoomSummary and a small warning icon on room list 2020-07-22 15:21:48 +02:00
ganfra d7558902f7 Sending: limit to 3 retry before failing 2020-07-22 11:12:37 +02:00
ganfra e5596f6a97 Use Any instead of JsonDict so users won't loose ignored users 2020-07-21 10:43:52 +02:00
ganfra fb247f8bea Update CHANGES and clean code 2020-07-20 20:29:52 +02:00
ganfra c880e2b848 Fix Requesting avatar thumbnails in Element uses wrong http "user-agent" string #1725 2020-07-20 20:24:04 +02:00
ganfra 1436477a14 Rework a bit user account data (and avoid blocking syncs) 2020-07-20 19:52:24 +02:00
ganfra a488e88f93 Add reaction to RoomSummary latest previewable event 2020-07-20 16:49:05 +02:00
ganfra 0d51c160eb Should fix realm crash loop 2020-07-20 16:43:39 +02:00
ganfra 27207a27ae Fix "uploads don't work with Room v6" #1558 2020-07-17 20:33:47 +02:00
SpiritCroc 969f3202de Fix db upgrade from previous version 2020-07-17 16:23:36 +02:00
Benoit Marty 0f9e26efc5 let instead of also 2020-07-15 14:33:01 +02:00
Onuray Sahin 797dcdb48b Merge branch 'riotx_develop' into rebranding_rebase
* riotx_develop: (111 commits)
  Video calls are shown as a voice ones in the timeline (Fixes #1676)
  Fix regression: not able to create a room without IS configured (Fixes #1679)
  Fix / view attachment crash + freeze when offline
  Version++
  Prepare release 0.91.5
  Fix test compilation issue
  Fix crash after rebase
  Add TODO
  Copy Javadoc to the API class
  Move internal methods to internal task
  Latest renaming
  Rename CreateRoomParamsInternalBuilder to CreateRoomBodyBuilder for clarity
  Rename CreateRoomParamsBuilder to CreateRoomParams for clarity
  Rename internal class
  Expose other objects in the builder to create a room
  ktlint
  Display threePid invite along with the other invite (code is a bit dirty)
  Hide right arrow if threepid invite can not be revoked
  Disable fetching Msisdn, it does not work
  Revoke ThreePid invitation (#548)
  ...

# Conflicts:
#	vector/build.gradle
#	vector/src/main/java/im/vector/riotx/features/crypto/keys/KeysExporter.kt
#	vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml
#	vector/src/main/res/values/strings.xml
2020-07-13 19:59:20 +03:00
Benoit Marty 0e28214b63 Do not display the name change popup for a new installation 2020-07-13 14:23:06 +02:00
Benoit Marty 6a4d887941
Merge branch 'develop' into feature/other_fixes 2020-07-13 11:31:25 +02:00
Benoit Marty 139cd051ab Video calls are shown as a voice ones in the timeline (Fixes #1676) 2020-07-13 10:57:52 +02:00
Benoit Marty 33b2abc3b9 Fix regression: not able to create a room without IS configured (Fixes #1679) 2020-07-13 10:46:51 +02:00
Benoit Marty aba8a3fed1 Fix test compilation issue 2020-07-11 22:49:29 +02:00
Benoit Marty ece9fbd3bb Add TODO 2020-07-11 22:26:21 +02:00
Benoit Marty 602d67155f Copy Javadoc to the API class 2020-07-11 22:25:21 +02:00
Benoit Marty 75ef491e3e Move internal methods to internal task 2020-07-11 22:22:21 +02:00
Benoit Marty 0f327fc75f Latest renaming 2020-07-11 22:17:55 +02:00
Benoit Marty a456f4c6a5 Rename CreateRoomParamsInternalBuilder to CreateRoomBodyBuilder for clarity 2020-07-11 22:16:35 +02:00
Benoit Marty e097bd8117 Rename CreateRoomParamsBuilder to CreateRoomParams for clarity 2020-07-11 22:15:26 +02:00
Benoit Marty ded8acc836 Rename internal class 2020-07-11 22:13:22 +02:00
Benoit Marty d8a0a1d38e Expose other objects in the builder to create a room 2020-07-11 22:11:15 +02:00
Benoit Marty e8f28d7ce4 ktlint 2020-07-11 22:11:15 +02:00
Benoit Marty 4b3a6a883d CreateRoomParams has been replaced by CreateRoomParamsBuilder, to be able to invite 3pids 2020-07-11 22:10:52 +02:00
Benoit Marty 6c0bb2a949 Add 3Pid to the list. Not compiling, I have to modify CreateRoomParam 2020-07-11 22:08:02 +02:00
Benoit Marty 3842ec6bb0 Invite by msisdn. Error 500 from matrix.org though (#548) 2020-07-11 22:07:14 +02:00
Benoit Marty ab1d652f17 Invite by email (msisdn not working), command line (#548) 2020-07-11 22:07:14 +02:00
Benoit Marty 70e90d8542 Render third party invite event (#548) 2020-07-11 22:07:14 +02:00
Benoit Marty 37378ca5a6 typo 2020-07-11 21:57:45 +02:00