Commit Graph

14845 Commits

Author SHA1 Message Date
NIkita Fedrunov 190a425aa6 don't leave DMs when leaving all rooms in space 2022-04-07 17:55:33 +02:00
Benoit Marty e7a2e654e5 Merge branch 'release/1.4.10' into main 2022-04-05 22:35:07 +02:00
Benoit Marty ee63c75cec fastlane 2022-04-05 22:34:40 +02:00
Benoit Marty 5429521c70 Update generated changelog 2022-04-05 22:33:20 +02:00
Benoit Marty 1ef2b1d05a Towncrier 2022-04-05 22:30:59 +02:00
Benoit Marty fd76db9616 Update test 2022-04-05 22:16:42 +02:00
Benoit Marty 0f14652932
Merge pull request #5692 from vector-im/feature/aris/threads_beta_infrom_users_on_reply
Threads Beta opt-in mechanism
2022-04-05 20:40:16 +02:00
ariskotsomitopoulos 598892de53 Injecting stringProvider instead of context in ThreadsManager class 2022-04-05 20:53:11 +03:00
ariskotsomitopoulos 37dc77cc3e Add isValid check to RealmChangeListener to prevent crashes on deleted objects 2022-04-05 20:36:33 +03:00
ariskotsomitopoulos 59d87df0ca Add string resource comment 2022-04-05 19:44:01 +03:00
ariskotsomitopoulos 5ee2579efc Revert "Remove duplicate learn more string resources"
This reverts commit 2ac3306382.
2022-04-05 19:39:13 +03:00
ariskotsomitopoulos 72d4c7612a Revert comment change 2022-04-05 19:39:11 +03:00
Benoit Marty c76dc7b62f
Update vector/src/main/res/values/strings_login_v2.xml
Fix typo
2022-04-05 17:40:27 +02:00
Benoit Marty fac317d122
Merge pull request #5647 from vector-im/feature/aris/threads_beta_feedback
Feature/aris/threads beta feedback
2022-04-05 17:25:29 +02:00
Benoit Marty ca418afcbb
Merge pull request #5614 from vector-im/feature/aris/threads_ui_enhancements
Feature/aris/threads UI enhancements
2022-04-05 17:21:53 +02:00
Maxime NATUREL bebe819c54
Merge pull request #5671 from vector-im/feature/mna/PSF-673-live-loc-share-duration
#5667: [Location Sharing] - Set duration of live sharing
2022-04-05 16:13:26 +02:00
Aris Kotsomitopoulos d484ba07cd
Merge pull request #5594 from vector-im/feature/aris/thread_root_permalink_navigation
Improve permalink on thread root message
2022-04-05 16:39:46 +03:00
ariskotsomitopoulos 6e06aed627 Merge branch 'develop' into feature/aris/threads_ui_enhancements
# Conflicts:
#	vector/src/main/res/menu/menu_timeline.xml
2022-04-05 16:32:49 +03:00
ariskotsomitopoulos a269aa5046 Remove unused elevation 2022-04-05 16:29:54 +03:00
ariskotsomitopoulos 858623b5a4 Change default threads beta visibility 2022-04-05 16:26:42 +03:00
ariskotsomitopoulos aef4cce3e7 Format code ordering 2022-04-05 14:51:38 +03:00
ariskotsomitopoulos b5f8d2c91f Update string resource 2022-04-05 14:50:18 +03:00
Benoit Marty 4ce4ef4631
Merge pull request #5698 from RiotTranslateBot/weblate-element-android-element-app
Translations update from Weblate
2022-04-05 13:46:09 +02:00
ariskotsomitopoulos eecaf9602d Add urls.xml in vector-config 2022-04-05 14:12:32 +03:00
ariskotsomitopoulos 6567628b95 Format code 2022-04-05 14:02:41 +03:00
ariskotsomitopoulos 35a526a482 Improve comment format 2022-04-05 14:02:08 +03:00
ariskotsomitopoulos e3ac5ad8c1 Remove extra space 2022-04-05 14:01:14 +03:00
ariskotsomitopoulos 2ac3306382 Remove duplicate learn more string resources 2022-04-05 13:56:12 +03:00
Weblate 587752dffe Merge branch 'origin/develop' into Weblate. 2022-04-05 10:55:25 +00:00
Benoit Marty 5f3f31b62c
Merge pull request #5695 from vector-im/dependabot/gradle/org.owasp-dependency-check-gradle-7.0.4.1
Bump dependency-check-gradle from 7.0.3 to 7.0.4.1
2022-04-05 12:53:03 +02:00
ariskotsomitopoulos 7662abc5f7 Add learn more to string resources 2022-04-05 13:36:44 +03:00
ariskotsomitopoulos 2bb6e77be0 Rename displayThreadsBetaNotice method 2022-04-05 13:10:59 +03:00
fedrunov e2481fa8e6
metrics for IA project (#5399) 2022-04-05 09:28:31 +02:00
fedrunov 0664afdf9a
Update Spaces menu ordering and capitalisation (#5539) 2022-04-05 09:27:39 +02:00
dependabot[bot] 1be09249f7
Bump dependency-check-gradle from 7.0.3 to 7.0.4.1
Bumps dependency-check-gradle from 7.0.3 to 7.0.4.1.

---
updated-dependencies:
- dependency-name: org.owasp:dependency-check-gradle
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-04-04 23:09:11 +00:00
Aris Kotsomitopoulos 8c9d2410b1
Merge pull request #5688 from vector-im/feature/aris/threads_main_timeline_messages_layout
Improved thread rendering in the main timeline
2022-04-04 23:22:51 +03:00
ariskotsomitopoulos 9e48b02b73 Add changelog 2022-04-04 19:56:47 +03:00
ariskotsomitopoulos 031c1b409b Implement Beta opt-in mechanism to inform users about threads. 2022-04-04 19:51:47 +03:00
Benoit Marty 3b8ffcf8a9
Merge pull request #5684 from vector-im/sync-analytics-plan
Sync analytics plan
2022-04-04 15:00:57 +02:00
Onuray Sahin ff34ed9eb2
Merge pull request #5660 from vector-im/feature/ons/live_location_banner_visibility
Show a banner in timeline while location sharing service is running
2022-04-04 12:55:50 +03:00
Onuray Sahin 48d40d8ba2
Merge pull request #5651 from vector-im/feature/ons/live_location_beacon_info
Live Location Sharing - Beacon Info
2022-04-04 12:55:22 +03:00
Onuray Sahin 273b4816db Fix lint error. 2022-04-04 12:03:43 +03:00
bmarty 921b562fd0 Sync analytics plan 2022-04-04 00:02:56 +00:00
Sveinn í Felli e1a08b82a3 Translated using Weblate (Icelandic)
Currently translated at 84.0% (1824 of 2171 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/is/
2022-04-02 20:59:30 +00:00
waclaw66 5fcc3a9955 Translated using Weblate (Czech)
Currently translated at 100.0% (2171 of 2171 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/cs/
2022-04-02 20:59:30 +00:00
Adam Brown 3aac59a5ae
Merge pull request #5080 from vector-im/feature/adm/encrypted-last-message
Updating encrypted room list message previews on key updates
2022-04-01 17:48:05 +01:00
Adam Brown 57bf044df0 adding documentation to the new session listener 2022-04-01 16:57:23 +01:00
Florian Renaud 45eb3bcbc5
Merge pull request #5649 from vector-im/hotfix/fre/rageshake_no_session
Replace "open settings" button by "disable" action in RageShake dialog if there is no session
2022-04-01 17:56:49 +02:00
Benoit Marty 664c3453be
Merge pull request #5674 from vector-im/dependabot/gradle/org.owasp-dependency-check-gradle-7.0.3
Bump dependency-check-gradle from 7.0.0 to 7.0.3
2022-04-01 17:49:38 +02:00
Benoit Marty b894a58849
Merge pull request #5675 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.46
Bump libphonenumber from 8.12.45 to 8.12.46
2022-04-01 17:49:03 +02:00