Merge branch 'zmatsuo-detailThumbnail' into develop
[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / activity / FileDisplayActivity.java
2015-10-15 masensioMerge branch 'detailThumbnail' of git://github.com...
2015-10-01 masensioMerge pull request #839 from fluffy88/develop
2015-09-09 masensioMerge pull request #1124 from Kernald/new-filetype...
2015-09-07 masensioMerge pull request #1095 from owncloud/text_file_previe...
2015-09-07 masensioMerge branch 'master' into text_file_preview_pr_707_wit...
2015-09-04 masensioMerge branch 'master' into text_file_preview_pr_707_wit...
2015-09-04 masensioMerge pull request #1102 from owncloud/copy
2015-09-02 masensioMerge branch 'text_file_preview_pr_707_with_develop...
2015-09-02 masensioMerge remote-tracking branch 'origin/master' into text_...
2015-09-01 David A. VelascoMerge branch 'master' into copy
2015-08-25 masensioMerge branch 'master' into create_folder_button_on_acti...
2015-08-21 gstraubeMerge remote-tracking branch 'upstream/develop' into...
2015-08-21 tobiasKaminskyMerge branch 'develop' of github.com:owncloud/android...
2015-08-21 purigarciaMerge branch 'develop' into ignoreHiddenFiles
2015-08-20 masensioMerge pull request #1076 from owncloud/material_toolbar
2015-08-18 Jorge Antonio Diaz... Refactored functionality to use the new FolderPickerAct...
2015-08-18 Jorge Antonio Diaz... Added 'ACTION_COPY_FILES'.
2015-08-18 Jorge Antonio Diaz... Added copy action
2015-08-18 Jorge Antonio Diaz... Added 'ACTION_COPY_FILES'.
2015-08-17 Andy ScherzingerMerge branch 'master' of https://github.com/owncloud...
2015-08-14 Andy Scherzingermerged part of the fixes from material buttons branch...
2015-08-10 Andy ScherzingerMerge branch 'master' of https://github.com/owncloud...
2015-08-07 David A. VelascoMerge branch 'develop'
2015-08-06 Andy ScherzingerMerge branch 'develop' of https://github.com/owncloud...
2015-08-05 masensioMerge commit 'refs/pr/707' into text_file_preview_pr_70...
2015-08-05 Andy Scherzingerfixed deprecated getDrawable call
2015-08-05 Andy Scherzingerremove two-times init of the drawer
2015-08-05 masensioMerge pull request #1068 from owncloud/conflictDialog_n...
2015-08-04 Andy Scherzingerfixing the progressbar corner glitch, bumping style...
2015-08-04 David A. VelascoFixed double request for ConflictsResolveActivity
2015-08-04 Andy ScherzingerMerge branch 'develop' of https://github.com/owncloud...
2015-08-04 Andy ScherzingerMerge branch 'develop' of https://github.com/owncloud...
2015-08-03 Andy ScherzingerMerge branch 'develop' of https://github.com/owncloud...
2015-07-28 purigarciamerge develop
2015-07-27 AndyScherzingersetting the username on the drawer header for startup...
2015-07-26 AndyScherzingerMerge branch 'develop' of https://github.com/owncloud...
2015-07-26 AndyScherzingerMerge branch 'master' of https://github.com/owncloud...
2015-07-26 AndyScherzingeradded indeterminate progress bar to show activity since...
2015-07-26 AndyScherzingerin case of open drawer close it onBackPressed
2015-07-25 AndyScherzingerinitial material design changes for the action bar
2015-07-23 David A. VelascoMerge pull request #1050 from owncloud/favourites_conte...
2015-07-10 purigarciaMerge branch 'develop' into favourites_context_menu
2015-07-08 purigarciaupdate the menu in the preview of the video
2015-07-07 masensioMerge branch 'master' into develop
2015-07-06 masensioMerge branch 'release-1.7.2'
2015-07-02 David A. VelascoFixed condition to browse up when current file shown...
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 masensioFixed upload of files into non-root folders
2015-06-25 David A. VelascoReplaced constructor with parameter in FileDetailsFragm...
2015-06-22 David A. VelascoMerge branch 'master' into develop
2015-06-22 David A. VelascoMerge pull request #999 from owncloud/fix-code-that...
2015-06-22 David A. VelascoConstant first
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-06-05 masensioFix, Title is not correct when rotating the device
2015-06-03 David A. VelascoRefactor method to update title and home (up) button...
2015-06-03 David A. VelascoMerge remote-tracking branch 'origin/navigationDrawer_b...
2015-06-02 Lukas ReschkeUse .equals instead of !=
2015-06-02 masensioFix, the correct navigation not shown in the action bar
2015-06-01 David A. VelascoFixed update of id.home action bar button on navigation...
2015-06-01 David A. VelascoRecover exit on BACK pressed
2015-05-29 masensioFix: Folder name is lose when changing the orientation...
2015-05-29 David A. VelascoMerge remote-tracking branch 'origin/navigationDrawer_b...
2015-05-29 masensioChange hamburguer icon by arrow when it is needed....
2015-05-29 masensioFix refresh folder name in action bar title
2015-05-29 masensioRemove code related with action bar folder list
2015-05-28 masensioRemove drop-down list in action bar
2015-05-28 masensioClick on OC icon shows the navigation drawer if the...
2015-05-28 masensioShow root folder when click on 'All files' option
2015-05-28 masensioAdd NavigationDrawer to image preview
2015-05-27 tobiasKaminskyMerge branch 'navigationDrawer_update' of github.com...
2015-05-27 tobiasKaminskyMerge branch 'navigationDrawer_update' of github.com...
2015-05-27 masensioInclude again 'Refresh account' in the menu
2015-05-27 masensioMerge branch 'remove_ActionBarSherlock' into navigation...
2015-05-27 masensioMerge branch 'develop' into remove_ActionBarSherlock
2015-05-26 masensioEnable 'Logs' navigation drawer entry only in DEBUG...
2015-05-26 masensioAdd content_description to Navigation Drawer options
2015-05-26 masensioMove 'Logs' from Settings to Navigation Drawer
2015-05-26 masensioRemove some imports
2015-05-25 masensioDisable On Device option in Navigation Drawer
2015-05-23 tobiasKaminskyMerge remote-tracking branch 'upstream/develop' into...
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-05-08 David A. VelascoMerge pull request #973 from owncloud/delete_share_opti...
2015-05-06 purigarciaMerge branch 'develop' into automationTest
2015-05-06 masensioMerge branch 'develop' into thumbnailOOM
2015-05-06 masensioMerge pull request #970 from owncloud/pinEnhancement
2015-05-06 David A. VelascoFixes after crossed review
2015-05-05 masensioMerge branch 'develop' into pinEnhancement
2015-05-05 David A. VelascoMerge branch 'develop' into pinEnhancement
2015-05-05 masensioMerge branch 'develop' into thumbnailOOM
2015-05-04 David A. VelascoWhen pass code is enabled, the app is sent to backgroun...
2015-05-04 purigarciaMerge branch 'develop' into automationTest
2015-04-30 David A. VelascoLogs on activities life cycle simplified
2015-04-30 David A. VelascoPrevent that PIN code is requested when system windows...
next