mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-28 20:08:50 +03:00
Code Issues Projects Releases Packages Wiki Activity
14620 commits 7 branches 124 tags 230 MiB
Commit graph

1226 commits

Author SHA1 Message Date
Benoit Marty
3b0856bf8e
Merge pull request #5249 from vector-im/feature/mna/2782-collapse-acl-events 
#2782: Collapse server ACLs update events
 2022-02-18 10:54:46 +01:00
Benoit Marty
e44ff1e303 Update preferred_jitsi_domain value from "jitsi.riot.im" to "meet.element.io" 2022-02-17 18:06:55 +01:00
Benoit Marty
6e68f9a224 Remove piwik configuration, it was not used. 2022-02-17 18:06:55 +01:00
Maxime Naturel
d8e28d7be9 Adding autocomplete for @room (missing correct first letter of avatar) 2022-02-17 11:22:59 +01:00
Maxime Naturel
4641153df0 Making ACL multiple successive events as collapsable 2022-02-16 16:01:31 +01:00
ganfra
911ee97122 Reactions: start handling show more, show less and add more actions in timeline. 2022-02-09 21:29:03 +01:00
Adam Brown
023b32367b adding post account created screen, going to the personalise next steps are still TODO 2022-02-07 09:22:36 +00:00
Onuray Sahin
fbc8866394 Merge branch 'develop' into feature/ons/fix_failed_maps_rendering 
* develop: (54 commits)
  Bubbles: add CHANGELOG file
  Bubble: get LayoutDirection (RTL) from current Locale
  Version++
  fastlane
  towncrier
  Version 1.3.18
  changelog
  Improve missing state event detection to missing state events only one joined rooms (ignore LEFT room) Should reduce the number of initial sync Co-authors: ganfra and billcarsonfr
  Changelog added.
  taking the use case screen into account when accessing the sign up flows in the sanity tests
  updating copy split to match designs
  applying design feedback
  promoting use case strings for translation
  enabling the use case feature by default
  Code review fixes.
  ktlint
  Bubbles: clean up after review
  Sync: avoid deleting root event of CurrentState on gappy sync
  Code review fixes.
  Support generic location pin.
  ...

# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageLocationItem.kt
#	vector/src/main/res/layout/item_timeline_event_location_stub.xml
 2022-02-04 14:54:39 +03:00
ganfra
2e2da16a6b Bubbles: merge develop 2022-02-03 17:10:13 +01:00
Onuray Sahin
a7678241f2 Fix location rendering in timeline if map cannot be loaded. 2022-02-03 16:17:33 +03:00
Adam Brown
9b3af7cfc9 updating copy split to match designs 2022-02-03 11:28:33 +00:00
Adam Brown
5ed1f34df3 promoting use case strings for translation 2022-02-03 11:28:33 +00:00
Maxime Naturel
8e0f7ca373 Issue-4641: Show search menu item only if available 2022-02-03 09:38:06 +01:00
NIkita Fedrunov
440c5f7516 spaces restricted promo removed 2022-02-02 15:42:28 +01:00
ganfra
1bf2523437 Merge branch 'develop' into feature/fga/message_bubbles 2022-02-02 13:01:43 +01:00
Aris Kotsomitopoulos
3d5f8ed7e7
Merge pull request #4746 from vector-im/feature/aris/threads 
Threads P0 Release
 2022-02-01 15:58:32 +02:00
Timuçin Boldt
5fe270fc9c
adapt strings for space creation 2022-02-01 12:07:53 +01:00
Benoit Marty
8db5b76676 Add TODO for the next Weblate sync 2022-02-01 11:41:59 +01:00
ganfra
825c2ca989 Merge branch 'develop' into feature/fga/message_bubbles 2022-02-01 10:05:51 +01:00
ariskotsomitopoulos
d509b3324c Merge branch 'develop' into feature/aris/threads 2022-01-31 15:58:12 +02:00
Onuray Sahin
50279e3183 Use static map image in timeline. 2022-01-28 18:51:28 +03:00
ganfra
c14eb050b1 Merge branch 'develop' into feature/fga/message_bubbles 2022-01-27 18:59:10 +01:00
ariskotsomitopoulos
b2a2fe2710 Merge branch 'develop' into feature/aris/threads 
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationService.kt
#	tools/check/forbidden_strings_in_code.txt
#	vector/build.gradle
#	vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
#	vector/src/main/java/im/vector/app/core/resources/UserPreferencesProvider.kt
#	vector/src/main/java/im/vector/app/features/command/Command.kt
#	vector/src/main/java/im/vector/app/features/command/CommandParser.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.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/TimelineViewModel.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/search/SearchResultItem.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.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/Navigator.kt
#	vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
#	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
#	vector/src/main/res/layout/fragment_timeline.xml
#	vector/src/main/res/xml/vector_settings_labs.xml
 2022-01-27 17:11:26 +02:00
Benoit Marty
6c79be1c68 Instruction for the next weblate sync 2022-01-26 18:16:35 +01:00
Benoit Marty
b4e5a3a6df Remove unused string 2022-01-25 18:34:06 +01:00
Benoit Marty
d501447544 Remove unused string 2022-01-25 18:33:06 +01:00
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
ganfra
1580269857 Bubbles: move settings to timeline section 2022-01-21 16:01:54 +01: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
ariskotsomitopoulos
8cc96e27bc - Add threads to lab settings 
- Disable thread awareness due to the new fallback mechanism
 2022-01-19 12:28:00 +02:00
Adam Brown
8f98f3e6d0 promoting wip carousel strings 2022-01-19 10:17:04 +00:00
ariskotsomitopoulos
636474b748 Merge branch 'develop' into feature/aris/threads 
# Conflicts:
#	matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxRoom.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
#	vector/src/main/java/im/vector/app/features/command/Command.kt
#	vector/src/main/java/im/vector/app/features/command/CommandParser.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt
 2022-01-18 12:41:40 +02:00
ganfra
7ff8483592 Merge branch 'develop' into feature/fga/message_bubbles 2022-01-17 19:19:29 +01:00
ariskotsomitopoulos
5e23947419 Enhance filtering to support threads 2022-01-17 19:22:22 +02:00
Onuray Sahin
5581e0b5ba Code review fixes. 2022-01-17 18:30:04 +03:00
ariskotsomitopoulos
81a1dfd66d PR Remarks 2022-01-17 17:28:40 +02: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
ariskotsomitopoulos
ff87f07f65 Add empty screen UI on empty thread list 2022-01-14 15:11:20 +02: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
ganfra
d06df45e85 Merge branch 'develop' into feature/fga/message_bubbles 2022-01-13 13:17:23 +01:00
ganfra
5ac155285b Bubbles: some clean up 2022-01-13 13:14:37 +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
ariskotsomitopoulos
9d48ecea2f Merge branch 'develop' into feature/aris/threads 
# Conflicts:
#	.github/workflows/integration.yml
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.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/MessageComposerViewState.kt
 2022-01-12 18:20:50 +02: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
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