Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: nextcloud/android
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: wknds/android
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 4 commits
  • 2 files changed
  • 1 contributor

Commits on Sep 29, 2021

  1. :Conflict files are removed from the upload storage manager after dow… 

    …nloaded successfully.
    @wknds
    wknds committed Sep 29, 2021
    Configuration menu
    Copy the full SHA
    b31ee28 View commit details
    Browse the repository at this point in the history

  2. revert Project.xml

    @wknds
    wknds committed Sep 29, 2021
    Configuration menu
    Copy the full SHA
    ec04ba3 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of github.com:nextcloud/android

    @wknds
    wknds committed Sep 29, 2021
    Configuration menu
    Copy the full SHA
    fe8e31a View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2021

  1. removed a check in KEEP_SERVER switch clause. 1) The check prevents s… 

    …olving file conflicts (keep server) correctly. 2) The check involves FileUploader.LOCAL_BEHAVIOUR_DELETE, intended use is for media file uploads.
    @wknds
    wknds committed Oct 4, 2021
    Configuration menu
    Copy the full SHA
    114af48 View commit details
    Browse the repository at this point in the history
Loading