Matrix/element-android-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-android.git synced 2024-11-17 02:15:17 +08:00
Code Issues Packages Projects Releases Wiki Activity
12,171 Commits 530 Branches 157 Tags 485 MiB
3acdccb339
Commit Graph

7662 Commits

Author SHA1 Message Date
ariskotsomitopoulos
3acdccb339 Disable polls from within threads but allow users to vote if the poll is a root thread message 2021-12-15 16:31:58 +02:00
ariskotsomitopoulos
20357ce5c4 - Fix remaining conflicts with develop 
- Disable thread awareness when threads are enabled
 2021-12-15 14:38:08 +02: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
ariskotsomitopoulos
2aa24f0a0d Fix threads sort order, newest first 2021-12-14 16:30:59 +02:00
Benoit Marty
fa65cc59fe Version++ 2021-12-14 14:46:08 +01:00
Benoit Marty
73dba2b692 Fix another crash 2021-12-14 14:37:01 +01:00
Benoit Marty
32820f7893 Comment out some part of the test to make it pass. Tested manually for this time. 2021-12-14 13:27:33 +01:00
Benoit Marty
1961309458 Fix a crash on reactions bottom sheet 2021-12-14 13:26:03 +01:00
ariskotsomitopoulos
d56281dca7 - Enhance local notification to work with read receipt & the latest chunk 
- Local notification mentioning system
- Fix/Improve thread list filtering
 2021-12-14 13:35:08 +02:00
Benoit Marty
0411291515
Merge pull request #4708 from vector-im/feature/bma/analytics_before_release 
Disable automatic opt-in screen display
 2021-12-14 12:07:12 +01:00
Benoit Marty
08def813cc Disable automatic opt-in screen display. 
We want to wait for translations to be available in the project before showing this screen to every users.
 2021-12-14 11:34:06 +01:00
Weblate
1e40b5cd34 Merge branch 'origin/develop' into Weblate. 2021-12-14 08:58:12 +00: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
aad19e4bce code qual 2021-12-14 09:06:36 +01:00
Denys Nykula
cb4690a3e6 Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (2693 of 2693 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
 2021-12-14 02:26:03 +00:00
Jozef Gaal
d3d5d79b7d Translated using Weblate (Slovak) 
Currently translated at 52.6% (1417 of 2693 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sk/
 2021-12-14 02:25:58 +00:00
DUCKCHI
0a090fab65 Translated using Weblate (Korean) 
Currently translated at 49.0% (1322 of 2693 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ko/
 2021-12-14 02:25:57 +00:00
Benoit Marty
ea9a524048 Fix compilation issue after merge develop 2021-12-13 23:23:18 +01:00
Benoit Marty
a40e60ba8f Merge branch 'develop' into feature/bma/posthog 2021-12-13 23:18:14 +01:00
Benoit Marty
e519e314fe Limit width of content on tablets 2021-12-13 23:16:47 +01:00
Benoit Marty
48fa411d83
Merge pull request #4698 from vector-im/feature/bma/emoji_hotfix 
Emoji fix
 2021-12-13 23:15:46 +01:00
Benoit Marty
2c81e7ea08
Merge pull request #4601 from vector-im/feature/aris/search_no_data_displayed_4600 
Fix issue 4600 that search results sometimes are not displayed properly
 2021-12-13 23:01:03 +01:00
Benoit Marty
3719551913
Merge pull request #4693 from SpiritCroc/spaceChildIds 
Fix possible crash when having identical subspaces in multiple root spaces
 2021-12-13 22:59:57 +01:00
Benoit Marty
240d0c0a5e
Merge pull request #4703 from vector-im/feature/bma/fix_poll_create 
Use only non empty option to create a poll
 2021-12-13 22:56:58 +01:00
Benoit Marty
b9799b46fd Fix test compilation 2021-12-13 22:45:24 +01:00
Benoit Marty
28588eb10c Use only non empty option to create a poll 2021-12-13 22:17:43 +01:00
Benoit Marty
db81ec260e Recycle View a bit more 2021-12-13 21:49:40 +01:00
Benoit Marty
0981af3085 Remove unused attribute 2021-12-13 21:33:15 +01:00
Benoit Marty
f29e14fdd8 Rename class 2021-12-13 21:17:14 +01:00
Benoit Marty
da407ef8a2 Avoid lateinit 2021-12-13 21:16:44 +01:00
Benoit Marty
10b39ccd28 Do some renaming 2021-12-13 21:08:52 +01:00
Benoit Marty
eac06d5401 Do some renaming 2021-12-13 21:04:52 +01:00
Benoit Marty
c1ea653561 Reorder classes so that it follows the poll status logical order 2021-12-13 21:02:11 +01:00
Onuray Sahin
e2bbc3f8ae Code review fixes. 2021-12-13 22:47:15 +03:00
Benoit Marty
6e646b12b5 Add some comments and default values 2021-12-13 20:34:44 +01:00
Benoit Marty
96b186ca8c Add tests to cover the new feature 2021-12-13 20:28:58 +01:00
Benoit Marty
e8fbbe2b97 Fix the test 2021-12-13 20:09:33 +01:00
Benoit Marty
c302148e89 Rename 2021-12-13 18:21:27 +01:00
Benoit Marty
808c401675 Fix a crash on Epoxy if text contains a MetricAffectingSpan 2021-12-13 18:16:58 +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
f6dcda6841 Code review fixes. 2021-12-13 17:37:11 +03:00
Onuray Sahin
c7ad50a4d6 Code and design review fixes. 2021-12-13 17:07:17 +03:00
Benoit Marty
04d23ce7f6 Rename for clarity 2021-12-13 14:56:21 +01:00
Benoit Marty
ab70ee5ae2 Change usage of SpannableStringBuilder when this is not required 2021-12-13 13:14:20 +01:00
Benoit Marty
5ea7f3cbca
Merge pull request #4652 from vector-im/feature/bma/avoid_useless_codegen 
Use viewBindingIgnore="true" when we do not need the ViewBinding.
 2021-12-13 12:51:05 +01:00
Benoit Marty
df3f8bd88e Use emoji2 library 2021-12-13 12:36:46 +01:00
Benoit Marty
b701bb7c1a Fix crash when using TextFuture with MetricAffectingSpan added by EmojiCompat (#4691) 2021-12-13 12:14:24 +01:00
Benoit Marty
406881c8a7
Merge pull request #4689 from vector-im/feature/aris/dev_tools_fix_4592 
Feature/aris/dev tools fix 4592
 2021-12-13 11:37:53 +01:00
Benoit Marty
3620a265d0
Merge pull request #4650 from vector-im/feature/bma/id_ref 
Cleanup id ref. Use type views instead.
 2021-12-13 11:32:18 +01:00
Benoit Marty
a6dec7b9cb
Merge pull request #4670 from vector-im/feature/bma/safer_dependencies 
Safer dependencies
 2021-12-13 11:30:15 +01:00