Commit graph

449 commits

Author SHA1 Message Date
Benoit Marty
9df874c975 Merge branch 'develop' into feature/ons/voice_message 2021-07-13 10:36:05 +02:00
Benoit Marty
067349f602 Fix some misunderstanding about the permissions request - step 2 2021-07-13 00:22:23 +02:00
Benoit Marty
e391a1371c Merge branch 'develop' into feature/ons/voice_message 2021-07-09 22:19:50 +02:00
Benoit Marty
2948f03978
Merge pull request #3551 from vector-im/feature/bca/room_upgrade
Feature/bca/room upgrade
2021-07-08 10:00:01 +02:00
Onuray Sahin
3372177b0e Design review fixes. 2021-07-07 16:44:42 +03:00
Onuray Sahin
5856e563c5 Put voice message preference under labs. 2021-07-07 10:23:22 +03:00
Onuray Sahin
7a1b138894 Merge branch 'develop' into feature/ons/voice_message
* develop: (286 commits)
  Fix crash after video call
  Fix issue on button styles
  Clean after benoits review
  Fix warning about implicit type, introduced in Kotlin 1.5.20. "Returning type parameter has been inferred to Nothing implicitly. Please specify type arguments explicitly to hide this warning. Nothing can produce an exception at runtime."
  Bump kotlin_version from 1.5.10 to 1.5.20
  Bump libphonenumber from 8.12.25 to 8.12.26
  Fix call invite processed after call is ended because of fastlane mode.
  Jump to unread: removes unnecessary check which can cause scroll issue
  Jump to unread: avoid blink when jumping
  Clean after Benoits review
  Delete unused drawable to avoid conflict on develop
  Jump to unread: add towncrier file.
  Read marker: fix some issues with jump to unread visibility.
  Stop using ProgressDialog, there is a theme issue with it. It's not maintain by Google since it's deprecated. Force usage of MaterialAlertDialogBuilder to have the same UI effect. We sometimes need to block the UI :/
  Reordering
  Add text style for dialogs
  Colored dialog button is now handled by the theme
  Update theme for material dialog and create a destructive variant
  Reorder buttons
  Update doc
  ...

# Conflicts:
#	library/ui-styles/src/main/res/values/theme_dark.xml
#	library/ui-styles/src/main/res/values/theme_light.xml
#	vector/build.gradle
#	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt
#	vector/src/main/res/values/strings.xml
2021-07-06 13:17:49 +03:00
Benoit Marty
ca45cdd5c7
Merge pull request #3585 from vector-im/feature/bma/wellknown
Improve wellknown usage
2021-07-05 21:36:16 +02:00
David Baker
04cad290f7 Also change the emoji button subtitle
and tweak the other string more because it's not "each other" either
2021-07-05 19:49:48 +01:00
David Baker
fe4c4832bd Use different copy for self verification
The copy all refers to 'their' device for when you're verifying
someone else. Update it to refer to your own devices in the case
where you're verifying one of your own devices.
2021-07-02 18:38:57 +01:00
Benoit Marty
ed7be13ea3 PR review part 2 2021-07-01 12:51:33 +02:00
Onuray Sahin
5676226f42 Voice message recording view implementations. 2021-07-01 10:47:41 +03:00
Benoit Marty
ec515ced66 PR review part 1 2021-06-30 18:54:13 +02:00
Benoit Marty
3e53fa710a
Merge branch 'develop' into feature/bca/room_upgrade 2021-06-30 17:56:32 +02:00
Benoit Marty
08000dce55 Update the UI showing the homeserver API url in developer mode 2021-06-30 11:14:44 +02:00
Benoit Marty
edd24de4c3
Merge pull request #3547 from vector-im/feature/fga/jump_to_unread_redesign
Jump to unread: implement new design
2021-06-28 16:45:06 +02:00
Valere
43a1e283c5
Merge pull request #3514 from vector-im/feature/bca/fix_join_errors
Add error feedback when joining space rooms
2021-06-24 09:56:32 +02:00
Valere
57c75f8039 Ugrade unstable room notice in settings
default update parent, clean migrate bottomsheet layout
2021-06-24 09:38:52 +02:00
Valere
171793d190 room version cap support + room upgrade 2021-06-22 17:35:39 +02:00
ganfra
121fd9a19d Jump to unread: implement new design 2021-06-22 16:29:19 +02:00
Valere
b1ab6eb58f Add alias management in space settings 2021-06-18 10:41:13 +02:00
Valere
fb337dacd6 Add space alias in creation wizard 2021-06-18 10:41:13 +02:00
Onuray Sahin
69350ef514 Voice message UI initial implementation. 2021-06-17 16:17:38 +03:00
Valere
e277deece5 Add error feedback when joining space rooms 2021-06-16 17:35:25 +02:00
Valere
52f0d8a1d2 Add warning to private space creation flow 2021-06-15 14:01:03 +02:00
Benoit Marty
90a16ebbaf /snow -> /snowfall and update wording (iso Element Web) (#3430) 2021-05-31 11:03:02 +02:00
Benoit Marty
575ebdc3e8
Merge pull request #3421 from vector-im/feature/fga/call_transfer
Feature/fga/call transfer
2021-05-28 16:48:01 +02:00
Benoit Marty
5657da3493
Merge pull request #3401 from vector-im/feature/bca/spaces_fix_3386
Fixes #3386 show space description in explore header
2021-05-28 15:27:49 +02:00
ganfra
34b012732e Call transfer: handle unknown person correctly 2021-05-28 14:28:32 +02:00
Benoit Marty
0db5dd3d50
Merge pull request #3419 from vector-im/feature/bma/gitter
Feature/bma/gitter
2021-05-27 21:23:05 +02:00
Benoit Marty
e925d29037 Avoid adding twice the same server 2021-05-27 15:37:26 +02:00
Benoit Marty
cbed1afaaa Add custom server 2021-05-27 14:05:34 +02:00
Benoit Marty
65f8546268 Add string 2021-05-26 16:03:44 +02:00
Valere
447bd98a78 Fixes #3386 show space description in explore header 2021-05-26 14:25:21 +02:00
Benoit Marty
cd66e62454 "home server" -> "homeserver" (#3404) 2021-05-26 12:44:04 +02:00
ganfra
e67cb0eae7 Merge branch 'develop' into feature/fga/call_transfer 2021-05-26 12:26:34 +02:00
ganfra
bd8e46c84f Call transfer: start branching consult first action 2021-05-26 12:09:59 +02:00
Benoit Marty
b44c1a1c77
Merge pull request #3383 from vector-im/feature/fga/authenticated_jitsi
Feature/fga/authenticated jitsi
2021-05-25 10:24:54 +02:00
Benoit Marty
697b9ff535
Merge branch 'develop' into feature/bca/spaces_quick_fixes 2021-05-21 14:49:12 +02:00
Valere
abf7e275a7 Fix / Improve 'Leave Space' UX/UI #3359 2021-05-21 11:46:13 +02:00
Valere
0d0b6a8810 Fix empty states for spaces 2021-05-21 11:32:34 +02:00
ganfra
894af10934 Jitsi auth: fix some mistakes and gives the jwt to Jitsi 2021-05-20 18:53:56 +02:00
Valere
14629f2041 Fix space invite issues 2021-05-14 17:15:41 +02:00
Benoit Marty
72e343ad5a Better wording 2021-05-12 14:26:20 +02:00
Benoit Marty
6af9fda7df Fix lint issue 2021-05-12 14:06:59 +02:00
Valere
391e952fbd Review + design update 2021-05-12 12:23:14 +02:00
Valere
df3d3b63c8 Code review 2021-05-12 11:04:54 +02:00
Valere
eb18b23528 Add option to send beta feedback 2021-05-12 10:47:52 +02:00
Valere
eb9fadaebf user error when no space support on HS
remove buggy separators on add room; design update
2021-05-11 17:34:55 +02:00
Valere
14144dc99d Default all in home + lab flag 2021-05-11 10:45:07 +02:00