Commits

Branch selector

 master

User selector

davivel

All time

Commit History

Commits on Oct 30, 2015

• Merge pull request #1219 from owncloud/sync_full_folder__fix_conflict_save_local_version

  Show description for 09a3493
  davivel

  committed
  09a3493

  Copy full SHA for 09a3493

Commits on Oct 29, 2015

• Merge pull request #1105 from owncloud/fixLegacyTravis

  Show description for 2b6e05f
  davivel

  committed
  2b6e05f

  Copy full SHA for 2b6e05f

Commits on Oct 22, 2015

• Merge pull request #1177 from owncloud/notification_coloring

  Show description for 08443f9
  davivel

  committed
  08443f9

  Copy full SHA for 08443f9

Commits on Sep 28, 2015

• Upload operations end in conflict if overriding a version different than the last known

  davivel

  committed
  001801a

  Copy full SHA for 001801a

Commits on Sep 25, 2015

• Updated reference to library after rebase

  davivel

  committed
  fb482fa

  Copy full SHA for fb482fa

• Updated error message for failed folder synchronization ('download' not anymore)

  davivel

  committed
  056b7c9

  Copy full SHA for 056b7c9

• Removed some logs

  davivel

  committed
  7d7767a

  Copy full SHA for 7d7767a

• Clean-up: removed unused imports and methods, and commented code

  davivel

  committed
  44023a6

  Copy full SHA for 44023a6

• Removed separated 'download folder' in contextual menu and unused DownloadFolderOperation class

  davivel

  committed
  499d628

  Copy full SHA for 499d628

• Fixed permanent 'uploading' icon on files that are automatically renamed during the upload

  davivel

  committed
  1e59a63

  Copy full SHA for 1e59a63

• Safe blanket to clean DB if wrong conflicts keep stored

  davivel

  committed
  b8a3dc7

  Copy full SHA for b8a3dc7

• Remove conflict badge from ancestors when conflict is solved there are no more conflicts below

  davivel

  committed
  95bebe9

  Copy full SHA for 95bebe9

• Removed conflict badge when conflict is solved

  davivel

  committed
  7399508

  Copy full SHA for 7399508

• Added conflict icon to folders containing files with conflicts

  davivel

  committed
  a2aa047

  Copy full SHA for a2aa047

• Persist conflicts in local database and show with an icon in the list of files

  davivel

  committed
  e6c1454

  Copy full SHA for e6c1454

• ETag used to detect changes in remote files (not only in folders)

  davivel

  committed
  5f41bb1

  Copy full SHA for 5f41bb1

• Fixed NullPointerExceptionS in upload cancelations

  davivel

  committed
  c0c52fa

  Copy full SHA for c0c52fa

• Join cancelation of downloads and uploads in 'cancel sync', both for files and folders

  davivel

  committed
  9b5506f

  Copy full SHA for 9b5506f

• Rewritten queue of FileUploader based on IndexedForest

  davivel

  committed
  68b52dd

  Copy full SHA for 68b52dd

• Added icon for files synchronizing; folders use it whenever downloading or uploading any file inside

  davivel

  committed
  e885c78

  Copy full SHA for e885c78

• Keep the old operation to sync folder as DownloadFolderOperation to allow its use while the new SyncFolderOperation gets stable

  davivel

  committed
  0162d2f

  Copy full SHA for 0162d2f

• Extend SyncFolderOperation to check local changes of all files and trigger uploads

  davivel

  committed
  ac68569

  Copy full SHA for ac68569

• Same style for log-in buttons in potrait and landscape

  davivel

  committed
  a38461a

  Copy full SHA for a38461a

• Fixed lost background color for icon in login view

  davivel

  committed
  c44ed49

  Copy full SHA for c44ed49

Commits on Sep 24, 2015

• Close dangling Cursors in FileContentProvider

  davivel

  committed
  0c8dfb6

  Copy full SHA for 0c8dfb6

• Set default static values to prevent weird crash

  davivel

  committed
  c7a29bc

  Copy full SHA for c7a29bc

• Fix repetition of already finished access to root folder (AsyncTask) on rotation, in log-in view

  davivel

  committed
  c8c3e84

  Copy full SHA for c8c3e84

Commits on Sep 22, 2015

• Fixed crashed on cancelled download in gallery

  davivel

  committed
  b7bb1ec

  Copy full SHA for b7bb1ec

Commits on Sep 21, 2015

• Grant that cancellations of tasks generating thumbnails really works for reused icon views

  davivel

  committed
  cd165b7

  Copy full SHA for cd165b7

Commits on Sep 15, 2015

• Removed unneeded LDPI drawables

  davivel

  committed
  eaf2498

  Copy full SHA for eaf2498

• Added icons for file type TEXT

  davivel

  committed
  0290523

  Copy full SHA for 0290523

• Merge pull request #1155 from owncloud/update_setup_guide

  Show description for 803f672
  davivel

  committed
  803f672

  Copy full SHA for 803f672

Commits on Sep 14, 2015

• Merge pull request #1154 from owncloud/update_share_link_for_OC_8.2

  Show description for 2132d8a
  davivel

  committed
  2132d8a

  Copy full SHA for 2132d8a

Commits on Sep 11, 2015

• Merge pull request #1141 from owncloud/559_longpress_filename

  Show description for 7182b1d
  davivel

  committed
  7182b1d

  Copy full SHA for 7182b1d

Commits on Sep 7, 2015

• HOT FIX: recovered lost strings

  davivel

  committed
  1ff57e0

  Copy full SHA for 1ff57e0