Merge branch 'master' into release-1.7.0
[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / adapter /
2015-02-03 David A. VelascoMerge branch 'master' into release-1.7.0
2015-02-03 David A. VelascoMerge pull request #731 from owncloud/imageGrid
2015-02-02 David A. VelascoMerge branch 'develop' into imageGrid
2015-01-28 masensioMerge branch 'develop' into delete_local_files
2015-01-28 masensioMerge pull request #866 from owncloud/download_folder
2015-01-27 masensioShow status icons in gridview
2015-01-26 David A. VelascoAdded indexed tree of synchronizing folders to SyncFold...
2015-01-22 David A. VelascoAdded indexed tree of folders downloading anything
2015-01-21 jabarrosFixed. Remove size from folders in the Upload view
2015-01-21 David A. VelascoMerge pull request #858 from owncloud/imageGrid_footer
2015-01-21 jabarrosMove GridViewWithHeaderAndFooter class to third_parties...
2015-01-21 jabarrosMerge branch 'imageGrid' into imageGrid_footer
2015-01-21 jabarrosFixed. Size of the folders is shown in the file list...
2015-01-21 jabarrosFixed. App crashes when accessing to some folders in...
2015-01-20 jabarrosMerge branch 'download_folder__refactoring_observance_o...
2015-01-20 David A. VelascoRevert changes for files uploading
2015-01-20 jabarrosMerge branch 'develop' into imageGrid
2015-01-20 David A. VelascoRemoved call to methods to check transfer state of...
2015-01-20 jabarrosMerge branch 'develop' into SettingsGreyedOut
2015-01-19 tobiasKaminskyMerge branches 'develop' and 'imageGrid' of github...
2015-01-19 tobiasKaminskychanges as requested
2015-01-19 tobiasKaminskyrebased
2015-01-19 tobiasKaminskyMerge branch 'develop2' into imageGrid2
2015-01-19 David A. VelascoMerge pull request #798 from LukeOwncloud/develop
2015-01-19 jabarrosMerge branch 'develop' into download_folder
2015-01-18 tobiasKaminskyMerge branch 'develop2' into imageGrid2
2015-01-14 David A. VelascoMerge pull request #746 from owncloud/thumbnailForUpload
2015-01-13 David A. VelascoMove every sendBroadcast from SynchronizeFolderOperatio...
2015-01-12 jabarrosMerge branch 'develop' into thumbnailForUpload
2015-01-12 jabarrosOther minor changes after CR
2015-01-12 jabarrosChanges after CR
2015-01-08 David A. VelascoConsidered MIME types for .py, .js, and fixed .xls...
2015-01-08 David A. VelascoMerge pull request #820 from owncloud/obeySortOrder_fix...
2015-01-07 jabarrosMerge branch 'develop' into download_folder
2014-12-30 jabarrosFixed. Icons which have extensions in UpperCase, in...
2014-12-29 jabarrosRefactor ThumbnailsCacheManager to reduce repeated...
2014-12-29 jabarrosMerge branch 'develop' into thumbnailForUpload
2014-12-29 jabarrosMove isImage method to BitmapUtils class
2014-12-26 jabarrosMerge branch 'develop' into obeySortOrder_fixmerge
2014-12-26 jabarrosMerge pull request #755 from owncloud/OpenWithInContextMenu
2014-12-19 jabarrosMerge branch 'develop' into thumbnailForUpload
2014-12-18 tobiasKaminskyrenamed sortDirectory to sortFolder
2014-12-16 jabarrosMerge branch 'download_folder' into download_folder_can...
2014-12-16 jabarrosMerge pull request #810 from owncloud/download_folder__...
2014-12-16 David A. VelascoShow the download-in-progress icon in the folder as...
2014-12-12 jabarrosMerge pull request #766 from owncloud/feedbackWithVersi...
2014-12-11 jabarrosMerge branch 'develop' into community_image-preview...
2014-12-11 jabarrosMerge branch 'develop' into community_rotateImage
2014-12-10 jabarrosMerge branch 'fix_protocol_send_mail' into fix_logs_cha...
2014-12-10 jabarrosMerge pull request #754 from owncloud/RadioListOnAccounts
2014-12-09 David A. VelascoMerge remote-tracking branch 'rhabbachi/feature/308_syn...
2014-12-05 SamMerge branch 'develop' of https://github.com/owncloud...
2014-12-03 jabarrosMerge pull request #773 from owncloud/triggerMediaScan
2014-12-03 SamMerged with owncloud develop
2014-12-03 David A. VelascoRemoved empty method, and some unused imports
2014-12-03 jabarrosMerge branch 'release-1.6.2' oc-android-1.6.2
2014-11-26 David A. VelascoMerge pull request #752 from owncloud/instant_uploads_s...
2014-11-23 tobiasKaminsky- thumbnails on browsing local files during upload
2014-11-21 tobiasKaminskyMerge remote-tracking branch 'upstream/develop' into...
2014-11-21 tobiasKaminskyMerge remote-tracking branch 'upstream/develop' into...
2014-11-21 David A. VelascoMerge pull request #740 from owncloud/revert-669-master
2014-11-20 jabarrosRemove last slash from uploads path (video/image) when...
2014-11-19 tobiasKaminskylinewrap
2014-11-18 tobiasKaminskyMerge remote-tracking branch 'upstream/develop' into...
2014-11-17 jabarrosMerge branch 'develop' into nea_upload_files
2014-11-17 Jorge Antonio Diaz... Merge remote-tracking branch 'upstream/develop' into...
2014-11-13 David A. VelascoMerge pull request #685 from tobiasKaminsky/beautifyTim...
2014-11-12 David A. VelascoMerge pull request #683 from tobiasKaminsky/videoFullsize
2014-11-12 tobiasKaminskyMerge remote-tracking branch 'upstream/develop' into...
2014-11-12 tobiasKaminsky< 60 seconds -> "seconds ago"
2014-11-11 Magnus Sjoqvistmerge
2014-11-08 tobiasKaminskyfix scenario 1
2014-11-06 tobiasKaminsky- initial image grid
2014-11-05 tobiasKaminskyMerge remote-tracking branch 'upstream/develop' into...
2014-11-05 tobiasKaminskyMerge remote-tracking branch 'upstream/develop' into...
2014-11-05 David A. VelascoMerge pull request #706 from owncloud/christmas_app
2014-11-05 jabarrosMerge pull request #700 from owncloud/remember_last_sha...
2014-11-03 David A. VelascoMerge pull request #687 from owncloud/thumbnails_from_s...
2014-11-03 David A. VelascoSome clean-up in ThumbnailsCacheManager
2014-10-31 David A. VelascoMerge branch 'remember_last_share_location' into rememb...
2014-10-30 tobiasKaminsky- moved Sorting to FileStorageUtils
2014-10-30 tobiasKaminskyBugfix
2014-10-29 grecepMerge pull request #669 from grecep/master
2014-10-28 Jorge Antonio Diaz... Merge branch 'gradleWithInternalDependency' of github...
2014-10-28 jabarrosMerge branch 'develop' into idn_hosts
2014-10-27 jabarrosMerge branch 'develop' into thumbnails_from_server
2014-10-26 tobiasKaminsky- beautify Timestamps
2014-10-24 tobiasKaminskyMerge remote-tracking branch 'upstream/develop' into
2014-10-24 tobiasKaminskyMerge remote-tracking branch 'upstream/develop' into...
2014-10-24 David A. VelascoMerge branch 'master' into develop
2014-10-24 jabarrosMerge branch 'thumbnails_from_server' of https://github...
2014-10-24 David A. VelascoMerge pull request #676 from owncloud/sorting_files
2014-10-23 jabarrosFixed. When trying to open the app in Galaxy mini 2...
2014-10-23 jabarrosMerge branch 'develop' into idn_hosts
2014-10-23 jabarrosAdd comment removed when fixing conflict in merge
2014-10-23 jabarrosMerge branch 'sortingFiles' of https://github.com/tobia...
2014-10-23 jabarrosMerge branch 'develop' into sorting_files_2
2014-10-22 tobiasKaminsky- same threshold
2014-10-22 tobiasKaminskyMerge remote-tracking branch 'upstream/develop' into...
2014-10-21 David A. VelascoMerge pull request #653 from LukeOwncloud/develop
next