863e199995
Update CHANGES.md to include the correct PR number
2021-03-15 01:33:46 +01:00
e8015bfbd4
Update emoji_picker_datasource.json to Unicode 13.1 and dynamically filter reactions by renderability
2021-03-15 00:20:59 +01:00
2708b85a20
Update CHANGES.md
2021-03-14 19:17:05 +01:00
857bfcb971
Cleanup
2021-03-12 12:18:21 +01:00
e8d4fab305
Add template for 1.1.2
2021-03-12 12:17:29 +01:00
8c24dd0fba
Add entry in changelog
2021-03-10 21:55:59 +01:00
5aa8b0255a
Fix MainActivity display ( Fixes #2927 )
2021-03-10 15:34:28 +01:00
8356d18a67
Improve Snackbar duration ( Fixes #2929 )
2021-03-10 14:49:52 +01:00
1fe8dfa810
Merge pull request #2978 from vector-im/feature/fga/send_queue_rework
...
Feature/fga/send queue rework
2021-03-10 09:27:21 +01:00
3c7a108940
Send: clean and update CHANGES
2021-03-09 18:18:28 +01:00
25ea1ba641
Fix issue with local echo
2021-03-09 14:08:33 +01:00
9719c0b2f9
Split init sync insertion into 2 transactions.
...
Ephemeral Events can be inserted later, so the room list can be displayed faster.
2021-03-05 09:47:57 +01:00
e5656e264a
Merge pull request #2940 from vector-im/feature/bma/various_fixies
...
Rework event edition management
2021-03-04 18:03:45 +01:00
e401252c03
Merge pull request #2956 from vector-im/feature/bma/scripts
...
Add a script to download and install APK from Buildkite
2021-03-04 14:01:30 +01:00
0b5135b841
Add a script to download and install APK from Buildkite
2021-03-03 20:37:19 +01:00
57df61dadf
Changelog
2021-03-03 14:55:45 +01:00
5c9750fb07
Moar cleanup after rebase and before merge
2021-03-02 19:18:19 +01:00
ae648c3e11
Make outbound key sharing strategy configurable.
2021-03-02 18:49:11 +01:00
d504a1f266
Merge pull request #2948 from vector-im/feature/bma/redactedEvent
...
Make Event.type optional
2021-03-02 18:06:11 +01:00
56af0b5191
Merge pull request #2947 from kafji/kfj/room-preview-tooltip
...
Add tooltip for room quick actions
2021-03-02 16:36:49 +01:00
4e2e73637a
Be robust if Event.type is missing ( #2946 )
2021-03-02 16:14:57 +01:00
3357c78375
Add tooltip for room quick actions
...
Add tooltip for low priority, favorite, and room settings quick actions.
Signed-off-by: Kafji <k@kafji.net>
2021-03-02 19:47:33 +07:00
33b3f0650c
Permit cleartext for .onion addresses
...
The Tor and Onion service protocols provide encryption and authentication
respectively. Since Domain Validation certificates aren't currently being
issued for .onion addresses, the HTTPS requirement makes Element practically
incompatible with homeservers operated by individuals on Tor.
Signed-off-by: Martin Häger <martin.haeger@gmail.com>
2021-03-02 12:46:12 +01:00
097668b762
Rework edition of event management - step 2
2021-03-01 20:42:47 +01:00
c152964323
Merge pull request #2908 from vector-im/feature/bma/jitsi_pip
...
PIP support for Jitsi call
2021-03-01 11:41:34 +01:00
60cc441092
Merge pull request #2905 from vector-im/feature/bma/preview_fix
...
Try to fix crash about UrlPreview (#2640 )
2021-02-23 16:07:16 +01:00
486815b9ab
Pip
2021-02-23 11:28:38 +01:00
29359ad119
Update change after rebase
2021-02-23 10:31:58 +01:00
c938795576
Read init sync to a file and split into smaller files to handle it
2021-02-23 10:31:19 +01:00
bebb956005
Try to fix crash about UrlPreview ( #2640 )
2021-02-22 17:44:11 +01:00
b38ff46af4
Merge pull request #2896 from vector-im/feature/bma/dependabot
...
Upgrade dependencies
2021-02-22 12:22:43 +01:00
ef3d8f365a
Changelog
2021-02-21 16:52:19 +01:00
80524fb8c1
Cleanup
2021-02-19 21:29:23 +01:00
e1f778e21a
Changelog
2021-02-19 21:28:44 +01:00
747a5ded1a
Version++
2021-02-19 21:10:27 +01:00
809c0e720e
Prepare release 1.1.0
2021-02-19 19:30:38 +01:00
1294d211d6
Merge branch 'develop' into feature/bma/fix_redirection
2021-02-19 14:43:01 +01:00
2df9b43abc
Make the code a bit easier to understand (no change)
2021-02-18 18:42:55 +01:00
fc1c2bc2c0
Merge pull request #2828 from vector-im/feature/bma/color_step_1
...
First step about color cleanup
2021-02-17 18:27:44 +01:00
0e322630f1
Ignore url override from credential if it is not valid ( #2822 )
2021-02-17 18:18:36 +01:00
6aa5dc992d
Migrate AuthenticationService API to coroutines ( #2449 )
2021-02-17 18:18:36 +01:00
9501fd74f0
Merge pull request #2826 from vector-im/feature/bma/fix_crash
...
Fix crash reported by PlayStore (#2707 )
2021-02-16 13:10:21 +01:00
3ac3f09df0
Merge branch 'develop' into feature/bma/lang
2021-02-16 11:40:24 +01:00
bec4af7c87
Fix crash reported by PlayStore ( #2707 )
2021-02-16 11:23:36 +01:00
b0ea7cecb5
Move all colors to the same file and rename it
2021-02-16 10:37:17 +01:00
cf0b4d2581
Merge branch 'develop' into feature/bca/devtools
2021-02-15 16:00:32 +01:00
7c865e1a26
changelog
2021-02-12 20:59:20 +01:00
ca09feb2e5
Merge branch 'develop' into feature/bma/room_settings_ux
2021-02-11 22:00:58 +01:00
bfa384ad5b
Merge pull request #2807 from vector-im/feature/bca/fix_404_initialize_xs
...
fix post initial sync crash on 404
2021-02-11 14:02:15 +01:00
c93fd2a05d
Merge pull request #2806 from vector-im/feature/bma/upgrade_jitsi
...
Upgrade jitsi
2021-02-11 13:58:05 +01:00
ebe9d42780
Also update the template year
2021-02-11 12:07:22 +01:00
7e2f892904
CHANGES.md: fix typos
...
- it's 2021
Signed-off-by: Maximillian Bensch <lorddavidiii@qi0.de>
2021-02-10 23:36:20 +01:00
ba24c30d38
Improve room profile UX
2021-02-10 17:32:36 +01:00
0957ff69c4
fix post initial sync crash on 404
2021-02-10 16:39:26 +01:00
1ec4424c0a
Upgrade Jitsi library from 2.9.3 to 3.1.0
2021-02-10 12:15:32 +01:00
e5da026f1f
Dev tools initial commit
2021-02-10 10:17:19 +01:00
aaeca96336
Merge branch 'develop' into feature/fga/voip_v1_start
2021-02-09 21:23:55 +01:00
08b65b57e4
Version++
2021-02-09 21:08:46 +01:00
a8086ceb43
Prepare release 1.0.17
2021-02-09 21:07:25 +01:00
f78c72db59
Merge branch 'develop' into feature/fga/voip_v1_start
2021-02-09 11:52:18 +01:00
fade21de57
Merge branch 'develop' into feature/bma/jitsi_in_timeline
2021-02-08 17:43:49 +01:00
0ed327646a
Merge branch 'develop' into feature/fga/voip_v1_start
2021-02-08 16:45:15 +01:00
eecb789603
Merge pull request #2765 from vector-im/feature/bma/big_e2e_rooms
...
[DANGEROUS PR] Properly delete all objects from Realm, avoid orphaned
2021-02-08 15:44:43 +01:00
d2c912e5c4
Merge branch 'develop' into feature/bma/url_preview_fixes
2021-02-08 14:32:55 +01:00
55f410636f
Merge pull request #2797 from vector-im/feature/bma/app_name
...
Change app name from "Element (Riot.im)" to "Element"
2021-02-08 14:26:25 +01:00
1212bb8d70
Change app name from "Element (Riot.im)" to "Element"
2021-02-08 12:39:35 +01:00
93890343b6
Merge pull request #2786 from vector-im/feature/bma/rtl
...
Feature/bma/rtl
2021-02-08 11:52:06 +01:00
07220d7a59
URL preview on reply fallback ( #2756 )
2021-02-07 15:28:07 +01:00
ed99b503f5
Open image from URL Preview ( #2705 )
2021-02-07 15:00:07 +01:00
d47ba6bd11
Create a WidgetItemFactory and use it for better rendering of Jitsi widget change (video conference)
2021-02-06 16:52:46 +01:00
d903dfb40b
Merge branch 'develop' into feature/bma/widget_url_robustness
2021-02-06 11:19:15 +01:00
41e4e823fb
HTML unescaping for URL preview ( #2766 )
2021-02-05 20:40:57 +01:00
407134a89f
RTL: some arrows should be rotated in RTL ( #2757 )
2021-02-05 19:56:39 +01:00
627d3b5b79
Merge branch 'develop' into feature/bca/fix_duplicate_thumbs
2021-02-05 18:48:56 +01:00
ad187f99bf
Merge pull request #2779 from vector-im/feature/bca/fix_join_by_alias_deferation
...
Join room other federation via alias error
2021-02-05 18:48:23 +01:00
5b3065730e
Widget: avoid empty user display name
2021-02-05 09:36:29 +01:00
6d5f89b65b
Fixes #2778
2021-02-04 18:06:35 +01:00
34fd5e7191
Upgrade build tools
2021-02-04 18:02:47 +01:00
6cd462f852
Merge branch 'develop' into feature/fga/voip_v1_start
2021-02-04 16:52:06 +01:00
64694a4eda
Fix duplicate thumbs reactions
2021-02-04 16:13:57 +01:00
d11ed8c4ef
Version++
2021-02-04 15:17:46 +01:00
e51f2b8bc1
Prepare release 1.0.16
2021-02-04 13:25:12 +01:00
3c06517d9e
Fix crash on API < 30 and light theme ( #2774 )
2021-02-04 12:32:13 +01:00
a65f846929
Version++
2021-02-03 17:09:32 +01:00
061f3c6919
Prepare release 1.0.15
2021-02-03 17:07:49 +01:00
bc22647b48
Merge pull request #2753 from vector-im/feature/bca/sso_reauth
...
Feature/bca/sso reauth
2021-02-03 16:12:54 +01:00
3b65761110
Delete on cascade
2021-02-02 21:23:57 +01:00
49aed39711
Fix multiple tasks
2021-02-02 17:11:45 +01:00
e6fc605b08
Data for Worker overload ( #2721 )
2021-02-02 11:40:52 +01:00
8129cd0cd3
Cleaning + changelog
2021-02-02 09:32:04 +01:00
9c9c1fa79c
VoIP: make some clean up and update CHANGES
2021-02-01 19:19:46 +01:00
06be3e691d
Support $matrix_widget_id parameter.
2021-02-01 18:13:26 +03:00
57dba2f29a
Merge branch 'develop' into feature/ons/fix_url_preview_on_edit
2021-01-25 16:05:26 +01:00
0a96841336
Merge branch 'develop' into develop
2021-01-22 17:20:36 +01:00
4dcd7846b0
Merge pull request #2616 from vector-im/feature/ons/android_11_migration
...
Migrate to Android 11, API 30.
2021-01-22 17:17:04 +01:00
883a7cecf0
Fix viewbinding npe crashes.
2021-01-22 15:34:40 +03:00
daf019b288
Identity: Recompute hashes after M_INVALID_PEPPER
...
When a new pepper is retrieved after an M_INVALID_PEPPER response,
recompute hashes with that pepper, and send those new hashes in the next
lookup attempt instead of reusing the original hashes.
Signed-off-by: Andrew Ferrazzutti <fair@miscworks.net>
2021-01-21 21:52:19 -05:00
5eeb545ae2
Update url preview when the event is edited.
2021-01-21 15:20:19 +03:00
277fc4bf61
Merge branch 'develop' into feature/bma/fix_clear_cache
2021-01-20 17:15:02 +01:00
4709002429
Fix clear cache issue: sometimes, after a clear cache, there is still a token, so the init sync service is not started.
...
Migratiing to supend methods fixes the problem, I'm not sure why...
2021-01-20 15:19:48 +01:00
f36bab0a7a
Limit drawer layout with max width.
2021-01-19 15:33:35 +03:00
2c0b7ce0f4
Dagger: update to 2.31 and use new AssistedInject
2021-01-15 15:23:24 +01:00
72ee1ace48
Version++
2021-01-15 11:14:59 +01:00
f0f0aafa1b
Prepare release 1.0.14
2021-01-15 11:13:36 +01:00
844fe2c4cd
Merge branch 'develop' into feature/bca/crypto_store_outbound
2021-01-14 10:43:38 +01:00
c88072e55f
Merge branch 'develop' into feature/bma/investigation
2021-01-14 10:38:56 +01:00
1f1eeccc32
Option to hide emoji keyboard is added.
2021-01-13 13:28:46 +03:00
7446b12827
Fix request too large Uri error when joining a room
2021-01-12 18:16:35 +01:00
5431584b3c
Merge pull request #2627 from vector-im/feature/bma/edit_power_level
...
Edit power level
2021-01-12 10:31:17 +01:00
ce92533525
Update CHANGES.md
...
No need to gender users :)
2021-01-09 00:39:24 +00:00
992edb2ee2
Merge branch 'develop' into feature/ons/fix_show_sending_image
2021-01-08 17:38:59 +01:00
e21c8792e6
Fix switch theme issue, and white field issue ( #2599 , #2528 )
...
Remove some workarounds. I cannot reproduce the bug of signout which does not destroy the HomeActivityViewModel...
2021-01-08 15:55:32 +01:00
d91ed2985d
Sync: fix initial sync is not retried correctly when there is some network error. [ #2632 ]
2021-01-08 12:42:36 +01:00
2d91865277
Merge pull request #2624 from vector-im/feature/bma/avoidEventBus2
...
Remove dependency to org.greenrobot.eventbus library
2021-01-08 10:04:38 +01:00
55f5f90c45
Use ContentResolver and DocumentFile instead of legacy File.
...
Fixes #409 .
2021-01-07 19:32:04 +03:00
bd3bdd6996
Merge pull request #2594 from vector-im/feature/ons/fix_room_topic_scroll
...
Disable scroll effect when click to a link in the topic.
2021-01-07 15:20:47 +01:00
c4a019f0d3
Edit room permissions ( #2471 )
2021-01-06 17:42:28 +01:00
963c30a275
Remove dependency to org.greenrobot.eventbus library
2021-01-05 18:56:24 +01:00
474ade01cf
Merge branch 'develop' into feature/ons/fix_room_topic_scroll
2021-01-05 15:08:15 +03:00
3a9b80127f
Warn user when he is leaving a not public room ( #1460 )
2021-01-05 11:46:59 +01:00
4ee34126bd
Persist outbound group session
2021-01-05 10:04:34 +01:00
4f59ec37ca
Tapping drawer having more than 1 room in notifications gives "malformed link" error ( #2605 )
2021-01-04 18:18:34 +01:00
23623b8895
Migrate to Android 11, API 30.
2021-01-04 17:12:49 +03:00
a7d8e74468
Merge pull request #2604 from vector-im/feature/ons/fix_hide_member_events
...
Feature/ons/fix hide member events
2021-01-04 10:48:22 +01:00
05013d2559
Fix changelog.
2020-12-30 12:17:25 +03:00
3240cadb94
Fix membership event visibility condition.
2020-12-30 12:08:27 +03:00
3ea3d0fc91
Unspecced msgType field in m.sticker ( #2580 )
2020-12-29 15:42:12 +01:00
17e8581ef0
Merge pull request #2597 from Tigermouthbear/develop
...
Add System theme option and set as default
2020-12-29 09:47:58 +01:00
3e78098c43
Add System theme option and set as default; closes #904 , closes #2387
2020-12-28 23:32:06 -05:00
cbdacc199a
Disable scroll effect when click to a link in the topic.
2020-12-28 17:17:01 +03:00
a755536a2f
Merge branch 'develop' into feature/ons/wait_members_before_sending_event
2020-12-21 12:41:24 +03:00
5744939c05
Merge pull request #2561 from SpiritCroc/url_preview_visibility
...
Properly hide preview URLs for messages that don't support previews
2020-12-20 20:40:19 +01:00
d5e76c515e
Enable URL-previews for notices
...
Desktop has those too.
2020-12-20 09:10:37 +01:00
9fcf7263b5
Properly hide preview URLs for messages that don't support previews
...
Notices and formatted messages don't have imageContentRenderer and
previewUrlRetriever set.
Accordingly, when recycling messages that previously had an URL preview,
we do not want to keep that preview, but actually hide it, instead of
returning early (without rendering any update).
2020-12-20 09:05:15 +01:00
7732bd47ce
Update Changelog after release
2020-12-18 16:01:39 +01:00
80396fcd39
Changelog added.
2020-12-18 16:00:32 +01:00
2b780a8b76
Merge pull request #2542 from vector-im/feature/bma/view_bindings
...
View bindings
2020-12-18 15:57:34 +01:00
0518e5f18d
Version++
2020-12-18 11:03:01 +01:00
d53650c8ae
Prepare release 1.0.13
2020-12-18 10:59:43 +01:00
3491774e7b
Add changelog
2020-12-17 12:09:53 +01:00
706736273c
Migrate to ViewBindings ( #1072 ) - WIP
2020-12-16 00:46:52 +01:00
6cdb192955
Version++
2020-12-15 14:18:35 +01:00
e230cd8ee3
Prepare release 1.0.12
2020-12-15 14:16:08 +01:00
7828e3f501
Merge pull request #2485 from vector-im/feature/ons/fix_hide_state_events
...
Fix UTD when hiding member state events.
2020-12-15 12:16:27 +01:00
7da8b13cde
Chat Effects
2020-12-15 09:39:16 +01:00
09040b7095
Clear history ( #1933 )
2020-12-14 16:22:22 +01:00
23e05200b5
Social login: cleanup
2020-12-14 14:13:36 +01:00
b321838502
Merge branch 'develop' into feature/ons/fix_hide_state_events
2020-12-14 12:03:49 +03:00
903936368d
Merge branch 'develop' into feature/bca/fix_mxto
2020-12-11 21:43:56 +01:00
5b74eb3bca
Merge branch 'develop' into feature/state_service_coroutines
2020-12-11 16:54:41 +01:00
989f1c6268
Merge branch 'develop' into feature/bma/url_preview
2020-12-11 15:39:20 +01:00
544345bbf3
Update change log
2020-12-11 15:16:10 +01:00
21271b6510
Do not compress GIFs ( #1616 , #1254 )
2020-12-11 11:22:36 +01:00
eb30b9fae9
Show preview when sending attachment from the keyboard ( #2440 )
...
It's actually a revert of a3b205b310
2020-12-11 11:22:36 +01:00
91c86c1a45
Merge branch 'develop' into feature/bma/url_preview
2020-12-11 09:47:57 +01:00
f2ba236130
Merge branch 'develop' into feature/bma/fix_span
2020-12-11 09:46:36 +01:00
4007982db6
Changelog added.
2020-12-10 12:59:09 +03:00
4bd538e448
Changelog and update comment
2020-12-09 12:49:25 +01:00
24a9ddaa5e
FileService: remove useless FileService.DownloadMode
2020-12-08 17:25:37 +01:00
dda2685bd8
Upgrade Realm dependency to 10.1.2
2020-12-08 13:45:30 +01:00
a0c8a8e97c
Log HTTP requests and responses in production (level BASIC, i.e. without any private data)
2020-12-08 13:44:42 +01:00
c7efd1feb9
Convert StateService to suspend functions
...
Signed-off-by: aqulu <dev@aqu.lu>
2020-12-08 19:21:10 +09:00
5237eb0638
Merge branch 'develop' into feature/bma/fix_cancel
2020-12-07 12:41:37 +01:00
2a19726e49
Cleanup and changelog
2020-12-04 14:19:24 +01:00
32b7cc64fb
Changelog added.
...
Fixes #2486
2020-12-03 16:19:37 +03:00
3e563a37a2
Rework: Make RawCacheStrategy class more generic, to use it for other SDK API
2020-12-03 13:43:04 +01:00
89a7ec6d4b
Use fragment-ktx and preference-ktx dependencies (fix lint issue KtxExtensionAvailable)
2020-12-02 12:46:15 +01:00
42bc4d2445
Upgrade some dependencies and Kotlin version
2020-12-02 12:09:56 +01:00
2cc5d46cd3
Merge pull request #2474 from vector-im/feature/bma/remove_status_theme
...
Remove Status theme
2020-12-02 11:43:23 +01:00
3feb67ad32
Merge pull request #2470 from vector-im/feature/ons/fix_text_input_cursor
...
Move cursor to the end to fix the jumping cursor bug.
2020-12-02 11:23:53 +01:00
aa6c7afbbd
Remove Status theme and handle migration or current status theme to light theme ( #2424 )
2020-12-01 16:20:11 +01:00
c785ea63e7
Update Change after release
2020-11-30 17:53:31 +01:00
a813610c04
Room setting: update join rules and guest access ( #2442 )
2020-11-30 17:52:16 +01:00
bb5d5ffc92
Improve room history visibility setting UX ( #1579 )
...
And observe correctly the state event
2020-11-30 17:43:28 +01:00
2736247d09
Move cursor to the end to fix the jumping cursor bug.
...
Fixes #2469
2020-11-30 18:12:26 +03:00
93ffb116b7
Merge pull request #2439 from vector-im/feature/bma/alias
...
Add room alias management
2020-11-30 14:59:21 +01:00
ffe9a03d3e
Merge branch 'develop' into feature/ons/change_pin
...
* develop:
Format source
Fix / double bottomsheet effect
Version**
Ensure the Activity is destroyed, it seems that the intent flags are not enough now. - finish all
Ensure the Activity is destroyed, it seems that the intent flags are not enough now.
Remove redundant returns
Prepare version 1.0.11
Fix issue when there is no display name
Cleanup
Fix issue with too big icons
Use style instead of duplicating the whole layout file
Try other asset strategy as lint not happy
Convert TermsService to suspend functions
Convert UploadsService to suspend functions
Convert IntegrationManagerService to suspend functions
update change log
Home empty screen design update
2020-11-30 13:14:13 +03:00
b2556cb293
Update change after release
2020-11-30 11:00:58 +01:00
90e0006cae
Room directory visibility management
2020-11-30 10:59:07 +01:00
cd983de058
Fix cancellation of sending event ( #2438 )
2020-11-30 10:08:31 +01:00
cf70916764
Fix / double bottomsheet effect
2020-11-28 00:41:29 +01:00
b84d7f0834
Version**
2020-11-27 20:42:02 +01:00
9a8f45fc6f
Prepare version 1.0.11
2020-11-27 13:59:23 +01:00
221eddd995
Add changelog.
2020-11-27 15:02:08 +03:00
32d42794dd
Merge branch 'develop' into feature/bca/home_empty_screens
2020-11-27 12:02:30 +01:00
708cdad38b
Update changelog
2020-11-27 10:24:07 +01:00
4c599d3d40
Merge pull request #2451 from vector-im/feature/bca/fix_update_profile_no_rooms
...
Fix / update profile when no rooms
2020-11-26 15:09:40 +01:00
67057bfac4
Merge pull request #2417 from vector-im/feature/bca/quick_invite_dm_tab
...
Feature/bca/quick invite dm tab
2020-11-26 14:58:14 +01:00
fbc3f47eeb
Fix / update profile when no rooms
2020-11-26 14:34:45 +01:00
79caa4e510
update change log
2020-11-26 13:31:00 +01:00
b125b47366
Update CHANGES.md
...
Signed-off-by: Ed Geraghty <ed@geraghty.london>
2020-11-23 00:01:05 +00:00
1070c23608
QR code invite flow support - invite friends
...
Author: Valere
2020-11-20 14:50:21 +01:00
e8d084b855
Add ability to share profile by QR code
2020-11-20 14:49:39 +01:00
85bc5f54aa
Merge branch 'develop' into feature/bma_create_room_form
2020-11-20 13:57:35 +01:00
41f46d0810
Merge pull request #2367 from vector-im/feature/bma/sanity_test
...
Feature/bma/sanity test
2020-11-20 13:56:49 +01:00
675e4579ac
Merge branch 'develop' into feature/bma/fix_crash
2020-11-19 18:44:17 +01:00
f9e4b689b7
Merge branch 'develop' into feature/bma/crop_issue
2020-11-19 17:25:36 +01:00
5eb50750e2
Merge branch 'develop' into feature/fix_user_vs_room_member
2020-11-19 17:02:35 +01:00
0046fe25c5
Merge branch 'develop' into feature/ons/fix_badge_color
2020-11-19 17:00:49 +01:00
fdb13f0b77
Merge pull request #2385 from vector-im/feature/bma/fdroid_60_timeout
...
F-Droid version: ensure timeout of sync request can be more than 60 s…
2020-11-19 16:59:40 +01:00
oogm
oogm
Jonathan de Jong
Benoit Marty
Benoit Marty
ganfra
Onuray Sahin
Kafji
Martin Häger
Maximillian Bensch
Valere
ganfra
Andrew Ferrazzutti
Ed Geraghty
Onuray Sahin
Tigermouthbear
SpiritCroc
Travis Ralston
aqulu
TR-SLimey