Matrix/element-android-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-android.git synced 2024-11-16 02:05:06 +08:00
Code Issues Packages Projects Releases Wiki Activity
18,348 Commits 530 Branches 157 Tags 485 MiB
a5536ab894
Commit Graph

18348 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ericdecanini
a5536ab894 Merge remote-tracking branch 'origin/develop' into feature/eric/new-layout-navigation 
# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/NewHomeDetailFragment.kt
 2022-08-25 16:15:53 +02:00
Nikita Fedrunov
225d05e0be
bottom navigation tabs are removed for AppLayout (#6905) 2022-08-25 15:59:38 +02:00
ericdecanini
51ccd43724 Removes change space from strings xml 2022-08-25 14:16:20 +02:00
Nikita Fedrunov
da70d520bc
fixed space switching dialog measured with wrong height sometimes (#6928) 2022-08-25 10:49:44 +02:00
ericdecanini
64894d4443 Merge remote-tracking branch 'origin/develop' into feature/eric/new-layout-navigation 
# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/NewHomeDetailFragment.kt
 2022-08-24 20:25:02 +02:00
Benoit Marty
2b5920e451
Merge pull request #6894 from vector-im/feature/bma/remove_fragment_module 
Remove fragment module
 2022-08-24 12:30:02 +02:00
Benoit Marty
4c2f8537e1 Changelog 2022-08-23 18:51:14 +02:00
Benoit Marty
d7b2cc095a Format fixes. 2022-08-23 18:49:16 +02:00
Benoit Marty
c494644abf Inject AvatarRenderer normally. 2022-08-23 18:49:16 +02:00
Benoit Marty
80b3c45928 Create a GalleryOrCameraDialogHelperFactory 2022-08-23 18:49:16 +02:00
Benoit Marty
8555758911 Remove the FragmentFactory reference 2022-08-23 18:49:16 +02:00
Benoit Marty
22db6b4619 Use @AndroidEntryPoint for all Fragment 2022-08-23 18:49:16 +02:00
Benoit Marty
997336ec5d No need to Inject constructor 2022-08-23 18:47:23 +02:00
Benoit Marty
5f0b26ae39 Remove FragmentModule 2022-08-23 18:47:23 +02:00
Benoit Marty
d85a16482e
Merge pull request #6700 from vector-im/sync-analytics-plan 
Sync analytics plan
 2022-08-23 17:14:02 +02:00
Benoit Marty
f6e382572e
Merge pull request #6893 from vector-im/dependabot/gradle/flipper-0.161.0 
Bump flipper from 0.157.0 to 0.161.0
 2022-08-23 17:09:37 +02:00
Benoit Marty
a869a7208c
Merge pull request #6913 from vector-im/dependabot/github_actions/danger/danger-js-11.1.2 
Bump danger/danger-js from 11.1.1 to 11.1.2
 2022-08-23 17:09:01 +02:00
Benoit Marty
8e853fe091
Merge pull request #6914 from vector-im/dependabot/gradle/org.owasp-dependency-check-gradle-7.1.2 
Bump dependency-check-gradle from 7.1.1 to 7.1.2
 2022-08-23 17:07:53 +02:00
Benoit Marty
973a5f1d6e Version++ 2022-08-23 17:02:24 +02:00
Benoit Marty
6c47635a87 Merge branch 'release/v1.4.34' into develop 2022-08-23 17:00:10 +02:00
Benoit Marty
6c2885ff39 Granfra's review 2022-08-23 16:36:39 +02:00
Benoit Marty
adcb3c594a fastlane 2022-08-23 16:09:36 +02:00
Benoit Marty
34fef8d197 reorder changelog 2022-08-23 16:08:52 +02:00
Benoit Marty
033557dba4 Towncrier 2022-08-23 16:07:57 +02:00
Benoit Marty
58954ed590 Fix Exception: java.lang.IllegalArgumentException: Configurations cannot be different if used to open the same file. 
See for instance https://github.com/matrix-org/element-android-rageshakes/issues/41975
 2022-08-23 15:36:17 +02:00
Benoit Marty
203a262c66 Add a step in the recipe 2022-08-23 15:21:44 +02:00
Benoit Marty
7883a6c617 Rename gl to gl-ES to be PlayStore compatible, and unignore this language. 2022-08-23 15:16:12 +02:00
Benoit Marty
1c8fccad30
Merge pull request #6908 from vector-im/feature/bma/fix_crash 
Fix crash when signing out.
 2022-08-23 15:07:55 +02:00
Benoit Marty
94e755552c
Merge pull request #6888 from vector-im/feature/adm/change-server-on-error 
FTUE - Allow changing server on onboarding start error
 2022-08-23 15:05:51 +02:00
Benoit Marty
074a9e0da6
Merge pull request #6916 from vector-im/feature/bma/weblate_sync_1_4_34 
Feature/bma/weblate sync 1 4 34
 2022-08-23 15:03:47 +02:00
Benoit Marty
9e0340bbea Remove unused strings 2022-08-23 12:13:47 +02:00
Benoit Marty
caf3308ea7 Fix lint issue 2022-08-23 11:24:54 +02:00
Benoit Marty
577cc58fab
Merge pull request #6915 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2022-08-23 11:24:06 +02:00
ericdecanini
d7daca9150 Replaces try catch back handling with check for backstack root 2022-08-23 10:36:52 +02:00
Weblate
3a44c7ce93 Merge branch 'origin/develop' into Weblate. 2022-08-23 08:12:46 +00:00
Metehan Özyürek
692f04496b Translated using Weblate (Turkish) 
Currently translated at 66.2% (1544 of 2330 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/tr/
 2022-08-23 08:12:37 +00:00
ericdecanini
ace2c672ed Merge remote-tracking branch 'origin/develop' into feature/eric/new-layout-navigation 2022-08-23 10:00:55 +02:00
Eric Decanini
2830664dbb
Merge pull request #6868 from vector-im/feature/eric/space-settings 
Space Switching: Adds Toolbar Click To Open Space Settings
 2022-08-23 09:59:09 +02:00
dependabot[bot]
12f4a05745
Bump dependency-check-gradle from 7.1.1 to 7.1.2 
Bumps dependency-check-gradle from 7.1.1 to 7.1.2.

---
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-08-22 23:07:56 +00:00
dependabot[bot]
0d38ace8ca
Bump danger/danger-js from 11.1.1 to 11.1.2 
Bumps [danger/danger-js](https://github.com/danger/danger-js) from 11.1.1 to 11.1.2.
- [Release notes](https://github.com/danger/danger-js/releases)
- [Changelog](https://github.com/danger/danger-js/blob/main/CHANGELOG.md)
- [Commits](https://github.com/danger/danger-js/compare/11.1.1...11.1.2)

---
updated-dependencies:
- dependency-name: danger/danger-js
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-22 23:07:54 +00:00
Adam Brown
8336d4c269 adding changelog entry 2022-08-22 17:24:11 +01:00
Adam Brown
d7bc43584d adding tests around forwarding to the edit server selection when the initial server selection fails 2022-08-22 17:24:11 +01:00
Adam Brown
b50b6daca1 using wider range network error when deciding to forward to the edit server instead of just unknown host 
- will also capture timeouts
 2022-08-22 17:24:11 +01:00
Adam Brown
4cc0b81c86 removing deeplink error handling as its now covered by the edit server flow instead 2022-08-22 17:24:11 +01:00
Adam Brown
cdf75be0ec redirecting to the edit server screen when attempting to select the initial homeserver choice and it fails 2022-08-22 17:24:10 +01:00
Adam Brown
0be46adfda
Merge pull request #6862 from vector-im/feature/adm/ftue-fragment-crashes 
FTUE - Crash fixes
 2022-08-22 17:21:31 +01:00
Adam Brown
841ee33c82
Merge pull request #6837 from vector-im/feature/adm/missing-notifications 
Missing notifications due to stuck background workers
 2022-08-22 17:20:04 +01:00
Benoit Marty
32bfaf8868 Fix crash when signing out. 
At this point, we do not want the sync to start, the DB is already deleted.
 2022-08-22 16:16:27 +02:00
ericdecanini
edb2d5d78e Merge remote-tracking branch 'origin/develop' into feature/eric/new-layout-navigation 
# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
#	vector/src/main/java/im/vector/app/features/home/NewHomeDetailFragment.kt
 2022-08-22 14:56:14 +02:00
Eric Decanini
86438cf09c
Merge pull request #6871 from vector-im/feature/eric/new-layout-debug 
Debug Icon UX Improvements & Addition in New Layout
 2022-08-22 14:48:32 +02:00