mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-11-24 10:25:35 +03:00
Code Issues Projects Releases Packages Wiki Activity
14852 commits 161 branches 158 tags 270 MiB
Commit graph

14852 commits

This branch
This branch
All branches
Author SHA1 Message Date
ariskotsomitopoulos
1b9fd3bdd4 Add changelog 2022-04-06 16:04:48 +03:00
ariskotsomitopoulos
9d41508530 Prune the content of deleted events completely 2022-04-06 15:48:54 +03:00
Benoit Marty
c849cc5c5d
Merge pull request #5079 from vector-im/feature/bma/konfetti2 
WIP and low priority: upgrade konfetti to 2.0.2
 2022-04-06 10:00:09 +02:00
Benoit Marty
930ce0629b Changelog 2022-04-06 09:59:26 +02:00
Benoit Marty
02401f7f3d Version++ 2022-04-05 22:37:16 +02:00
Benoit Marty
bf24b86f71 Merge branch 'release/1.4.10' into develop 2022-04-05 22:35:06 +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
4f27ab263f Update parameters 2022-04-04 16:08:56 +02:00
Benoit Marty
a0899477e9 Try with 2.0.2 2022-04-04 15:19:26 +02:00
Benoit Marty
9050c488e4 konfetti 2.0.1 
Does not compile
 2022-04-04 15:19:26 +02: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