Merge pull request #1048 from owncloud/shareWithYou_icon_in_fileList
[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / fragment / FileDetailFragment.java
2015-07-06 masensioMerge branch 'release-1.7.2'
2015-06-25 David A. VelascoMerge branch 'develop' into release-1.7.2
2015-06-25 masensioMerge pull request #1027 from owncloud/auto_grid_only_w...
2015-06-25 David A. VelascoReplaced constructor with parameter in FileDetailsFragm...
2015-06-25 David A. VelascoRefactored extractions of server version from AccountMa...
2015-06-22 David A. VelascoMerge branch 'master' into develop
2015-06-15 masensioMerge branch 'develop' into forbidden_characters_from_s...
2015-06-15 masensioMerge pull request #995 from owncloud/navigationDrawer_...
2015-06-15 masensioMerge remote-tracking branch 'origin/develop' into...
2015-06-15 David A. VelascoMerge branch 'develop' into navigationDrawer_basic
2015-05-27 tobiasKaminskyMerge branch 'navigationDrawer_update' of github.com...
2015-05-27 masensioMerge branch 'remove_ActionBarSherlock' into navigation...
2015-05-27 masensioMerge branch 'develop' into remove_ActionBarSherlock
2015-05-21 tobiasKaminskyMerge remote-tracking branch 'upstream/develop' into...
2015-05-21 masensioMerge branch 'develop' into navigation_drawer
2015-05-18 masensioMerge branch 'develop' into navigation_drawer
2015-05-18 masensioRemove actionbarsherlock , replace it with Android...
2015-04-28 David A. VelascoMerge branch 'develop' into pinEnhancement
2015-04-07 masensioMerge branch 'release-1.7.1' oc-android-1.7.1_signed
2015-03-16 masensioMerge branch 'develop' into create_folder_during_upload...
2015-03-10 masensioMerge branch 'develop' into accessibility
2015-03-09 David A. VelascoMerge branch 'develop' into update_propfind_for_server_8.1
2015-03-06 masensioMerge branch 'develop' into share_password_support
2015-03-06 David A. VelascoMerge pull request #912 from owncloud/review_license
2015-03-05 masensioUpdate year in license
2015-03-05 masensioAdd author's line in license
2015-02-03 David A. VelascoMerge branch 'master' into release-1.7.0
2015-02-02 David A. VelascoMerge branch 'develop' into imageGrid
2015-01-30 masensioMerge commit 'refs/pr/701' into create_folder_during_up...
2015-01-28 masensioMerge branch 'develop' into delete_local_files
2015-01-28 masensioMerge pull request #866 from owncloud/download_folder
2015-01-22 David A. VelascoAdded indexed tree of folders downloading anything
2015-01-20 jabarrosMerge branch 'download_folder__refactoring_observance_o...
2015-01-20 David A. VelascoRevert changes for files uploading
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 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-12 jabarrosMerge branch 'develop' into thumbnailForUpload
2015-01-08 David A. VelascoConsidered MIME types for .py, .js, and fixed .xls...
2014-11-05 tobiasKaminskyMerge remote-tracking branch 'upstream/develop' into...
2014-10-29 grecepMerge pull request #669 from grecep/master
2014-10-24 tobiasKaminskyMerge remote-tracking branch 'upstream/develop' into
2014-10-24 tobiasKaminskyMerge remote-tracking branch 'upstream/develop' into...
2014-10-24 jabarrosMerge branch 'thumbnails_from_server' of https://github...
2014-10-23 jabarrosMerge branch 'sortingFiles' of https://github.com/tobia...
2014-10-22 tobiasKaminskyMerge remote-tracking branch 'upstream/develop' into...
2014-10-17 MMMarcyMerge remote-tracking branch 'theirs/develop' into...
2014-10-17 Magnus SjoqvistMerge with develop
2014-10-15 jabarrosMerge branch 'idn_hosts' of https://github.com/ogasser...
2014-10-09 jabarrosMerge branch 'sortingFiles' of https://github.com/tobia...
2014-10-06 jabarrosMerge branch 'master' of https://github.com/loripino21...
2014-10-01 Javier GonzalezMerge pull request #641 from owncloud/thumbnails_for_do...
2014-09-18 David A. VelascoMerge branch 'develop' into release-1.6.0
2014-09-18 David A. VelascoMerge pull request #631 from owncloud/new_shared_by_lin...
2014-09-18 David A. VelascoMerge pull request #627 from owncloud/better_loggin_system
2014-09-18 David A. VelascoFixed conflict - Merge branch 'develop' into better_log...
2014-09-17 jabarrosMerge branch 'develop' into better_loggin_system
2014-09-15 David A. VelascoMerge branch 'develop' of https://github.com/tobiasKami...
2014-09-11 jabarrosMove Logger class to owncloud library and update refere...
2014-09-09 jabarrosMerge branch 'develop' into ADFS_auth_support
2014-09-05 jabarrosMerge pull request #608 from owncloud/move_files_and_fo...
2014-09-01 jabarrosAdd menu restrictions for not showing move option on...
2014-07-09 David A. VelascoMerge remote-tracking branch 'origin/release-1.5.8...
2014-07-09 David A. VelascoMerge branch 'develop' into release-1.5.8
2014-07-09 jabarrosMerge pull request #556 from owncloud/fix_bug_in_favori...
2014-07-08 David A. VelascoFixed last minute bugs, and clean up
2014-07-08 David A. VelascoClean up FileObserverService to avoid redundant instanc...
2014-05-30 masensioMerge branch 'develop' into pull_down_refresh
2014-05-30 masensioMerge branch 'master' into vanish_notifications
2014-05-30 masensioMerge branch 'master' into develop
2014-05-27 masensioAdd comments
2014-05-27 masensioMerge branch 'fixed_video_playback_on_rotations' into...
2014-05-27 masensioMerge branch 'develop' into release-1.5.6
2014-05-27 masensioUpdate file images, add new mimetypes to show: spreadsh...
2014-05-20 David A. VelascoMerge pull request #500 from owncloud/refactor_update_f...
2014-05-20 masensioMerge branch 'develop' into refactor_update_filelist_fr...
2014-05-19 masensioMerge pull request #495 from owncloud/fixed_loading_dia...
2014-05-19 David A. VelascoReview of calls to super. in Activity/Fragment life...
2014-05-19 masensioMerge branch 'develop' into refactor_update_filelist_fr...
2014-05-16 masensioMerge pull request #493 from owncloud/fixed_not_perform...
2014-05-16 David A. VelascoCreated new dialog classes for file renaming and folder...
2014-05-15 masensioMerge branch 'develop' into refactor_update_filelist_fr...
2014-05-14 masensioMerge branch 'develop' into refactor_update_filelist_fr...
2014-05-12 masensioMerge branch 'develop' into refactor_update_filelist_fr...
2014-05-12 David A. VelascoRefactored handle of user response in confirmation...
2014-05-12 David A. VelascoJoint local removal of files to RemoteFileOperation...
2014-05-09 David A. VelascoFixed inconsistencies in file actions shown in menus...
2014-05-09 masensioMerge branch 'develop' into refactor_update_filelist_fr...
2014-05-08 David A. VelascoRemoved unneeded casts to FileDisplayActivity
2014-05-08 David A. VelascoRefactored menu filtering in a single class FileMenuFilter
2014-05-07 David A. VelascoMerge remote-tracking branch 'origin/refactor_update_fi...
2014-05-07 David A. VelascoReview and reenable calls to refresh list of files...
2014-05-06 David A. VelascoMoved UploadFinishReceiver from FileDetailFragment...
2014-05-06 masensioRevert commit 6cdd830a7be28b77688efc3cd62857c1e71a1342
2014-05-06 David A. VelascoMerge remote-tracking branch 'origin/refactor_update_fi...
2014-05-06 David A. VelascoRefactoring relationship between FileActivities and...
2014-05-05 masensioAdditional changes to apply the new code to the other...
next