Skip to content

Release 1.1.15: Cloud conflict resolution on Android (app core 2.44.0) #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adibhanna merged 6 commits into from
Sep 4, 2026
Merged

Release 1.1.15: Cloud conflict resolution on Android (app core 2.44.0) #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e08fb09
feat: enable Cloud conflict resolution on Android (#683)
adibhanna Sep 3, 2026
f0d2d60
chore: update the audited mobile build toolchain
adibhanna Sep 3, 2026
946029e
chore: pin ZenNotes 2.44.0 and keep Harper's dictionary safe
adibhanna Sep 4, 2026
3ba0e00
chore: pin ZenNotes 2.44.0 at its final tagged commit and bump to 1.1.15
adibhanna Sep 4, 2026
36bc381
chore: follow the 2.44.0 tag to its final commit
adibhanna Sep 4, 2026
ae9a7ac
chore: follow the 2.44.0 tag to its signing-fix commit
adibhanna Sep 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .zennotes-commit
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
43994ff7a37557d9014c48dffd06fd9f733405bd
f156bb1398b82f7f590d669fce5371783500f061
4 changes: 2 additions & 2 deletions android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ android {
applicationId "md.zennotes"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 16
versionName "1.1.14"
versionCode 17
versionName "1.1.15"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
aaptOptions {
// Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
Expand Down
Loading