Mirrors/notesnook

mirror of https://github.com/streetwriters/notesnook.git synced 2025-12-25 16:09:42 +01:00

Files

History

thecodrr e408d95b6c fix: use selected content's dateEdited on conflict resolve

this fixes an edge case where the conflicted note was further
updated after the conflict appeared in the front end.
Since we stop syncing if there's a conflict, there's no
way to update the conflicted note.
Instead, we use the selected content's date edited.
This makes sure that when we sync and if there's newer content,
a conflict happens again.

2021-07-25 11:35:00 +05:00

..

test: update snapshots

2021-07-25 09:57:25 +05:00

.github/workflows

ci: cleanup deploy action

2021-07-25 09:36:36 +05:00

…

ci: let action-electron-builder do the work

2021-07-07 14:10:16 +05:00

fix: editor not following app's theme

2021-07-20 23:19:51 +05:00

test: kill previous server instances before start

2021-07-17 08:26:28 +05:00

fix: use selected content's dateEdited on conflict resolve

2021-07-25 11:35:00 +05:00

.env-cmdrc.js

tests: use zx for running tests

2021-07-07 14:09:51 +05:00

.gitignore

ci: use @playwright/test

2021-07-07 12:46:20 +05:00

package.json

feat: significantly improve editor code block

2021-07-20 11:18:49 +05:00

playwright.config.js

ci: add beta deployment target

2021-07-25 09:32:42 +05:00

README.md

…

yarn.lock

ci: add beta deployment target

2021-07-25 09:32:42 +05:00

README.md

Notesnook

The best notes app in the world.