mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-12-22 01:04:56 +03:00
Code Issues Projects Releases Packages Wiki Activity
14311 commits 160 branches 159 tags 271 MiB
Commit graph

1213 commits

Author SHA1 Message Date
Adam Brown
3d4caeaa75 extracting use case copy to the resources 2022-01-12 12:06:10 +00:00
fedrunov
9ec662ccdc replace "kick" with "remove" 2022-01-11 16:21:42 +01:00
Valere
57b78a6223 code review 2022-01-11 14:56:31 +01:00
Valere
b10bc7000a Update room badge when e2e misconfigured 2022-01-11 14:56:31 +01:00
Valere
74dfddeeea missing resource 2022-01-11 14:56:31 +01:00
Valere
6b05e7a6bb Support misconfigured room encryption 2022-01-11 14:56:31 +01:00
ariskotsomitopoulos
3bd21d04d8 Merge branch 'develop' into feature/aris/threads 
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
#	tools/check/forbidden_strings_in_code.txt
 2022-01-11 14:09:49 +02:00
Onuray Sahin
9ea30445ef Merge branch 'develop' into feature/ons/static_location 
* develop: (281 commits)
  Add a comment about the workaround
  Remove deprecated restricted lab option (#4889)
  Bump actions/github-script from 3 to 5.1.0
  Add some missing language in the change language screen
  Workaround to not to reuse poll option cells.
  Olm lib is now hosted in MavenCentral. Upgrade to 3.2.10
  Changelog
  Test: Fix test after change on OnBoarding screens
  Test: Analytics opt-in
  Cleanup
  Revert "Disable automatic opt-in screen display."
  - Do not add GitHub comments on successful ktlint runs  - Remove already existing comments when ktlint succeed
  restore deprecated lab preference
  Update nb of enum classes
  Change autoUisi label + rename matching_issue
  code review
  Fix enabling was broken
  Simple rate limiting of RS sending
  use flow instead of reactivex
  Fix UISIS preference listener
  ...

# Conflicts:
#	vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorView.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
#	vector/src/main/res/layout/view_attachment_type_selector.xml
#	vector/src/main/res/values/strings.xml
 2022-01-11 14:42:11 +03:00
Benoit Marty
51c764c2f3 Remove unused strings 2022-01-11 12:41:37 +01:00
Adam Brown
71eaac39aa fixing typo in carousel title 2022-01-11 11:06:29 +00:00
Valere
bf447afa5a
Remove deprecated restricted lab option (#4889) 
Remove deprecated restricted lab option
 2022-01-11 09:01:37 +00:00
Valere
be119ea161 Support for lab auto rageshake UISI 2022-01-10 09:41:51 +01:00
ariskotsomitopoulos
50e51cbe29 Merge branch 'develop' into feature/aris/threads 2022-01-07 16:36:48 +02:00
ariskotsomitopoulos
ac5caccdf9 Merge branch 'develop' into feature/aris/threads 
# Conflicts:
#	matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventEntity.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
#	tools/check/forbidden_strings_in_code.txt
#	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
#	vector/src/main/res/menu/menu_timeline.xml
 2022-01-07 13:29:43 +02:00
Adam Brown
a2f780bef4 adding carousel content, images are temporary 2022-01-06 19:54:48 +00:00
Adam Brown
811613fa4d adding I already have an account functionality to the ftue auth splash 2022-01-06 10:03:13 +00:00
Benoit Marty
608e01abf1 Merge branch 'develop' into feature/bma/nick_color_final 2022-01-05 16:33:13 +01:00
Benoit Marty
5fc1efb542
Merge pull request #4852 from vector-im/feature/bma/tooltip 
Add tooltip to explain what are the actions behind the icons
 2022-01-05 09:47:12 +01:00
Benoit Marty
d07dd154b8 Remove audio item from attachment picker. 
Keep some related code for now
 2022-01-04 18:50:32 +01:00
Benoit Marty
97459bc822 Update wording of tooltips (Gaelle's review) 2022-01-04 18:43:17 +01:00
Benoit Marty
7bbea52e66
Merge branch 'develop' into feature/bma/math_final 2022-01-04 16:13:23 +01:00
Benoit Marty
ecc4009689 Add tooltip to explain what are the actions behind the buttons 2022-01-04 16:00:06 +01:00
Benoit Marty
ed00f9f712
Merge pull request #4848 from vector-im/cgizard/translate_error_message_joining_room 
Update error message when joining room
 2022-01-04 15:27:49 +01:00
Benoit Marty
185afe403f Rename some string resources 2022-01-04 14:25:36 +01:00
Claire Gizard
63c63bc462 Update error message when joining room 2022-01-04 13:49:18 +01:00
Benoit Marty
108e924783 Remove unused strings 2022-01-04 13:17:41 +01:00
Benoit Marty
ee69ece697 Fix some typo in string resource name 2022-01-04 13:06:02 +01:00
Benoit Marty
eb875823d5 Remove unused class and resource after new poll implementation 2022-01-04 13:02:17 +01:00
Benoit Marty
64e56b0dd7 Remove unused strings 2022-01-04 12:56:36 +01:00
Benoit Marty
99d77c5bca Reanme some string (and group them together) 2022-01-04 12:51:20 +01:00
Benoit Marty
c3480bfd16 Add summary to the setting 2021-12-31 16:47:46 +01:00
Benoit Marty
95b1ae9488
Merge branch 'develop' into maths 2021-12-31 16:41:06 +01:00
Benoit Marty
454baf8beb
Merge branch 'develop' into feature/issue-2610-override-nick-color-via-user-account-data 2021-12-31 13:02:24 +01:00
Onuray Sahin
de809d6013 Add settings item to allow location sharing. 2021-12-27 17:17:20 +03:00
Onuray Sahin
a0afab45fb Show location preview and allow to share with external apps. 2021-12-27 14:03:59 +03:00
Onuray Sahin
6495bd9e5e Send location event. 2021-12-17 15:09:02 +03:00
Onuray Sahin
5904a5955f Show and track the current location of the user on map. 2021-12-15 21:07:16 +03:00
Onuray Sahin
bf48617fc6 Create base UI components of location sharing screen. 2021-12-15 00:13:52 +03:00
ariskotsomitopoulos
cd95fc41e4 Merge branch 'develop' into feature/aris/threads 
# Conflicts:
#	library/ui-styles/src/main/res/values/dimens.xml
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/RelationType.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventEntity.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt
#	vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
#	vector/src/main/java/im/vector/app/core/di/ScreenComponent.kt
#	vector/src/main/java/im/vector/app/features/command/Command.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailActivity.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/TimelineFragment.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewEvents.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewState.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
#	vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
#	vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
#	vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
#	vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt
#	vector/src/main/res/layout/fragment_room_detail.xml
 2021-12-14 20:18:54 +02:00
Onuray Sahin
03a4194047 Add location attachment icon with required permissions. 2021-12-14 14:44:09 +03:00
Benoit Marty
f4cfb5d6d3
Merge pull request #4559 from vector-im/feature/bma/posthog 
Analytics
 2021-12-14 09:31:55 +01:00
Benoit Marty
a40e60ba8f Merge branch 'develop' into feature/bma/posthog 2021-12-13 23:18:14 +01:00
Onuray Sahin
f028f9836b Merge branch 'develop' into feature/ons/poll_timeline 
* develop: (49 commits)
  Update changelog.d/4592.bugfix
  Remove jcenter from here, let's see what the CI will say
  Common struct for each maven repo
  Rename the file to group them
  Add changelog file
  Revert PR 4592 for devtools
  Enhance include groups implementation by decoupling them to a separate file
  Cleanup
  Legals: improve API to get homeserver terms
  Legals: update setting icon
  Auto-review
  Add a help section in the settings.
  Changelog
  Color for links
  Use same height than the loading item to avoid dynamic resizing
  Legals: only display external URLs.
  Legals: Move the 2 copyrights items to the new legal screen
  Add some space between the 2 TextViews, and improve the layout
  Legals: Move the 3 element links to the new legal screen
  Rename some classes
  ...

# Conflicts:
#	vector/src/main/res/layout/item_timeline_event_option_buttons_stub.xml
#	vector/src/main/res/layout/item_timeline_event_poll_stub.xml
 2021-12-13 17:44:21 +03:00
Onuray Sahin
c7ad50a4d6 Code and design review fixes. 2021-12-13 17:07:17 +03:00
Benoit Marty
7f7199abd4 Add a help section in the settings. 2021-12-10 15:35:46 +01:00
Benoit Marty
5823777755 Legals: Move the 2 copyrights items to the new legal screen 2021-12-10 15:35:46 +01:00
Benoit Marty
d49a0dde6e Legals: Add the screen (WIP) 2021-12-10 15:34:25 +01:00
Onuray Sahin
04a7590804 Code review fixes. 2021-12-09 15:09:12 +03:00
Benoit Marty
0a4e093e64 auto-review 2021-12-07 18:04:08 +01:00
Onuray Sahin
953fadeed4 Merge branch 'develop' into feature/ons/poll_timeline 
* develop: (319 commits)
  Bump dagger from 2.40.4 to 2.40.5
  More debouncing
  Changelog
  I need the view here
  clicks() already has debouncing with conflate(), so throttleFirst is not necessary
  Use debouncedClicks where applicable
  Use `observeViewEvents` facility
  private
  use != rather that is
  Fix waring for state is not dialing or connected
  state can also be connected
  Add script to compress video and convert to gif file
  removing boolean notification version usage
  adding changelog entry
  removing unused imports and increasing enum allowance
  porting the notifications setting version to the vector features
  Add warning if unexpected state.
  setting login version via typed build config field instead of resources
  separating the SSO redirection from the login activities - adds a dedicated routing activity to proxy the uri to the login selected by the feature flags
  Removing trailing space
  ...

# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt
#	vector/src/main/res/layout/item_timeline_event_option_buttons_stub.xml
#	vector/src/main/res/xml/vector_settings_labs.xml
 2021-12-07 18:50:52 +03:00
Onuray Sahin
71d7270da5 Add room list preview for poll response and end events. 2021-12-07 14:00:06 +03:00
Onuray Sahin
1df6b33981 Add labs flag for polls. 2021-12-07 11:53:52 +03:00
Onuray Sahin
0a7df44a12 Add confirmation dialog to end poll. 2021-12-03 15:11:23 +03:00
Onuray Sahin
06485cf5e4 Implement poll in timeline ui. 2021-12-03 11:39:41 +03:00
Benoit Marty
73f5d77b05 Analytics: Opt-in screen layout - WIP 2021-12-02 15:56:54 +01:00
Benoit Marty
5606a5bfe7 Analytics: ask user consent at startup (we may iterate later) 2021-12-02 14:10:03 +01:00
Benoit Marty
3d5d9ad154 Iterate on the consent dialog of the identity server. 2021-11-30 15:46:27 +01:00
ariskotsomitopoulos
53ca86dc6c Permalink handling for thread events 2021-11-29 18:08:16 +00:00
ariskotsomitopoulos
afc69c77bd Add local filtering in thread list 2021-11-24 18:23:33 +02:00
ariskotsomitopoulos
e2bf3e7097 Add navigation to thread from the thread list 
Add thread creation from photos, files, images, audios, replies etc
Add slide animation to view threads from thread list
Add click listener on room summary to handle cases like ( there is an image and the user upon click should view the image instead of navigating to the thread, so he can click the thread summary )
 2021-11-23 22:22:58 +02:00
ariskotsomitopoulos
5e5ce614ef Add date in view all threads 
UI Improvements on threads summary
Add View In Room bottom sheet action from within thread timeline root message
 2021-11-23 17:09:58 +02:00
ariskotsomitopoulos
586b3d8caa - Add specific toolbar for threads 
- Renamed RoomDetailFragment to TimelineFragment while it should be reused from threads
 - View root thread message in room functionality
 2021-11-22 14:02:17 +02:00
Valere
1a204c6b5a Use borderless shield for verification (web parity) 2021-11-17 16:39:24 +01:00
ariskotsomitopoulos
4160688f83 Supporting command in threads 2021-11-16 14:59:30 +02:00
Benoit Marty
35e2a1083b
Merge pull request #4360 from vector-im/feature/ons/poll 
Poll Feature - Create
 2021-11-15 14:05:40 +01:00
Benoit Marty
04c7a300b9 Add an explicit reason when shortcut are disabled. 
Also prefer using ShortcutManagerCompat to disable shortcuts
 2021-11-08 12:47:32 +01:00
Benoit Marty
b6e5d2cadf
Merge pull request #4339 from vector-im/feature/adm/invite-by-email 
Missing ability to invite users by email
 2021-11-08 11:05:27 +01:00
Adam Brown
85f8f217b5 updating invite copy 2021-11-04 11:55:09 +00:00
Adam Tomaja
e167db2bb7
Feature/4292 fix capitalisation on initial sync screen (#4410) 
#4292 - Fix Capitalisation On Initial Sync Screen

Co-authored-by: Adam Tomaja <cydercode@gmail.com>
 2021-11-04 11:39:50 +00:00
Adam Brown
48678382ba adding new copy for the foreground listening notification 2021-11-04 09:45:59 +00:00
Onuray Sahin
a5a3a817e1 Merge branch 'develop' into feature/ons/poll 
* develop: (129 commits)
  Improve Rx sequence regarding listener
  adding changelog entry
  using correct license for matrix-sdk test
  extending the room name resolved to create a dedicated room name data class which contains a normalized version of the room name
  Remove shortcut as soon as a PIN code is set
  ensuring the store migration class is always equal to other store migration instances - is needed as realm will throw if multiple migration instances are created and they don't match
  removing extra query definition by chaining the query creation with modifiers
  removing noisy log which duplicates a type clause and fixing when casing formatting to have a case per line
  documenting the different query cases
  making the isNormalized function an extension and internal to the sdk
  Cache immutable value
  Do not show shortcuts if a PIN code is set
  Remove (disable) shortcut if a room is left
  Ensure ShortcutsHandler get all the joined rooms #4168
  Add `sortOrder: RoomSortOrder` parameter, with no API break
  Clean code
  adding normalised room display name field and making use of it when filtering rooms by name - fixes non latin-1 character set room names from being ignored when searching with inexact casing
  adding normalisation to the query string cases
  making value processing an injectable class, it will need to have its own dependencies to support normalisation
  porting QueryStringValue to sealed interface with a sub category for the content based values - allows for handling those cases separately for normalisation
  ...

# Conflicts:
#	vector/src/main/java/im/vector/app/core/di/ScreenComponent.kt
 2021-10-28 18:05:10 +03:00
Adam Brown
14538a71d0 updating consent copy to use latest variation 2021-10-28 15:56:08 +01:00
Onuray Sahin
db820efc3a Fix UI issues. 2021-10-28 15:43:51 +03:00
Onuray Sahin
6cee266a95 Create poll UI implementation. 2021-10-27 13:10:01 +03:00
Benoit Marty
6c485d5f6e Merge hotfix 1.3.6 2021-10-26 17:23:33 +02:00
Onuray Sahin
cb1d5e888d Create poll fragment with a title. 2021-10-25 20:14:10 +03:00
Onuray Sahin
3e03db200c Add poll icon to attachment type selector. 2021-10-25 14:47:57 +03:00
ariskotsomitopoulos
ab87937e5b Threads init commit 2021-10-20 18:39:59 +03:00
Benoit Marty
f5eaf2f05f Align wording with Element Web 2021-10-19 11:35:49 +02:00
Benoit Marty
923bc00dcd
Merge branch 'develop' into feature/aris/presence 2021-10-12 15:22:40 +02:00
Benoit Marty
66d4a48930 Remove unused strings 2021-10-08 15:07:52 +02:00
Adam Brown
259b6d56d7 using singular for the policy copy name to match content 2021-10-07 17:45:30 +01:00
Adam Brown
d00858f83b handling empty policy list by showing empty copy 2021-10-07 17:44:54 +01:00
Adam Brown
2f732affa5 updating policy title to include show/hide 2021-10-07 10:15:37 +01:00
Adam Brown
3111d0b46d updating discovery consent dialog to include policy link which expands the policy urls view 2021-10-06 17:34:02 +01:00
Adam Brown
7ce811c227 binding the indentity server policy urls to the discovery page 2021-10-06 17:20:06 +01:00
ariskotsomitopoulos
9ab59a543d * Implement Presence Service: 
- Get Presence Status
     - Set Presence Status
* Integrate presence in room details screen
* Integrate presence in room people's view
* Update UI to support presence
* Fix bug when insertOrUpdate was called on RoomMemberEventHandler and override the correct presence value in RoomMemberSummaryEntity
* Improve performance on updateUserPresence in RoomMemberSummaryEntity entity
* Remarks & linter fixes
* Disable presence when there is no m.presence events. In some servers like matrix.org is disabled atm.
* Enhance UI Presence on DM room lists to support dark/light theme
* Restore missing lines in gradle.properties to speed up debugging
 2021-10-06 18:00:02 +03:00
Benoit Marty
7ebdd7830a
Merge pull request #4158 from vector-im/feature/bma/new_commands 
Handle new commands
 2021-10-05 13:38:31 +02:00
Benoit Marty
9802ed08e3 Merge branch 'feature/bma/new_commands' of github.com:vector-im/element-android into feature/bma/new_commands 
# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewEvents.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
 2021-10-04 16:00:31 +02:00
Benoit Marty
2b63ccf70a
Merge branch 'feature/bma/new_commands' into commands 2021-10-04 15:34:14 +02:00
Benoit Marty
6669587ac1 Update wording in message bottom sheet (#3869) 2021-10-04 14:43:21 +02:00
Benoit Marty
b1b5ff8a09
Merge pull request #3772 from pvagner/voiceMessageA11Y 
Improve accessibility of voice messages
 2021-10-03 15:45:09 +02:00
Ekaterina Gerasimova
d6da4f7834 Fix typo in string 
Signed-off-by: Ekaterina Gerasimova <ekaterinag@element.io>
 2021-09-30 15:58:22 +01:00
Benoit Marty
c0adde56df
Merge pull request #4027 from vector-im/feature/fre/permalink 
Add client base url support for permalinks
 2021-09-29 17:08:12 +02:00
Benoit Marty
045e4bbf76
Merge pull request #4052 from vector-im/feature/adm/email_notification_toggle 
Add email notification toggle
 2021-09-24 20:42:44 +02:00
Valere
0acf90d8cd Code review 2021-09-24 18:12:12 +02:00
Valere
d59aaa7611 Support entering mail in user invite screen 2021-09-24 18:12:12 +02:00
Nick Hu
2262cd4b6d
Gate LaTeX maths behind labs flag 2021-09-24 13:50:42 +01:00
Adam Brown
43eff8b85b reusing existing remove string 2021-09-23 13:05:18 +01:00
Adam Brown
1d4c909b50 adding translator note about the enable email placeholder 2021-09-23 13:02:36 +01:00
Benoit Marty
1ce48c4deb Add a dedicated setting to show debug info on screen 2021-09-23 13:54:03 +02:00
Adam Brown
410cf5c062 adding UI toggle for email notifications in /settings/notifications 
- will display a _no emails_ when the matrix account has no emails set and tapping will navigate to the emails and phone numbers screen where the user can add an email
- toggling the email notification with register and unregister push notification for the given email address
 2021-09-21 10:47:03 +01:00
Adam Brown
1591375aa2 adding ability to remove push targets from the notification target screen 2021-09-20 16:35:53 +01:00
Florian Renaud
21d0a28150 Permalink: move supported hosts to config file 2021-09-17 16:46:09 +02:00
Valere
932a43ef58 Add subspace action 2021-09-17 09:22:10 +02:00
Valere
100ac49cac
Merge pull request #4000 from vector-im/feature/bca/fix_space_parent 
Fix parent relation handling
 2021-09-16 11:45:29 +02:00
Valere
421c2ae0ba Fix missing string resource 2021-09-16 10:30:43 +02:00
Valere
94f88c80fc Fix parent relation handling 2021-09-16 09:33:06 +02:00
Valere
cfed0f839b Code review 2021-09-16 09:20:25 +02:00
Valere
9a9a3d8cc6 Cherry pick room on leave space 2021-09-16 09:20:25 +02:00
Valere
8fd784e275 Improve leave space (all + none) 2021-09-16 09:20:25 +02:00
Valere
2c1435f08c Change default power to invite in private space + setting 2021-09-15 18:47:38 +02:00
Benoit Marty
1b59c7b451
Merge pull request #3989 from vector-im/feature/bca/space_fix_3956 
Fix /  Kick user dialog for spaces talks about rooms
 2021-09-14 20:35:40 +02:00
Valere
d758d5c270 Fix / Kick user dialog for spaces talks about rooms 2021-09-09 14:20:38 +02:00
Valere
99123bf0cc Add invite by email screen in create space flow 2021-09-07 14:10:57 +02:00
Peter Vágner
fac9a19c01 Add back a string that has been removed 
Signed-off-by: Peter Vágner <pvdeejay@gmail.com>
 2021-09-03 12:34:13 +02:00
Benoit Marty
42915a93db Fix warning "Multiple substitutions specified in non-positional format" 2021-08-30 11:52:43 +02:00
Benoit Marty
65c8ae3597
Merge pull request #3739 from vector-im/feature/bca/accept_unbound_3pid_invite 
support email invite
 2021-08-27 19:02:42 +02:00
Benoit Marty
5b2478a34f
Merge pull request #3894 from vector-im/feature/dla/keyword_notification_settings 
Feature/dla/keyword notification settings
 2021-08-27 18:19:17 +02:00
Valere
819e7c49b0 Code review 2021-08-27 17:30:32 +02:00
Valere
69c84a2460 support email invite 2021-08-27 17:30:09 +02:00
David Langley
68eaefbc9c Show error dialog rather than toast. Add validation to keyword field for slashes and dots. 2021-08-27 15:48:11 +01:00
Valere
b9e2374a4c cleaning 
review


fix string warning
 2021-08-27 15:56:07 +02:00
Valere
6f45ba575b post rebase cleaning 2021-08-27 15:56:07 +02:00
Valere
de6b5af6ba Promote restricted join rule to admins 2021-08-27 15:56:07 +02:00
Benoit Marty
5b908c404e
Merge pull request #3863 from vector-im/feature/fga/new_voip_design 
Feature/fga/new voip design
 2021-08-27 12:02:35 +02:00
Benoit Marty
1815acf1ae
Merge pull request #3765 from vector-im/feature/bca/m11.12 
Spaces | Default to 'Home' in settings
 2021-08-27 12:01:52 +02:00
ganfra
fd25813862 Merge branch 'develop' into feature/fga/new_voip_design 2021-08-26 15:15:16 +02:00
Benoit Marty
97bdd14880
Merge pull request #3854 from vector-im/feature/fga/call_end_reasons_dialog 
Call ended: handle busy reason and invite timeout.
 2021-08-26 11:40:27 +02:00
ganfra
4518962658 New voip design: clean after benoit review 2021-08-26 11:08:34 +02:00
David Langley
daaa40b27a Merge branch 'develop' of github.com:vector-im/element-android into feature/dla/keyword_notification_settings 2021-08-25 17:41:37 +01:00
Benoit Marty
f843712d7e
Merge pull request #3825 from vector-im/feature/dla/room_notification_settings 
Room Notification Settings V2
 2021-08-25 15:20:43 +02:00
David Langley
fb8c7f6be0 lint 2021-08-24 19:08:27 +01:00
David Langley
238f772461 Merge branch 'develop' of github.com:vector-im/element-android into feature/dla/keyword_notification_settings 2021-08-24 15:51:23 +01:00
David Langley
be19f759f6 fix ordering of chips and align left for notification screens. 2021-08-24 15:46:41 +01:00
Valere
15cb31ac0d Code review 2021-08-24 16:39:32 +02:00
Valere
27df3e626e Spaces | Default to 'Home' in settings 2021-08-24 16:34:32 +02:00
ganfra
42bfa129b3 Merge branch 'develop' into feature/fga/new_voip_design 2021-08-24 16:21:35 +02:00
ganfra
2b708387c2 New voip design: makes lint happy 2021-08-24 16:19:54 +02:00
Benoit Marty
18936122a8
Merge pull request #3773 from pvagner/a11yAvatarVerbosity 
a11y: change some content descriptions
 2021-08-23 12:15:43 +02:00
ganfra
3b1249c489 Merge branch 'develop' into feature/fga/new_voip_design 2021-08-17 17:10:10 +02:00
ganfra
99a0d17dfc Call ended: handle busy reason and invite timeout. 2021-08-17 12:15:37 +02:00
ganfra
36581a1f31 VoiP : fix string resource 2021-08-16 15:38:52 +02:00
Peter Vágner
a05859b54c Merge branch 'develop' into voiceMessageA11Y 2021-08-16 13:17:22 +02:00
Péter Radics
bf919b89da [issue-2610] Merge branch 'develop' of github.com:mitchnull/element-android into feature/issue-2610-override-nick-color-via-user-account-data 2021-08-15 18:08:47 +02:00
ganfra
452647fb00 Remove jitsi widget: change threshold + wording 2021-08-12 18:50:58 +02:00
David Langley
a355f61a7e Merge branch 'develop' of github.com:vector-im/element-android into feature/dla/room_notification_settings 2021-08-11 12:21:34 +01:00
ganfra
bcc9a75bdb Merge branch 'develop' into feature/fga/new_voip_design 2021-08-11 12:37:54 +02:00
ganfra
9027e94cfe Timeline call tiles: start changing status handling 2021-08-11 12:09:59 +02:00
David Langley
7f3c4f0073 Merge branch 'develop' of github.com:vector-im/element-android into feature/dla/reorg_account_notification_settings 2021-08-10 10:54:22 +01:00