Repository navigation
Upstream sync: 57 new commit(s) from nextcloud/notes-android - #7
Merged
Merged
Conversation
… to the user deleting an entire line Signed-off-by: daniele-verducci <daniele.verducci@nextcloud.com>
Signed-off-by: daniele-verducci <daniele.verducci@nextcloud.com>
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Signed-off-by: daniele-verducci <daniele.verducci@nextcloud.com>
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
…x-lockfile chore(deps): update dependency fastlane to v2.239.0
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
…x-lockfile chore(deps): update dependency fastlane to v2.239.0
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
…r-cursor-while-editing Avoid edit button to cover cursor when the text is scrolled due to the user deleting an entire line
Fixed loading message not disappearing when the note is loaded
…x-lockfile chore(deps): update dependency fastlane to v2.239.0
…x-lockfile chore(deps): update dependency fastlane to v2.239.0
…up-java-6.x chore(deps): update actions/setup-java action to v6.0.1
…ql-action-4.x chore(deps): update github/codeql-action action to v4.38.0
…x-lockfile chore(deps): update dependency fastlane to v2.239.0
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
…5.1.0 chore(version): bump to 35.1.0 alpha 1
…repo fix(deps): update kotlin monorepo to v2.4.20
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
fix(deps): update dependency androidx.room:room-compiler to v2.8.5
…x-lockfile chore(deps): update dependency fastlane to v2.240.0
chore(deps): update dependency java-jdk to v25
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
…x-lockfile chore(deps): update dependency fastlane to v2.240.1
Signed-off-by: nextcloud-android-bot <android@nextcloud.com>
…nextcloud-android-library-2.x fix(deps): update dependency com.github.nextcloud:android-library to v2.26.0
Robolectric 4.17 requires explicit --add-opens JVM flags on JDK 17+ to access internal JDK classes, otherwise every Robolectric-backed unit test fails at bootstrap with IllegalAccessException. CI runs on JDK 21. AI-assistant: Claude Code 2.1.80 (Claude Sonnet 4.6) Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
…tric-robolectric-4.x fix(deps): update dependency org.robolectric:robolectric to v4.17
…nfig/main 🔄 synced file(s) with nextcloud/android-config
chore(deps): update dependency java-jdk to v25
Adds trust/checksum entries for the new transitive dependencies pulled in by nextcloudandroidcommonlib 0.34.0 (dagger 2.60.1, androidx.exifinterface 1.4.2, androidx.profileinstaller 1.4.1, io.coil-kt.coil3, com.google.accompanist:accompanist-drawablepainter, com.caverock:androidsvg-aar, org.jetbrains.compose.*), which caused dependency verification to fail on PR nextcloud#3351. Assisted-by: ClaudeCode:claude-sonnet-5 Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
…droidcommonlib fix(deps): update nextcloudandroidcommonlib to v0.34.0
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
…ql-action-4.x chore(deps): update github/codeql-action action to v4.38.1
….tools.build-gradle-9.x fix(deps): update dependency com.android.tools.build:gradle to v9.4.1
…lution) Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
xeniacloud
added a commit
that referenced
this pull request
Sep 20, 2026
…eam-sync-conflict Fix unresolved conflict markers left on main by PR #7 (broke CI)
This was referenced Sep 23, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Automated catch-up sync against nextcloud/notes-android main.
This merge has unresolved conflicts (committed as-is with conflict markers) - resolve them on this branch before merging. Conflict is in
app/build.gradle(branding/versioning collision, most likely).This PR is never auto-merged - review each commit for conflicts with our branding and release plumbing before merging.
Upstream commits
🤖 Generated with Claude Code