Skip to content

Server settings#1091

Merged
stefan-niedermann merged 15 commits into
masterfrom
916-settings
Jun 28, 2021
Merged

Server settings#1091
stefan-niedermann merged 15 commits into
masterfrom
916-settings

Conversation

@stefan-niedermann

@stefan-niedermann stefan-niedermann commented Mar 15, 2021

Copy link
Copy Markdown
Member

Fixes #916

This currently works only if the user is online. I don't know if there is a scenario where user would change this offline, a offline mode for the settings seems a bit like an overkill because it only affects settings at the server side.

  • Restore ApiVersion#supportsSettings before merging
  • i18n

# Conflicts:
#	app/src/main/java/it/niedermann/owncloud/notes/manageaccounts/ManageAccountAdapter.java
#	app/src/main/java/it/niedermann/owncloud/notes/manageaccounts/ManageAccountViewHolder.java
#	app/src/main/java/it/niedermann/owncloud/notes/manageaccounts/ManageAccountsActivity.java
#	app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesClientV1.java
# Conflicts:
#	app/src/main/java/it/niedermann/owncloud/notes/manageaccounts/ManageAccountAdapter.java
#	app/src/main/java/it/niedermann/owncloud/notes/manageaccounts/ManageAccountsActivity.java
#	app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesClient.java
#	app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesClientV1.java
#	app/src/main/java/it/niedermann/owncloud/notes/shared/model/ApiVersion.java
#	app/src/main/res/values/strings.xml
# Conflicts:
#	app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesRepository.java
#	app/src/main/java/it/niedermann/owncloud/notes/shared/model/ApiVersion.java
#	app/src/main/res/values/strings.xml
Signed-off-by: Stefan Niedermann <info@niedermann.it>
Signed-off-by: Stefan Niedermann <info@niedermann.it>
Signed-off-by: Stefan Niedermann <info@niedermann.it>
Signed-off-by: Stefan Niedermann <info@niedermann.it>
Signed-off-by: Stefan Niedermann <info@niedermann.it>
@stefan-niedermann
stefan-niedermann marked this pull request as ready for review June 28, 2021 11:45
@stefan-niedermann
stefan-niedermann merged commit f9ccd7b into master Jun 28, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Change folder path to store notes

1 participant