2e9195df2b
Merge remote-tracking branch 'upstream/master' into sc_1.0.7
...
Change-Id: Iccb1b1f0bee6b77c9f15d917c8073910841b6ff8
Conflicts:
vector/src/main/java/im/vector/app/core/resources/UserPreferencesProvider.kt
vector/src/main/java/im/vector/app/features/disclaimer/DisclaimerDialog.kt
vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
2020-09-17 12:03:17 +02:00
cf24ca90f9
Increment version
...
Change-Id: Ice9536342a8eeff003019350a07e27f805426562
2020-09-10 18:14:11 +02:00
1d7681a893
Don't do ABI extra versioning
...
Doesn't work with F-Droid automatic update detection
Change-Id: I6bafe05f151e240fee37cd714ab2ac076a7a1a69
2020-09-10 18:14:06 +02:00
c2880a5832
Strict mode: add a build entry to enable whenever we want to check
2020-09-09 11:52:05 +02:00
bdd71769a0
Merge remote-tracking branch 'upstream/master' into sc
...
Change-Id: Ibdd2790a7f2a8a1f126ef7af2032fe72f7dd777e
2020-09-08 18:52:59 +02:00
bf0b6d738a
Version++
2020-09-08 17:49:26 +02:00
372ae6e162
Increment version
...
Change-Id: I7de06d933fdddf3b4cd05538f0c5b3f29066b6c8
2020-09-02 11:58:48 +02:00
9d2ea19d7d
Upgrade to worker 2.4.0
2020-08-31 16:20:12 +02:00
59fa2e28c2
Fix sonar analysis version name issue
2020-08-27 18:15:53 +02:00
776d892d27
Increase version of uCrop library which supports Android 10.
2020-08-26 12:27:12 +03:00
c7ae49df1b
Increment version
...
Change-Id: I2e30e69f149fa363d8a0391fd4c4682575a234ae
2020-08-24 17:54:08 +02:00
3b23ed9830
Increment version
...
Change-Id: Ia0033b834c7b1a9145ead4247fe70d427ef53ae9
2020-08-24 15:56:04 +02:00
4dfdfba42c
Increment version
...
Change-Id: I2b9b613775e1698a9b4339e153eb9b677f0898c7
2020-08-24 11:35:41 +02:00
328dc9ea5b
Merge pull request #1979 from vector-im/feature/update_dependencies
...
Update some dependencies, including coroutines for working debugging
2020-08-24 10:11:57 +02:00
5b5cfa5bf1
Increment version
2020-08-23 15:27:39 +02:00
7b4b5be759
Merge tag 'v1.0.5' into sc
...
Conflicts:
vector/src/main/AndroidManifest.xml
vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
vector/src/main/java/im/vector/app/features/settings/VectorLocale.kt
vector/src/main/res/layout/item_room.xml
vector/src/main/res/layout/item_timeline_event_file_stub.xml
vector/src/main/res/layout/item_timeline_event_media_message_stub.xml
vector/src/main/res/values-v21/styles_login.xml
vector/src/main/res/values/theme_dark.xml
vector/src/main/res/values/theme_light.xml
vector/src/main/res/values/theme_status.xml
2020-08-22 11:23:45 +02:00
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
1f890324b4
Update some dependencies, including coroutines for working debugging
2020-08-21 17:17:51 +02:00
04fa7d9628
Version++
2020-08-21 17:04:05 +02:00
4cba1388f9
Add support for biometrics (not only Fingerprint)
2020-08-20 14:11:23 +02:00
72faa81e2a
Increment version
2020-08-18 15:17:34 +02:00
05ecbf0f86
Build Jitsi lib version android-sdk-2.9.3, commit abcbbbea12e3ef88012b14723bb8cd42dbefc988
...
And host it in https://github.com/vector-im/jitsi_libre_maven/tree/master/android-sdk-2.9.3
2020-08-14 21:33:25 +02:00
17430b06a2
Increment version
2020-08-14 10:45:38 +02:00
42a24300a1
Initial commit jitsi
2020-08-14 09:31:24 +02:00
2a5342087d
gplay version: ignore branch for version suffix
2020-08-09 17:02:17 +02:00
8602aba2a5
Increment version
2020-08-09 16:41:50 +02:00
459e20aac9
Merge tag 'v1.0.4' into sc
2020-08-07 12:34:18 +02:00
33f6e7e337
Version ++
2020-08-03 14:04:31 +02:00
db6045778e
Update change log
2020-08-03 12:11:50 +02:00
995c552f2a
Merge branch 'develop' into feature/pin_code
2020-07-31 11:41:42 +02:00
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
531623178a
Version ++
2020-07-31 00:52:22 +02:00
eb0d350097
Merge branch 'develop' into feature/pin_code
2020-07-30 17:24:48 +02:00
b732ea6c69
Version ++
2020-07-29 11:39:23 +02:00
9197275343
version++
2020-07-29 09:00:29 +02:00
ecdef52829
Continue PIN code library integration (fork required)
2020-07-28 20:22:59 +02:00
adaed3fd64
Increment version
2020-07-28 13:55:09 +02:00
6170800f9c
Increment version
2020-07-24 12:10:03 +02:00
af7cbeea11
Increment version
2020-07-20 16:46:11 +02:00
fea41d3901
Increment version
2020-07-20 15:55:18 +02:00
95850440bd
Merge remote-tracking branch 'upstream/master' into sc
...
Conflicts:
vector/build.gradle
vector/src/main/java/im/vector/riotx/features/home/HomeDetailFragment.kt
vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt
vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/AbsMessageItem.kt
vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListDisplayModeFilter.kt
vector/src/main/res/drawable/bg_login_server.xml
vector/src/main/res/drawable/bg_login_server_checked.xml
vector/src/main/res/layout/fragment_login_server_selection.xml
2020-07-17 13:39:52 +02:00
f5fbb2bc4f
Setup screens for Pin
2020-07-17 13:29:18 +02:00
e37769aae4
SchildiChat
2020-07-17 11:35:40 +02:00
53f0b77fb0
Version++
2020-07-15 14:32:15 +02:00
7651eb5c3c
Revert "Temporary remove the _dev suffix added to version"
...
This reverts commit 7237ec7310
2020-07-15 14:14:44 +02:00
7237ec7310
Temporary remove the _dev suffix added to version
2020-07-13 21:50:26 +02:00
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
5063188b25
Version++
2020-07-11 23:00:16 +02:00
3fc9fe3017
Merge branch 'develop' into feature/fix_small_issues
2020-07-10 20:13:47 +02:00
93fe00a299
Merge branch 'develop' into rebranding_rebase
...
* develop: (123 commits)
Fixes #1647 share not working
Put xmx to 2048m
Update changelog after PR merged
Version++
Prepare release 0.91.04-beta
Add the new value to the ViewEvent, because the state is maybe not up to date.
Fix lint error, following the upgrade of the libs
Revert to gradle build 3.5.3
Clean code
Fix leaving selected group
QuickFix / crash when starting in airplane mode
Group: rework a bit how and when we fetch data about groups
EventInsert: add InsertType to avoid trying to process events we shouldn't
Upload device keys only once to the homeserver and fix crash when no network (#1629 )
Upgrade some dependencies
Add a delay to avoid crash. Sounds like a workaround...
Handle certificate error in case of Direct Login
Handle JobCancellationException
Simplify the server selection screen: remove the "Continue" button
Re-activate Wellknown support with updated UI (#1614 )
...
# Conflicts:
# vector/build.gradle
# vector/src/main/res/values/strings.xml
2020-07-10 13:05:52 +03:00
SpiritCroc
ganfra
Benoit Marty
Valere
Benoit Marty
Onuray Sahin
Onuray Sahin