Age | Commit message (Collapse) | Author |
|
|
|
|
|
# Conflicts:
# app/build.gradle
# app/src/main/java/it/niedermann/owncloud/notes/shared/util/NoteUtil.java
# app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListWidget.java
# app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListWidgetFactory.java
# app/src/main/java/it/niedermann/owncloud/notes/widget/singlenote/SingleNoteWidget.java
# app/src/main/java/it/niedermann/owncloud/notes/widget/singlenote/SingleNoteWidgetFactory.java
# app/src/test/java/android/text/TextUtils.java
|
|
|
|
|
|
# Conflicts:
# app/build.gradle
# app/src/main/java/it/niedermann/owncloud/notes/FormattingHelpActivity.java
# app/src/main/java/it/niedermann/owncloud/notes/branding/BrandingUtil.java
# app/src/main/java/it/niedermann/owncloud/notes/edit/BaseNoteFragment.java
# app/src/main/java/it/niedermann/owncloud/notes/edit/NoteEditFragment.java
# app/src/main/java/it/niedermann/owncloud/notes/edit/NotePreviewFragment.java
# app/src/main/java/it/niedermann/owncloud/notes/edit/NoteReadonlyFragment.java
# app/src/main/java/it/niedermann/owncloud/notes/shared/util/text/NoteLinksProcessor.java
# app/src/main/java/it/niedermann/owncloud/notes/shared/util/text/TextProcessor.java
# app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListWidget.java
# app/src/main/res/drawable/ic_format_bold_black_24dp.xml
# app/src/main/res/drawable/ic_format_italic_black_24dp.xml
# app/src/main/res/drawable/ic_insert_link_black_24dp.xml
# app/src/main/res/menu/context_based_formatting.xml
# app/src/main/res/menu/context_based_range_formatting.xml
# app/src/main/res/values/strings.xml
# app/src/test/java/it/niedermann/owncloud/notes/shared/util/MarkDownUtilTest.java
# app/src/test/java/it/niedermann/owncloud/notes/shared/util/text/NoteLinksProcessorTest.java
|
|
|
|
|
|
|
|
see https://github.com/stefan-niedermann/nextcloud-notes/pull/967#issuecomment-751854626
|
|
# Conflicts:
# app/build.gradle
# app/src/main/java/it/niedermann/owncloud/notes/edit/NoteEditFragment.java
# app/src/main/java/it/niedermann/owncloud/notes/widget/singlenote/SingleNoteWidgetFactory.java
|
|
|
|
|
|
|
|
|
|
|
|
Category handling
|
|
Category handling
|
|
Rewrite NoSuchElementException for Widgets
|
|
Try to map table and column names for easier migration
|
|
|
|
Reduce diff
|
|
Reduce diff
|
|
|
|
Remove old DBNote and CloudNote
|
|
Remove old LocalAccount
|
|
Remove old SqliteOpenHelper database
|
|
|
|
Starting widgets
|
|
|
|
|
|
|