Commit Graph

879 Commits

Author SHA1 Message Date
Adam Brown
87995abc7f updating verification copy to match latest 2022-07-27 09:40:39 +01:00
Adam Brown
b6695c7009 using dedicated sign in copy for the server selection header 2022-07-27 09:37:50 +01:00
Adam Brown
616c1d780f updating sign in specific subtitle for the server selection screen 2022-07-27 09:36:12 +01:00
Adam Brown
e6df2b39b4 handling unverified email as a dialog error in the reset password flow with a friendly error message 2022-07-26 16:58:19 +01:00
Johannes Marbach
e9bd271642
Merge pull request #6634 from vector-im/johannes/ec-permission-shortcuts
Put EC permission shortcuts behind labs flag (PSG-630)
2022-07-25 20:38:22 +02:00
Johannes Marbach
3af663e91f Put EC permission shortcuts behind labs flag (PSG-630)
Signed-off-by: Johannes Marbach <johannesm@element.io>
2022-07-25 09:57:51 +02:00
Maxime NATUREL
7f43a1bb06 Updating reply description text 2022-07-25 09:50:54 +02:00
Benoit Marty
3d7733156e
Merge pull request #6612 from anoadragon453/patch-1
Fix a typo during registration
2022-07-21 14:12:30 +02:00
Benoit Marty
fabdc20887
Merge pull request #6548 from vector-im/feature/bma/realm_migration_bg
Realm migration bg
2022-07-21 14:08:03 +02:00
Valere
fb05ab34d8
Merge pull request #6395 from vector-im/feature/bca/fix_invalid_qr_warning
Display specific message when verif code malformed
2022-07-21 12:36:46 +02:00
Benoit Marty
0bedfc8087 Add a message when migrating the data (after 1 seconds) 2022-07-21 11:19:36 +02:00
Andrew Morgan
d8fa1cb2ed
Fix a typo during registration
terns -> terms
2022-07-21 10:12:43 +01:00
ericdecanini
9e1235d51f Merge remote-tracking branch 'origin/develop' into task/eric/replace_flatten_with_direct_parent
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo034.kt
2022-07-20 16:44:33 +02:00
ericdecanini
0ad2051dd3 Improves plural used in strings 2022-07-20 14:48:38 +02:00
Onuray Sahin
26a677edc2
Merge branch 'develop' into feature/ons/fix_live_location_sharing_permission 2022-07-20 13:40:55 +03:00
ericdecanini
ee941cf88d Merge remote-tracking branch 'origin/develop' into task/eric/replace_flatten_with_direct_parent
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo033.kt
2022-07-20 10:56:07 +02:00
Maxime NATUREL
b08337e3a7
Merge pull request #6501 from vector-im/feature/mna/collapse-deleted-events
[Timeline] - Collapse redacted events (PSG-523)
2022-07-19 16:39:45 +02:00
Onuray Sahin
9976b3b8ac
Merge pull request #6567 from vector-im/feature/ons/share_location_with_other_apps
Share location with other apps (PSG-242)
2022-07-19 17:08:36 +03:00
Benoit Marty
70c62233d0
Merge pull request #6569 from vector-im/feature/adm/ftue-copy-review
FTUE - Copy review
2022-07-19 14:49:28 +02:00
Maxime NATUREL
9c619001a5 Updating string value for redacted event to be more consistent 2022-07-19 14:04:09 +02:00
Maxime NATUREL
b412b9f4e9 Merging redacted events by reusing existing mechanism for same type events 2022-07-19 14:04:08 +02:00
Onuray Sahin
493dc57a29 Code review fixes. 2022-07-19 13:41:00 +03:00
Onuray Sahin
e2cd75284f Check user power level before sharing live location. 2022-07-18 18:46:03 +03:00
ericdecanini
c73c36eb26 Merge remote-tracking branch 'origin/develop' into task/eric/replace_flatten_with_direct_parent
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo032.kt
#	vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderGroup.kt
#	vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderSpace.kt
2022-07-18 15:05:04 +02:00
ericdecanini
67dd250f83 Merge remote-tracking branch 'origin/develop' into task/eric/replace_flatten_with_direct_parent 2022-07-18 15:03:42 +02:00
ericdecanini
13b9b5b5d6 Changes string into plural 2022-07-18 14:47:09 +02:00
Maxime NATUREL
6b403ec224
Merge pull request #6542 from vector-im/feature/mna/lls-standardise-stop-text
[Location Share] - Standardise "Stop" texts for live (PSG-622)
2022-07-18 10:43:43 +02:00
Nikita Fedrunov
79762d9133
font scale setting screen (#6453) 2022-07-18 09:49:57 +02:00
Maxime NATUREL
cda100e596 Using same string key for stop + fix insets in button styles 2022-07-18 09:43:33 +02:00
Adam Brown
92f8dd971d promoting ftue strings for translation 2022-07-15 18:10:33 +01:00
Adam Brown
5f6654b696 removing display name subtitle 2022-07-15 15:42:14 +01:00
Adam Brown
c4a1d213b8 updating personalisation complete copy 2022-07-15 15:42:14 +01:00
Adam Brown
a6e6f68a1e updating profile picture copy 2022-07-15 15:42:14 +01:00
Adam Brown
3140867252 bolding the account created username 2022-07-15 15:42:14 +01:00
Adam Brown
95c6b88e12 updating use case screen copy 2022-07-15 15:42:13 +01:00
Onuray Sahin
d7e1cba45c Create popup resources. 2022-07-15 15:25:52 +03:00
Nikita Fedrunov
c7b54b8d3d
legacy groups removal (#6268) 2022-07-15 12:25:10 +02:00
Benoit Marty
3a80880ac7 Delete unused key error_attachment 2022-07-13 11:33:54 +02:00
Florian Renaud
68bd55fef5 Merge branch 'develop' into feature/fre/start_dm_on_first_msg
* develop: (156 commits)
  adding test case for showing html entities are processed
  adding tests around the event html rendering - the test helper is a little hacky in order to covert the spans to something human readable
  removing extra line
  adding changelog entry
  overriding the default list handler with an implementation that takes into account the initial starting position
  trigger CI
  Use executeTransactionAwait (need realm refresh in this case)
  Bump flipper from 0.152.0 to 0.153.0
  Use executeTransactionAwait (need realm refresh in this case)
  generating 1.4.27 changelog and updating version
  Fixing crash when sharing plain text, such as a url
  Fix crashes when opening Thread (#6463)
  Timeline: fix validation of timeline event changes
  Fix ConcurrentModificationException on BackgroundDetectionObserver
  Fix crashes when opening Thread (#6463)
  suppressing unused string resource
  Changelog
  Fix ConcurrentModificationException on BackgroundDetectionObserver
  Fix typo
  adding changelog entry
  ...
2022-07-11 12:03:24 +02:00
ericdecanini
c6728dde38 Changes string format of space parents to maintain parity with web 2022-07-06 13:36:17 +01:00
Adam Brown
03202080b3 suppressing unused string resource 2022-07-05 11:17:10 +01:00
Maxime NATUREL
906fe8be76
Merge pull request #6425 from vector-im/fix/mna/undisclosed-poll-description
[Poll] - Add a description under undisclosed poll when not ended (PSB-134)
2022-07-04 11:20:59 +02:00
Valere
8e829c6aad Add lab flag and more tests 2022-07-01 09:43:17 +02:00
Florian Renaud
33a19c1ef5 Merge branch 'develop' into feature/fre/start_dm_on_first_msg
* develop: (91 commits)
  Remove unused import
  Update versions
  Update CHANGES
  Improve readability.
  Weblate: also clean trads
  Changelog
  Format file
  Add android:hasFragileUserData="true" to the manifest. See details in #2352
  Clean the TODO delete (UnusedResource not compatible with string template)
  showing a toast on password reset confirmation
  lifting duplicated event_base layout to the base class, with the option for children to override
  using vector model for consistency
  Replace 5 manual steps to 1 command line step
  Translated using Weblate (Italian)
  Translated using Weblate (Swedish)
  Translated using Weblate (Swedish)
  Translated using Weblate (Russian)
  extracting common breaker background selection to ftue extensions
  removing unused imports
  adding changelog entry
  ...
2022-07-01 09:35:40 +02:00
ganfra
4bdde101b8 Clean the TODO delete (UnusedResource not compatible with string template) 2022-06-30 12:26:51 +02:00
Florian Renaud
3f087eb632 Merge branch 'develop' into feature/fre/start_dm_on_first_msg
* develop: (174 commits)
  Bump libphonenumber from 8.12.50 to 8.12.51
  LoadRoomMember: fix presence
  Cleanup
  LoadRoomMembers: add changelog
  LoadRoomMembers: handle room member event a bit more efficiently
  LoadRoomMembers: exclude Membership.Leave
  LoadRoomMembers: divide by chunk
  Bump soloader from 0.10.3 to 0.10.4
  Code review fix.
  Try no using the gradle daemon on CI
  Harmonize values of `CI_GRADLE_ARG_PROPERTIES`
  removing unused dependencies and marking soloader and ignored from dependency check (as it's dynamic)
  Remove non necessary prefix in logs
  Adding changelog entry
  Updating the unit tests
  Stopping existing active live when starting a new one
  Avoid multiple PR from Dependabot when Flipper is upgraded.
  Change context inside the get live summary use case
  Use a TestDispatcher in the FakeSession
  Code review fixes.
  ...
2022-06-30 11:48:55 +02:00
Maxime NATUREL
9fb19af39c Adding a description under undisclosed poll when not yet ended 2022-06-30 10:13:41 +02:00
Onuray Sahin
abea68557b
Merge pull request #6350 from vector-im/feature/ons/promote_live_location_labs_flag
Promote live location labs flag [PSF-959]
2022-06-29 15:26:39 +03:00
Valere
86b888c336 Display specific message when verif code malformed 2022-06-28 12:17:18 +02:00
Johannes Marbach
ec073552bd Expose pusher profile tag in advanced settings
Signed-off-by: Johannes Marbach <johannesm@element.io>
2022-06-23 10:56:28 +02:00