Skip to content
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

Jump to bottom

Backport: Revert local search #2745

Merged
merged 6 commits into from
Jun 23, 2018
Merged

Backport: Revert local search #2745

merged 6 commits into from
Jun 23, 2018

Commits on Jun 23, 2018

  1. on filter close: restore all files 

    Signed-off-by: tobiasKaminsky <[email protected]>
    @tobiasKaminsky @AndyScherzinger
    tobiasKaminsky authored and AndyScherzinger committed Jun 23, 2018
    Configuration menu
    Copy the full SHA
    0c883f9 View commit details
    Browse the repository at this point in the history

  2. correct annotations 

    Signed-off-by: tobiasKaminsky <[email protected]>
    @tobiasKaminsky @AndyScherzinger
    tobiasKaminsky authored and AndyScherzinger committed Jun 23, 2018
    Configuration menu
    Copy the full SHA
    1f7ec65 View commit details
    Browse the repository at this point in the history

  3. enhance javaDoc, add annotation

    @AndyScherzinger
    AndyScherzinger committed Jun 23, 2018
    Configuration menu
    Copy the full SHA
    8406ab4 View commit details
    Browse the repository at this point in the history

  4. On UploadFilesActivity FAB is always hidden 

    Signed-off-by: tobiasKaminsky <[email protected]>
    @tobiasKaminsky @AndyScherzinger
    tobiasKaminsky authored and AndyScherzinger committed Jun 23, 2018
    Configuration menu
    Copy the full SHA
    f59fc6f View commit details
    Browse the repository at this point in the history

  5. fix bug found by CR 

    Signed-off-by: tobiasKaminsky <[email protected]>

# Conflicts:
#	src/main/java/com/owncloud/android/ui/activity/UploadFilesActivity.java
    @tobiasKaminsky @AndyScherzinger
    tobiasKaminsky authored and AndyScherzinger committed Jun 23, 2018
    Configuration menu
    Copy the full SHA
    35476c2 View commit details
    Browse the repository at this point in the history

  6. imports after cherry pick

    @AndyScherzinger
    AndyScherzinger committed Jun 23, 2018
    Configuration menu
    Copy the full SHA
    60eea10 View commit details
    Browse the repository at this point in the history