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

Auto Upload (Android 7+) #358

Merged
merged 114 commits into from Nov 16, 2016
Merged

Auto Upload (Android 7+) #358

merged 114 commits into from Nov 16, 2016

Commits on Sep 26, 2016

  1. add database for synced folders

    @tobiasKaminsky @AndyScherzinger
    tobiasKaminsky authored and AndyScherzinger committed Sep 26, 2016
    Configuration menu
    Copy the full SHA
    cf27c2c View commit details
    Browse the repository at this point in the history

  2. initial navigation setup for menu and activity

    @AndyScherzinger
    AndyScherzinger committed Sep 26, 2016
    Configuration menu
    Copy the full SHA
    30669c9 View commit details
    Browse the repository at this point in the history

  3. header fix

    @AndyScherzinger
    AndyScherzinger committed Sep 26, 2016
    Configuration menu
    Copy the full SHA
    db67a4f View commit details
    Browse the repository at this point in the history

  4. sync config icons

    @AndyScherzinger
    AndyScherzinger committed Sep 26, 2016
    Configuration menu
    Copy the full SHA
    b27b5a4 View commit details
    Browse the repository at this point in the history

  5. initial add for recycler view implementation with headers (WIP)

    @AndyScherzinger
    AndyScherzinger committed Sep 26, 2016
    Configuration menu
    Copy the full SHA
    c1c7d23 View commit details
    Browse the repository at this point in the history

  6. rudimentary media loader implementation (file thumbnails and any acti… 

    …on TBD)
    @AndyScherzinger
    AndyScherzinger committed Sep 26, 2016
    Configuration menu
    Copy the full SHA
    36280b9 View commit details
    Browse the repository at this point in the history

  7. initial v1 for grid view

    @AndyScherzinger
    AndyScherzinger committed Sep 26, 2016
    Configuration menu
    Copy the full SHA
    4c31ca1 View commit details
    Browse the repository at this point in the history

  8. proper thumbnails, image counter, darkening etc.

    @AndyScherzinger
    AndyScherzinger committed Sep 26, 2016
    Configuration menu
    Copy the full SHA
    c0afddd View commit details
    Browse the repository at this point in the history

  9. initial link of menu buttons

    @AndyScherzinger
    AndyScherzinger committed Sep 26, 2016
    Configuration menu
    Copy the full SHA
    038f316 View commit details
    Browse the repository at this point in the history

  10. initial navigation setup for menu and activity

    @AndyScherzinger
    AndyScherzinger committed Sep 26, 2016
    Configuration menu
    Copy the full SHA
    27cb68b View commit details
    Browse the repository at this point in the history

  11. initial add for recycler view implementation with headers (WIP)

    @AndyScherzinger
    AndyScherzinger committed Sep 26, 2016
    Configuration menu
    Copy the full SHA
    d2aa22f View commit details
    Browse the repository at this point in the history

  12. wip

    @tobiasKaminsky @AndyScherzinger
    tobiasKaminsky authored and AndyScherzinger committed Sep 26, 2016
    Configuration menu
    Copy the full SHA
    12e4532 View commit details
    Browse the repository at this point in the history

  13. wip

    @tobiasKaminsky @AndyScherzinger
    tobiasKaminsky authored and AndyScherzinger committed Sep 26, 2016
    Configuration menu
    Copy the full SHA
    59da136 View commit details
    Browse the repository at this point in the history

  14. wip

    @tobiasKaminsky @AndyScherzinger
    tobiasKaminsky authored and AndyScherzinger committed Sep 26, 2016
    Configuration menu
    Copy the full SHA
    281f970 View commit details
    Browse the repository at this point in the history

  15. ignore gradle.properties for git

    @AndyScherzinger
    AndyScherzinger committed Sep 26, 2016
    Configuration menu
    Copy the full SHA
    25117bc View commit details
    Browse the repository at this point in the history

  16. layout tweaking, better listener support, loading visualization

    @AndyScherzinger
    AndyScherzinger committed Sep 26, 2016
    Configuration menu
    Copy the full SHA
    dc1b7b3 View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2016

  1. renamed upload action column, extended SyncFolder POJO, createdd a dr… 

    …aft implementation of a SyncFolderProvider for DB operations
    @AndyScherzinger
    AndyScherzinger committed Sep 28, 2016
    Configuration menu
    Copy the full SHA
    dd35c49 View commit details
    Browse the repository at this point in the history

  2. make SyncedFolderObserverService use SyncedFolderProvider (todo also … 

    …move the Observable to the Provider implementation)
    @AndyScherzinger
    AndyScherzinger committed Sep 28, 2016
    Configuration menu
    Copy the full SHA
    a883dfc View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2016

  1. hardening provider implementation + javadoc

    @AndyScherzinger
    AndyScherzinger committed Sep 29, 2016
    Configuration menu
    Copy the full SHA
    512b7ad View commit details
    Browse the repository at this point in the history

  2. add database for synced folders

    @tobiasKaminsky @AndyScherzinger
    tobiasKaminsky authored and AndyScherzinger committed Sep 29, 2016
    Configuration menu
    Copy the full SHA
    9f67ced View commit details
    Browse the repository at this point in the history

  3. initial navigation setup for menu and activity

    @AndyScherzinger
    AndyScherzinger committed Sep 29, 2016
    Configuration menu
    Copy the full SHA
    cf4498d View commit details
    Browse the repository at this point in the history

  4. header fix

    @AndyScherzinger
    AndyScherzinger committed Sep 29, 2016
    Configuration menu
    Copy the full SHA
    61244d0 View commit details
    Browse the repository at this point in the history

  5. sync config icons

    @AndyScherzinger
    AndyScherzinger committed Sep 29, 2016
    Configuration menu
    Copy the full SHA
    2334e06 View commit details
    Browse the repository at this point in the history

  6. initial add for recycler view implementation with headers (WIP)

    @AndyScherzinger
    AndyScherzinger committed Sep 29, 2016
    Configuration menu
    Copy the full SHA
    20dbdb8 View commit details
    Browse the repository at this point in the history

  7. rudimentary media loader implementation (file thumbnails and any acti… 

    …on TBD)
    @AndyScherzinger
    AndyScherzinger committed Sep 29, 2016
    Configuration menu
    Copy the full SHA
    9874b09 View commit details
    Browse the repository at this point in the history

  8. initial v1 for grid view

    @AndyScherzinger
    AndyScherzinger committed Sep 29, 2016
    Configuration menu
    Copy the full SHA
    0e6d395 View commit details
    Browse the repository at this point in the history

  9. proper thumbnails, image counter, darkening etc.

    @AndyScherzinger
    AndyScherzinger committed Sep 29, 2016
    Configuration menu
    Copy the full SHA
    ef53c97 View commit details
    Browse the repository at this point in the history

  10. initial link of menu buttons

    @AndyScherzinger
    AndyScherzinger committed Sep 29, 2016
    Configuration menu
    Copy the full SHA
    6369364 View commit details
    Browse the repository at this point in the history

  11. initial navigation setup for menu and activity

    @AndyScherzinger
    AndyScherzinger committed Sep 29, 2016
    Configuration menu
    Copy the full SHA
    34cae92 View commit details
    Browse the repository at this point in the history

  12. initial add for recycler view implementation with headers (WIP)

    @AndyScherzinger
    AndyScherzinger committed Sep 29, 2016
    Configuration menu
    Copy the full SHA
    db87263 View commit details
    Browse the repository at this point in the history

  13. wip

    @tobiasKaminsky @AndyScherzinger
    tobiasKaminsky authored and AndyScherzinger committed Sep 29, 2016
    Configuration menu
    Copy the full SHA
    99a8278 View commit details
    Browse the repository at this point in the history

  14. wip

    @tobiasKaminsky @AndyScherzinger
    tobiasKaminsky authored and AndyScherzinger committed Sep 29, 2016
    Configuration menu
    Copy the full SHA
    7fef98c View commit details
    Browse the repository at this point in the history

  15. wip

    @tobiasKaminsky @AndyScherzinger
    tobiasKaminsky authored and AndyScherzinger committed Sep 29, 2016
    Configuration menu
    Copy the full SHA
    77353f6 View commit details
    Browse the repository at this point in the history

  16. ignore gradle.properties for git

    @AndyScherzinger
    AndyScherzinger committed Sep 29, 2016
    Configuration menu
    Copy the full SHA
    6774a00 View commit details
    Browse the repository at this point in the history

  17. layout tweaking, better listener support, loading visualization

    @AndyScherzinger
    AndyScherzinger committed Sep 29, 2016
    Configuration menu
    Copy the full SHA
    a1931ed View commit details
    Browse the repository at this point in the history

  18. renamed upload action column, extended SyncFolder POJO, createdd a dr… 

    …aft implementation of a SyncFolderProvider for DB operations
    @AndyScherzinger
    AndyScherzinger committed Sep 29, 2016
    Configuration menu
    Copy the full SHA
    67d7ec9 View commit details
    Browse the repository at this point in the history

  19. make SyncedFolderObserverService use SyncedFolderProvider (todo also … 

    …move the Observable to the Provider implementation)
    @AndyScherzinger
    AndyScherzinger committed Sep 29, 2016
    Configuration menu
    Copy the full SHA
    78dfb7c View commit details
    Browse the repository at this point in the history

  20. hardening provider implementation + javadoc

    @AndyScherzinger
    AndyScherzinger committed Sep 29, 2016
    Configuration menu
    Copy the full SHA
    a04682f View commit details
    Browse the repository at this point in the history

  21. Merge branch 'syncedFolders' of https://github.com/nextcloud/android … 

    …into syncedFolders
    @AndyScherzinger
    AndyScherzinger committed Sep 29, 2016
    Configuration menu
    Copy the full SHA
    f868e0d View commit details
    Browse the repository at this point in the history

  22. initial code to read (yet empty DB) and display settings screen (non-… 

    …functional yet)
    @AndyScherzinger
    AndyScherzinger committed Sep 29, 2016
    Configuration menu
    Copy the full SHA
    17b9eae View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2016

  1. toggle folder's sync on/off - wip since state persistence is not work… 

    …ing reliably yet
    @AndyScherzinger
    AndyScherzinger committed Sep 30, 2016
    Configuration menu
    Copy the full SHA
    b9c15c1 View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2016

  1. Merge branch 'master' of https://github.com/nextcloud/android into sy… 

    …ncedFolders
    @AndyScherzinger
    AndyScherzinger committed Oct 6, 2016
    Configuration menu
    Copy the full SHA
    d7f461a View commit details
    Browse the repository at this point in the history

  2. minor layout optimization

    @AndyScherzinger
    AndyScherzinger committed Oct 6, 2016
    Configuration menu
    Copy the full SHA
    b607a77 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/nextcloud/android into sy… 

    …ncedFolders
    @AndyScherzinger
    AndyScherzinger committed Oct 6, 2016
    Configuration menu
    Copy the full SHA
    c4c1b6b View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' of https://github.com/nextcloud/android into sy… 

    …ncedFolders
    @AndyScherzinger
    AndyScherzinger committed Oct 6, 2016
    Configuration menu
    Copy the full SHA
    4796633 View commit details
    Browse the repository at this point in the history

  5. initial wip implementation of config element click listeners

    @AndyScherzinger
    AndyScherzinger committed Oct 6, 2016
    Configuration menu
    Copy the full SHA
    ccb16b7 View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2016

  1. Merge branch 'master' of https://github.com/nextcloud/android into sy… 

    …ncedFolders
    @AndyScherzinger
    AndyScherzinger committed Oct 9, 2016
    Configuration menu
    Copy the full SHA
    5214659 View commit details
    Browse the repository at this point in the history

  2. remote folder can now be changed, all config changes for a synced fol… 

    …der are now saved
    @AndyScherzinger
    AndyScherzinger committed Oct 9, 2016
    Configuration menu
    Copy the full SHA
    b557b07 View commit details
    Browse the repository at this point in the history

  3. ellipsizing

    @AndyScherzinger
    AndyScherzinger committed Oct 9, 2016
    Configuration menu
    Copy the full SHA
    e1273ee View commit details
    Browse the repository at this point in the history

  4. removed toast

    @AndyScherzinger
    AndyScherzinger committed Oct 9, 2016
    Configuration menu
    Copy the full SHA
    48d3ef6 View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2016

  1. bump gradle plugin to 2.2.1

    @AndyScherzinger
    AndyScherzinger committed Oct 10, 2016
    Configuration menu
    Copy the full SHA
    0454c24 View commit details
    Browse the repository at this point in the history

  2. better empty message

    @AndyScherzinger
    AndyScherzinger committed Oct 10, 2016
    Configuration menu
    Copy the full SHA
    52fdc31 View commit details
    Browse the repository at this point in the history

  3. media folder sorting (enabled, alphanumerical) + javadoc

    @AndyScherzinger
    AndyScherzinger committed Oct 10, 2016
    Configuration menu
    Copy the full SHA
    db96fe0 View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2016

  1. removed dummy synced folder entry

    @tobiasKaminsky
    tobiasKaminsky committed Oct 12, 2016
    Configuration menu
    Copy the full SHA
    179c695 View commit details
    Browse the repository at this point in the history

  2. update job to obey syncedfolder settings

    @tobiasKaminsky
    tobiasKaminsky committed Oct 12, 2016
    Configuration menu
    Copy the full SHA
    c3a8b0c View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2016

  1. grid spacing added + negative/shortened margins for containers for ni… 

    …ce image grids
    @AndyScherzinger
    AndyScherzinger committed Oct 13, 2016
    Configuration menu
    Copy the full SHA
    0889f8a View commit details
    Browse the repository at this point in the history

  2. minor persistence bugfix

    @AndyScherzinger
    AndyScherzinger committed Oct 13, 2016
    Configuration menu
    Copy the full SHA
    6783a1c View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2016

  1. persistence fix

    @AndyScherzinger
    AndyScherzinger committed Oct 17, 2016
    Configuration menu
    Copy the full SHA
    bf39292 View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2016

  1. Merge branch 'master' of https://github.com/nextcloud/android into sy… 

    …ncedFolders
    @AndyScherzinger
    AndyScherzinger committed Oct 19, 2016
    Configuration menu
    Copy the full SHA
    e053caf View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2016

  1. fix wlan upload

    @tobiasKaminsky
    tobiasKaminsky committed Oct 21, 2016
    Configuration menu
    Copy the full SHA
    c714779 View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2016

  1. enforce camera folder top position

    @AndyScherzinger
    AndyScherzinger committed Oct 24, 2016
    Configuration menu
    Copy the full SHA
    a4a41a6 View commit details
    Browse the repository at this point in the history

  2. hide instant upload icon on Android pre-lollipop

    @AndyScherzinger
    AndyScherzinger committed Oct 24, 2016
    Configuration menu
    Copy the full SHA
    6afeee7 View commit details
    Browse the repository at this point in the history

  3. Order images by date (to always show the latest pictures taken)

    @AndyScherzinger
    AndyScherzinger committed Oct 24, 2016
    Configuration menu
    Copy the full SHA
    eff5d9e View commit details
    Browse the repository at this point in the history

  4. fix default upload behavior for synced folder

    @AndyScherzinger
    AndyScherzinger committed Oct 24, 2016
    Configuration menu
    Copy the full SHA
    e68c547 View commit details
    Browse the repository at this point in the history

  5. hide legacy instant upload preferences on Android 5+

    @AndyScherzinger
    AndyScherzinger committed Oct 24, 2016
    Configuration menu
    Copy the full SHA
    223e29d View commit details
    Browse the repository at this point in the history

  6. minor renamings & javadoc

    @AndyScherzinger
    AndyScherzinger committed Oct 24, 2016
    Configuration menu
    Copy the full SHA
    c30dcd4 View commit details
    Browse the repository at this point in the history

  7. dynamic media grid width sizing and revampedd instant upload icon

    @AndyScherzinger
    AndyScherzinger committed Oct 24, 2016
    Configuration menu
    Copy the full SHA
    faea2f0 View commit details
    Browse the repository at this point in the history

  8. fix copyright note

    @AndyScherzinger
    AndyScherzinger committed Oct 24, 2016
    Configuration menu
    Copy the full SHA
    85b2223 View commit details
    Browse the repository at this point in the history

  9. fix synced folder settings dialog theming + code cleanup

    @AndyScherzinger
    AndyScherzinger committed Oct 24, 2016
    Configuration menu
    Copy the full SHA
    9efa7de View commit details
    Browse the repository at this point in the history

  10. initially show instant upload feature revamp message if instant uploa… 

    …d has been used/active with the legacy preferences
    @AndyScherzinger
    AndyScherzinger committed Oct 24, 2016
    Configuration menu
    Copy the full SHA
    a3cf129 View commit details
    Browse the repository at this point in the history

  11. better legacy shared prefereenced cleanup

    @AndyScherzinger
    AndyScherzinger committed Oct 24, 2016
    Configuration menu
    Copy the full SHA
    cf28cdb View commit details
    Browse the repository at this point in the history

  12. Merge branch 'master' of https://github.com/nextcloud/android into sy… 

    …ncedFolders
    @AndyScherzinger
    AndyScherzinger committed Oct 24, 2016
    Configuration menu
    Copy the full SHA
    fbca8cd View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2016

  1. recyclerview/media-folder optimized thumbnail cache/async task implem… 

    …entation
    @AndyScherzinger
    AndyScherzinger committed Oct 25, 2016
    Configuration menu
    Copy the full SHA
    d2d8352 View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2016

  1. added possibility to enable/disable sync folder in the settings screen

    @AndyScherzinger
    AndyScherzinger committed Oct 26, 2016
    Configuration menu
    Copy the full SHA
    cc45b0f View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/nextcloud/android into sy… 

    …ncedFolders
    @AndyScherzinger
    AndyScherzinger committed Oct 26, 2016
    Configuration menu
    Copy the full SHA
    e3bd1ce View commit details
    Browse the repository at this point in the history

  3. removed final declaration

    @AndyScherzinger
    AndyScherzinger committed Oct 26, 2016
    Configuration menu
    Copy the full SHA
    e879517 View commit details
    Browse the repository at this point in the history

  4. tweaked layout for preferences

    @AndyScherzinger
    AndyScherzinger committed Oct 26, 2016
    Configuration menu
    Copy the full SHA
    29d5e1e View commit details
    Browse the repository at this point in the history

  5. fixed review comments

    @AndyScherzinger
    AndyScherzinger committed Oct 26, 2016
    Configuration menu
    Copy the full SHA
    235b01b View commit details
    Browse the repository at this point in the history

  6. observers are restarted after changing a setting

    @tobiasKaminsky
    tobiasKaminsky committed Oct 26, 2016
    Configuration menu
    Copy the full SHA
    3c62f41 View commit details
    Browse the repository at this point in the history

  7. header

    @AndyScherzinger
    AndyScherzinger committed Oct 26, 2016
    Configuration menu
    Copy the full SHA
    10cc73c View commit details
    Browse the repository at this point in the history

  8. beatufied code

    @AndyScherzinger
    AndyScherzinger committed Oct 26, 2016
    Configuration menu
    Copy the full SHA
    624e222 View commit details
    Browse the repository at this point in the history

  9. added javadoc

    @AndyScherzinger
    AndyScherzinger committed Oct 26, 2016
    Configuration menu
    Copy the full SHA
    66c4a57 View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2016

  1. moved to switch instead of icon

    @AndyScherzinger
    AndyScherzinger committed Oct 27, 2016
    Configuration menu
    Copy the full SHA
    34003e9 View commit details
    Browse the repository at this point in the history

  2. only show folder path on topo with synced folder made bold

    @AndyScherzinger
    AndyScherzinger committed Oct 27, 2016
    Configuration menu
    Copy the full SHA
    a720561 View commit details
    Browse the repository at this point in the history

  3. proper formatting

    @AndyScherzinger
    AndyScherzinger committed Oct 27, 2016
    Configuration menu
    Copy the full SHA
    67672c5 View commit details
    Browse the repository at this point in the history

  4. fix media queries escaping folder names and respecting folders with s… 

    …ame names

Resolves: #361
    @AndyScherzinger
    AndyScherzinger committed Oct 27, 2016
    Configuration menu
    Copy the full SHA
    e0eb7fb View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2016

  1. Instant Upload --> Instant upload

    @AndyScherzinger
    AndyScherzinger committed Oct 31, 2016
    Configuration menu
    Copy the full SHA
    0b26154 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/nextcloud/android into sy… 

    …ncedFolders
    @AndyScherzinger
    AndyScherzinger committed Oct 31, 2016
    Configuration menu
    Copy the full SHA
    d49d248 View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2016

  1. Instant upload --> Auto upload

    @AndyScherzinger
    AndyScherzinger committed Nov 1, 2016
    Configuration menu
    Copy the full SHA
    9a6bf6e View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/nextcloud/android into sy… 

    …ncedFolders

# Conflicts:
#	res/layout/drawer.xml
#	res/layout/drawer_header.xml
#	src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
    @AndyScherzinger
    AndyScherzinger committed Nov 1, 2016
    Configuration menu
    Copy the full SHA
    fc6e3fc View commit details
    Browse the repository at this point in the history

  3. Fixes after rebase

    @AndyScherzinger
    AndyScherzinger committed Nov 1, 2016
    Configuration menu
    Copy the full SHA
    d912bd2 View commit details
    Browse the repository at this point in the history

  4. further merge fixes

    @AndyScherzinger
    AndyScherzinger committed Nov 1, 2016
    Configuration menu
    Copy the full SHA
    d713294 View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2016

  1. Merge branch 'master' of https://github.com/nextcloud/android into sy… 

    …ncedFolders

# Conflicts:
#	src/com/owncloud/android/MainApp.java
#	src/com/owncloud/android/ui/activity/Preferences.java
    @AndyScherzinger
    AndyScherzinger committed Nov 2, 2016
    Configuration menu
    Copy the full SHA
    fee2521 View commit details
    Browse the repository at this point in the history

  2. fixes for preferences after merge

    @AndyScherzinger
    AndyScherzinger committed Nov 2, 2016
    Configuration menu
    Copy the full SHA
    a737c09 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/nextcloud/android into sy… 

    …ncedFolders
    @AndyScherzinger
    AndyScherzinger committed Nov 2, 2016
    Configuration menu
    Copy the full SHA
    9d7c953 View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2016

  1. dirty fix for null occurence

    @tobiasKaminsky
    tobiasKaminsky committed Nov 3, 2016
    Configuration menu
    Copy the full SHA
    ccccbbb View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2016

  1. fix wrong upload behaviour

    @tobiasKaminsky
    tobiasKaminsky committed Nov 6, 2016
    Configuration menu
    Copy the full SHA
    af859df View commit details
    Browse the repository at this point in the history

  2. fix crash when exposing URI on Android 7+

    @AndyScherzinger
    AndyScherzinger committed Nov 6, 2016
    Configuration menu
    Copy the full SHA
    c3eb12c View commit details
    Browse the repository at this point in the history

  3. Avoid instantiating Boolean objects; reference Boolean.TRUE or Boolea… 

    …n.FALSE or call Boolean.valueOf() instead.
    @AndyScherzinger
    AndyScherzinger committed Nov 6, 2016
    Configuration menu
    Copy the full SHA
    ff6b07b View commit details
    Browse the repository at this point in the history

  4. simplified boolean check

    @AndyScherzinger
    AndyScherzinger committed Nov 6, 2016
    Configuration menu
    Copy the full SHA
    560f5a7 View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2016

  1. removal of code warnings

    @AndyScherzinger
    AndyScherzinger committed Nov 7, 2016
    Configuration menu
    Copy the full SHA
    46d0f01 View commit details
    Browse the repository at this point in the history

  2. brackets

    @AndyScherzinger
    AndyScherzinger committed Nov 7, 2016
    Configuration menu
    Copy the full SHA
    500707c View commit details
    Browse the repository at this point in the history

  3. fixing codacy warnings

    @AndyScherzinger
    AndyScherzinger committed Nov 7, 2016
    Configuration menu
    Copy the full SHA
    df60c9c View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2016

  1. fix only one picture is uploaded

    @tobiasKaminsky
    tobiasKaminsky committed Nov 10, 2016
    Configuration menu
    Copy the full SHA
    4c56ce2 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/syncedFolders' into syncedFolders2

    @tobiasKaminsky
    tobiasKaminsky committed Nov 10, 2016
    Configuration menu
    Copy the full SHA
    fb4fe46 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/nextcloud/android into sy… 

    …ncedFolders

# Conflicts:
#	src/com/owncloud/android/MainApp.java
#	src/com/owncloud/android/db/ProviderMeta.java
#	src/com/owncloud/android/providers/FileContentProvider.java
#	src/com/owncloud/android/services/observer/FolderObserver.java
#	src/com/owncloud/android/ui/activity/Preferences.java
    @AndyScherzinger
    AndyScherzinger committed Nov 10, 2016
    Configuration menu
    Copy the full SHA
    6c8bbd6 View commit details
    Browse the repository at this point in the history

  4. fix access

    @AndyScherzinger
    AndyScherzinger committed Nov 10, 2016
    Configuration menu
    Copy the full SHA
    e13a85f View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2016

  1. show pending jobs

    @tobiasKaminsky
    tobiasKaminsky committed Nov 16, 2016
    Configuration menu
    Copy the full SHA
    0bff899 View commit details
    Browse the repository at this point in the history

  2. ignore media folders within our own app

    @tobiasKaminsky
    tobiasKaminsky committed Nov 16, 2016
    Configuration menu
    Copy the full SHA
    e33f946 View commit details
    Browse the repository at this point in the history

  3. remove debugging output

    @tobiasKaminsky
    tobiasKaminsky committed Nov 16, 2016
    Configuration menu
    Copy the full SHA
    718c1cc View commit details
    Browse the repository at this point in the history

  4. sorting of media folder is now case insensitive

    @tobiasKaminsky
    tobiasKaminsky committed Nov 16, 2016
    Configuration menu
    Copy the full SHA
    34e85d0 View commit details
    Browse the repository at this point in the history

  5. hide Auto Sync for pre Nougat version

    @tobiasKaminsky
    tobiasKaminsky committed Nov 16, 2016
    Configuration menu
    Copy the full SHA
    47c8afd View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'origin/syncedFolders' into syncedFolders2

    @tobiasKaminsky
    tobiasKaminsky committed Nov 16, 2016
    Configuration menu
    Copy the full SHA
    5c0f8da View commit details
    Browse the repository at this point in the history

  7. hide Auto Sync for pre Nougat version

    @tobiasKaminsky
    tobiasKaminsky committed Nov 16, 2016
    Configuration menu
    Copy the full SHA
    93e861c View commit details
    Browse the repository at this point in the history