SpiritCroc
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
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
Benoit Marty
4cba1388f9
Add support for biometrics (not only Fingerprint)
2020-08-20 14:11:23 +02:00
SpiritCroc
72faa81e2a
Increment version
2020-08-18 15:17:34 +02:00
Benoit Marty
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
SpiritCroc
17430b06a2
Increment version
2020-08-14 10:45:38 +02:00
Valere
42a24300a1
Initial commit jitsi
2020-08-14 09:31:24 +02:00
SpiritCroc
2a5342087d
gplay version: ignore branch for version suffix
2020-08-09 17:02:17 +02:00
SpiritCroc
8602aba2a5
Increment version
2020-08-09 16:41:50 +02:00
SpiritCroc
459e20aac9
Merge tag 'v1.0.4' into sc
2020-08-07 12:34:18 +02:00
Valere
33f6e7e337
Version ++
2020-08-03 14:04:31 +02:00
Valere
db6045778e
Update change log
2020-08-03 12:11:50 +02:00
ganfra
995c552f2a
Merge branch 'develop' into feature/pin_code
2020-07-31 11:41:42 +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
531623178a
Version ++
2020-07-31 00:52:22 +02:00
ganfra
eb0d350097
Merge branch 'develop' into feature/pin_code
2020-07-30 17:24:48 +02:00
Valere
b732ea6c69
Version ++
2020-07-29 11:39:23 +02:00
Valere
9197275343
version++
2020-07-29 09:00:29 +02:00
ganfra
ecdef52829
Continue PIN code library integration (fork required)
2020-07-28 20:22:59 +02:00
SpiritCroc
adaed3fd64
Increment version
2020-07-28 13:55:09 +02:00
SpiritCroc
6170800f9c
Increment version
2020-07-24 12:10:03 +02:00
SpiritCroc
af7cbeea11
Increment version
2020-07-20 16:46:11 +02:00
SpiritCroc
fea41d3901
Increment version
2020-07-20 15:55:18 +02:00
SpiritCroc
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
ganfra
f5fbb2bc4f
Setup screens for Pin
2020-07-17 13:29:18 +02:00
SpiritCroc
e37769aae4
SchildiChat
2020-07-17 11:35:40 +02:00
Benoit Marty
53f0b77fb0
Version++
2020-07-15 14:32:15 +02:00
Benoit Marty
7651eb5c3c
Revert "Temporary remove the _dev suffix added to version"
...
This reverts commit 7237ec7310
2020-07-15 14:14:44 +02:00
Benoit Marty
7237ec7310
Temporary remove the _dev suffix added to version
2020-07-13 21:50:26 +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
5063188b25
Version++
2020-07-11 23:00:16 +02:00
ganfra
3fc9fe3017
Merge branch 'develop' into feature/fix_small_issues
2020-07-10 20:13:47 +02:00
Onuray Sahin
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
Valere
4a2a6d34ae
Initial commit
2020-07-08 20:09:55 +02:00
ganfra
0855806ae2
Fix edit being stuck
2020-07-07 22:14:11 +02:00
Benoit Marty
b7d86c3fa4
Merge branch 'develop' into feature/some_upgrade
2020-07-06 23:38:26 +02:00
Benoit Marty
89506b9e81
Version++
2020-07-06 23:36:14 +02:00
Benoit Marty
9d4e903c4a
Upgrade some dependencies
2020-07-06 15:59:49 +02:00
Benoit Marty
d4050a7b9d
Due to a bug introduced in Android gradle plugin 3.6.0, we have to specify the ndk version to use
2020-07-02 23:39:42 +02:00
Benoit Marty
93fb40f323
(re-)Enable abortOnError for lint
...
And fix a first issue (on unused code)
2020-07-02 11:29:00 +02:00
Benoit Marty
f4314ebdae
Version++
2020-07-01 21:58:58 +02:00
Benoit Marty
3e97e03ccc
Prepare release Riot.imX v0.91.3 for the beta channel
2020-07-01 21:51:30 +02:00
Onuray Sahin
cba9109206
Rename the application.
2020-06-30 14:52:50 +03:00
Onuray Sahin
482621e86f
Set versionName to 1.0.0
2020-06-30 14:34:02 +03:00
Benoit Marty
0ad2058a1a
Prepare version 0.91.2-beta
2020-06-28 23:05:47 +02:00
Benoit Marty
d436a7bad7
Increment version patch for a new release on the PlayStore
2020-06-27 00:14:32 +02:00
Benoit Marty
16a275529d
Use temporary name Riot.imX
2020-06-27 00:14:32 +02:00
Benoit Marty
1c9907c5d2
Do not abort on error during lint check.
2020-06-26 21:08:41 +02:00
Benoit Marty
6bce62a598
Update version code to 40_091_00x to upgrade Riot-Android
2020-06-26 16:19:05 +02:00
Benoit Marty
629c73e630
Change applicationId from "im.vector.riotx" to "im.vector.app"
2020-06-26 16:19:05 +02:00
