Commit graph

1129 commits

Author SHA1 Message Date
Benoit Marty
58b2050baf Rename string 2022-01-25 18:18:47 +01:00
Benoit Marty
f4f0b36b05 Remove unused string 2022-01-25 18:18:11 +01:00
Benoit Marty
fa07271074 Rename some resource: kick -> remove 2022-01-25 18:15:22 +01:00
Benoit Marty
210ef74f62 Remove unused string 2022-01-25 18:13:03 +01:00
Benoit Marty
ece93caae3 Rename some resource: kick -> remove 2022-01-25 18:10:59 +01:00
Benoit Marty
f14bf0dd50
Merge pull request #4817 from vector-im/feature/ons/static_location
Static Location Sharing
2022-01-25 18:03:17 +01:00
Benoit Marty
f83c2b32bc Add summary to location sharing setting 2022-01-25 17:59:22 +01:00
Benoit Marty
871b05b641
Merge pull request #5019 from vector-im/feature/bca/auto_uisi_update
Quick fixes on auto uisi RS
2022-01-25 16:41:01 +01:00
Valere
14da9806e2 Put bug report app names in config 2022-01-25 16:35:16 +01:00
Benoit Marty
b619f70904 Merge branch 'develop' into feature/ons/static_location 2022-01-25 14:29:13 +01:00
Onuray Sahin
43c8624b33 Code review fixes. 2022-01-25 15:31:59 +03:00
Onuray Sahin
04ffb951c3 Code review fixes. 2022-01-25 12:38:11 +03:00
Onuray Sahin
b0b92c062e Undisclosed poll implementation. 2022-01-24 14:31:50 +03:00
Onuray Sahin
7f97e78ba3 Merge branch 'develop' into feature/ons/edit_polls
* develop: (66 commits)
  toolbar management  (#4887)
  adding changelog entry
  adding back periodic flag when scheduling automatic background workers
  Fix enum class warning
  Split long lines Done by https://github.com/matrix-org/matrix-analytics-events/pull/16
  Add new class in analytics plan
  Fix conditional for Delight issue automation
  Add missing import in kdoc
  Update kdoc
  Enable Delight issue automation
  Fix an error in string resource (#4997)
  Changelog
  Add some unit test for the command parser. Not all commands are covered, could add more tests later.
  data class.
  use sealed interface
  Small cleanup
  Command parser is not a static object anymore
  Add changelog
  Use Throwable.isLimitExceededError extension
  Do not automatically retry 429 with a too long delay
  ...
2022-01-23 22:15:36 +03:00
Onuray Sahin
c3d7a253e4 Allow editing polls. 2022-01-20 17:41:03 +03:00
Benoit Marty
953f34f5e3 Fix an error in string resource (#4997) 2022-01-19 21:40:26 +01:00
Adam Brown
211f184066 updating splash submit copy to use Create account when the I already have an account feature is enabled 2022-01-19 10:38:28 +00:00
Adam Brown
8f98f3e6d0 promoting wip carousel strings 2022-01-19 10:17:04 +00:00
Onuray Sahin
5581e0b5ba Code review fixes. 2022-01-17 18:30:04 +03:00
Adam Brown
7d0b833aa5 using app name template for the carousel content which contains the app name
- also marks the now unused strings for deletion
2022-01-17 09:24:53 +00:00
Adam Brown
982b480613 including updated copy for the carousel
- marked as donottranslate whilst waiting for sign off
- removed the positioning from the naming schema in favour of location of context
2022-01-17 09:24:53 +00:00
Adam Brown
fbe60f5a52 applying english override for the last carousel page copy 2022-01-17 09:24:53 +00:00
Adam Brown
e521fd9059 fixing typo in carousel body 2022-01-17 09:24:53 +00:00
Adam Brown
7c5e7a902d updating splash carousel copy to match latest copy 2022-01-17 09:24:53 +00:00
Benoit Marty
31e487b073
Merge pull request #4911 from vector-im/feature/nfe/rename_kick_command
Remove "X kicked X" terminology when removing people from a room
2022-01-14 08:42:18 +01:00
fedrunov
d92e0e48f6 code review changes 2022-01-13 17:50:38 +01:00
Adam Brown
83af0d7bb9 moving the work in progress strings out of the production strings files to avoid translations before they're signed off 2022-01-13 10:57:04 +00:00
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
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
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