Commit graph

2057 commits

Author SHA1 Message Date
purigarcia
c1d4106c71 refresh menu in the preview of an image 2015-07-08 14:40:07 +02:00
purigarcia
782713b391 add action finished in FileActivity 2015-07-08 13:33:14 +02:00
purigarcia
38186052e7 remove a log 2015-07-08 11:15:22 +02:00
purigarcia
354e3aed5c add actions in the preview 2015-07-08 10:57:37 +02:00
purigarcia
4e66d6acd8 Actions in the detail view 2015-07-08 10:32:58 +02:00
purigarcia
96e2a2b97b toggleKeepInSync is moved to FileOperationsHelper 2015-07-08 10:22:41 +02:00
purigarcia
f226b5f93a add the action in the context menu 2015-07-08 10:17:27 +02:00
purigarcia
684104ccb8 reuse a existing method, remove the new one 2015-07-08 09:12:40 +02:00
purigarcia
f0c302b0f8 first step to detect if the file is favorite 2015-07-08 09:08:49 +02:00
purigarcia
d039386831 options are not shown if it is a foler 2015-07-08 08:58:06 +02:00
purigarcia
32346efa62 this two options are not shown if the file is downloading or uploading 2015-07-08 08:55:41 +02:00
David A. Velasco
0f0e210d69 Fixed title in action bar when user clicks on upload notification in progress / failed 2015-07-02 13:03:48 +02:00
David A. Velasco
04d4be82cb Fixed condition to browse up when current file shown is uploading for first time or a failed upload 2015-07-02 12:08:36 +02:00
David A. Velasco
bded939b5e Fixed bug in access to same folder than last time when a file is shared with OC to upload 2015-06-26 09:07:51 +02:00
David A. Velasco
9babe1b38c Merge branch 'develop' into release-1.7.2 2015-06-25 14:43:04 +02:00
masensio
a818aaca47 Fixed upload of files into non-root folders
Fixed condition selecting grid or list mode - at least an image!
2015-06-25 09:13:37 +02:00
David A. Velasco
907e63a103 Replaced constructor with parameter in FileDetailsFragment with static method and setArguments 2015-06-25 09:10:49 +02:00
David A. Velasco
51a04aa541 Refactored extractions of server version from AccountManager through
AccountUtils; fixed line lengths and some warnings
2015-06-25 09:10:48 +02:00
David A. Velasco
1a3a150248 Automatic grid view is only enabled if server supports remote thumbnails and ALL the files in a folder are images 2015-06-25 09:10:47 +02:00
David A. Velasco
8107d9dc4f Fixed wrong format of files & folder count 2015-06-23 14:40:51 +02:00
David A. Velasco
8c5b2b7b13 Merge remote-tracking branch 'origin/release-1.7.2' into release-1.7.2 2015-06-22 14:56:13 +02:00
masensio
fb57bbc8c8 Merge pull request #1023 from owncloud/fix_issues_from_Transifex
Message with count of list(s) and folder(s) reestructured for better translations
2015-06-22 14:14:36 +02:00
masensio
84678c9903 Fix: Import file from other app shows all folders as TextView 2015-06-22 12:58:41 +02:00
David A. Velasco
69a5b6f25d More i18n-friendly format for footer in list of files (no string composition)
Conflicts FIXED:
	res/values/strings.xml
2015-06-22 11:42:37 +02:00
masensio
e7710e7383 Update string subject_token and update library reference 2015-06-19 15:11:49 +02:00
masensio
75fd0f40c6 Merge branch 'develop' into forbidden_characters_from_server
Conflicts:
	owncloud-android-library
	src/com/owncloud/android/ui/dialog/CreateFolderDialogFragment.java
	src/com/owncloud/android/ui/dialog/RenameFileDialogFragment.java
2015-06-15 14:51:13 +02:00
masensio
fbfb6dee90 Merge remote-tracking branch 'origin/develop' into navigationDrawer_basic
Conflicts:
	.travis.yml
	src/com/owncloud/android/authentication/AuthenticatorActivity.java
2015-06-15 14:07:49 +02:00
David A. Velasco
d4390de111 Save target location of server behind a permanent redirection after password validation 2015-06-11 09:42:21 +02:00
David A. Velasco
5160dc58dc Fixed bug of action bar position in PreviewImageActvitiy in Android <=4.2 2015-06-09 11:17:01 +02:00
masensio
6cf7c72ce3 Fix, Title is not correct when rotating the device 2015-06-05 12:26:12 +02:00
masensio
705d2eb773 Fix, the message is not correct when creating a folder with / 2015-06-04 19:01:13 +02:00
masensio
65ff5a374a Fix, title is not correct when menu is shown and rotate 2015-06-04 18:41:07 +02:00
masensio
b6d7cd73c7 Fix issue #1000 2015-06-04 11:02:21 +02:00
David A. Velasco
88ded5540a Fixed home button in action bar for PreviewImageActvitiy when navigation drawer is shown 2015-06-03 13:36:09 +02:00
David A. Velasco
a45c0f57f9 Refactor method to update title and home (up) button of FileActivity 2015-06-03 13:29:11 +02:00
David A. Velasco
4d7b5a1e50 Merge remote-tracking branch 'origin/navigationDrawer_basic' into navigationDrawer_basic 2015-06-03 11:09:19 +02:00
David A. Velasco
6779b77f3b Disable navigation drawer in gallery view when system bars are not visible 2015-06-03 11:05:10 +02:00
masensio
d4c13821ef Add new message for Rename, Move and Uploads 2015-06-03 09:46:32 +02:00
masensio
5f47524864 fix, in a tablet, the title is not correct when menu is shown and rotating 2015-06-02 15:26:42 +02:00
masensio
bad83f956d Fix, the correct navigation not shown in the action bar 2015-06-02 14:48:56 +02:00
masensio
b7dfc0aa41 Fix, App crash after rotate the device previewing an image 2015-06-02 14:16:48 +02:00
masensio
d4c14f8b29 Fix: app crash when trying to edit the url. Fix a problem from android support library v7 (19) 2015-06-02 14:01:42 +02:00
masensio
80108e336f Parse and show the error of invalid characters coming from the server side. Show new message in CreationFolder 2015-06-02 13:07:54 +02:00
masensio
afaa2879d1 Filter only '/' character in user input when version of server is 8.1 or later 2015-06-02 09:38:47 +02:00
David A. Velasco
05e2bf041d Close drawer before jumping to other activities so that it's not still open when come back later 2015-06-02 01:41:11 +02:00
David A. Velasco
7a941e0b0b Better swipe from left to open drawer in preview of video files 2015-06-02 01:34:45 +02:00
David A. Velasco
0117006313 Fixed update of id.home action bar button on navigation through FileDisplayActivity 2015-06-02 01:00:14 +02:00
David A. Velasco
bf23f0b5e9 Recover exit on BACK pressed 2015-06-02 00:05:08 +02:00
David A. Velasco
78158aa4a3 Fixed title and up button in Settings activity 2015-06-01 13:52:08 +02:00
masensio
1363f6686d Fix: Folder name is lose when changing the orientation of the device 2015-05-29 15:19:59 +02:00
masensio
d843140686 Fix, Logs option doesn't work 2015-05-29 13:14:42 +02:00
masensio
c66f578ace Change hamburguer icon by arrow when it is needed. Remove some imports 2015-05-29 12:42:53 +02:00
masensio
cf535b70f1 Disable 'Accounts' in Navigation Drawer 2015-05-29 11:32:36 +02:00
masensio
3603c122ff Home button shows an arrow when user is into a folder 2015-05-29 10:57:15 +02:00
masensio
1c3f88c456 Fix refresh folder name in action bar title 2015-05-29 10:51:45 +02:00
masensio
f89e112f14 Remove code related with action bar folder list 2015-05-29 09:33:17 +02:00
masensio
e78102d123 Remove drop-down list in action bar 2015-05-28 18:37:43 +02:00
masensio
d789d304e3 Click on OC icon shows the navigation drawer if the current folder isn't the root folder 2015-05-28 14:43:30 +02:00
masensio
d05160c1e2 Show root folder when click on 'All files' option 2015-05-28 14:27:50 +02:00
masensio
6e2dd6b191 Enable fitsSystemWindows in drawer.xml 2015-05-28 13:18:56 +02:00
masensio
c83925b454 Add license in some files 2015-05-28 11:30:02 +02:00
masensio
db01425a07 Add NavigationDrawer to image preview 2015-05-28 11:07:14 +02:00
tobiasKaminsky
bf880e97cc removed import 2015-05-27 19:16:08 +02:00
tobiasKaminsky
dd1675e925 removed dependency to Hex 2015-05-27 19:07:40 +02:00
tobiasKaminsky
3dc9a78696 Updated to work with latest update 2015-05-27 18:50:09 +02:00
tobiasKaminsky
a75ffde65f Merge branch 'navigationDrawer_update' of github.com:owncloud/android into navigationDrawer_update 2015-05-27 18:35:39 +02:00
tobiasKaminsky
e80828afed Merge branch 'navigationDrawer_update' of github.com:owncloud/android into navigationDrawer_update 2015-05-27 18:35:21 +02:00
masensio
7196b88374 Include again 'Refresh account' in the menu 2015-05-27 17:50:34 +02:00
masensio
c20041d157 Merge branch 'remove_ActionBarSherlock' into navigationDrawer_update
Conflicts:
	res/menu/main_menu.xml
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
	src/com/owncloud/android/ui/activity/FolderPickerActivity.java
	src/com/owncloud/android/ui/activity/Preferences.java
	src/com/owncloud/android/ui/preview/PreviewImageActivity.java
2015-05-27 14:19:30 +02:00
tobiasKaminsky
bc5e05934f added rectangle with first character 2015-05-26 20:49:03 +02:00
masensio
e934f015e8 Enable 'Logs' navigation drawer entry only in DEBUG mode 2015-05-26 12:55:40 +02:00
masensio
a9dad9e480 Add content_description to Navigation Drawer options 2015-05-26 11:46:15 +02:00
masensio
101989b70c Move 'Logs' from Settings to Navigation Drawer 2015-05-26 09:11:27 +02:00
masensio
6d8fc58eab Remove some imports 2015-05-26 08:48:36 +02:00
masensio
015eb6fee9 Disable On Device option in Navigation Drawer 2015-05-26 00:01:39 +02:00
masensio
4f2f0ceb80 Add actionBar 2015-05-25 12:39:05 +02:00
tobiasKaminsky
ed118c952a Changed computing of account name color 2015-05-24 08:53:58 +02:00
tobiasKaminsky
293d636f3a Merge remote-tracking branch 'upstream/develop' into navigationDrawer_update
# Conflicts:
#	gradle/wrapper/gradle-wrapper.properties
#	owncloud-android-library
#	res/layout-land/account_setup.xml
#	res/layout/account_setup.xml
#	res/layout/list_item.xml
#	res/layout/uploader_list_item_layout.xml
#	res/menu/main_menu.xml
#	res/values/colors.xml
#	res/values/strings.xml
#	src/com/owncloud/android/MainApp.java
#	src/com/owncloud/android/operations/SynchronizeFolderOperation.java
#	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
#	src/com/owncloud/android/ui/activity/Preferences.java
#	src/com/owncloud/android/ui/activity/Uploader.java
#	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
#	src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
#	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
#	src/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java
#	src/com/owncloud/android/utils/BitmapUtils.java
2015-05-23 07:44:16 +02:00
tobiasKaminsky
6d4207a06b Merge remote-tracking branch 'upstream/develop' into navigationDrawer_update 2015-05-21 21:12:44 +02:00
masensio
5f2820355d Merge branch 'develop' into navigation_drawer
Conflicts:
	src/com/owncloud/android/ui/preview/PreviewImageFragment.java
2015-05-21 09:46:59 +02:00
David A. Velasco
a3642ab864 Improved load of images in PreviewImageFragment - no more images in full size by default, up to 3 tries to downScale 2015-05-18 14:29:00 +02:00
masensio
a496f08717 Remove actionbarsherlock , replace it with Android Support Library (v7) 2015-05-18 12:59:46 +02:00
David A. Velasco
c0ef93882e Removed extra public constructor from Fragments handled by PreviewImageActivity 2015-05-14 18:05:12 +02:00
David A. Velasco
7f7af85f12 Better condition 2015-05-12 14:42:57 +02:00
David A. Velasco
dd35ee031b Close that stream... 2015-05-12 14:10:53 +02:00
David A. Velasco
25f5eb193e Merge remote-tracking branch 'origin/thumbnailOOM' into thumbnailOOM 2015-05-12 13:32:56 +02:00
David A. Velasco
10e4373bcf Minor changes after reviewing Bitmaps life cycle in PreviewImageFragment 2015-05-12 13:32:01 +02:00
masensio
e24b31f42d Replace call to get.ResponseBody with get.getReponseBodyAsStream in ThumbnailsCacheManager 2015-05-12 13:25:36 +02:00
masensio
f448a36456 Merge branch 'develop' into thumbnailOOM 2015-05-11 14:58:47 +02:00
David A. Velasco
47343ca299 Merge pull request #973 from owncloud/delete_share_option_in_app
Make share feature configurable
2015-05-08 14:55:07 +02:00
David A. Velasco
8d48929f5b Fixed build 2015-05-08 11:27:20 +02:00
masensio
6f3e8fbb85 Merge branch 'develop' into thumbnailOOM 2015-05-06 13:42:43 +02:00
David A. Velasco
5e1f98dcaf Fixes after crossed review 2015-05-06 09:13:10 +02:00
masensio
7d82231809 Merge branch 'develop' into pinEnhancement 2015-05-05 13:56:57 +02:00
masensio
ddbb5d2522 Merge branch 'develop' into thumbnailOOM 2015-05-05 13:53:56 +02:00
David A. Velasco
dcd8dde864 Merge branch 'develop' into pinEnhancement 2015-05-05 13:43:01 +02:00
David A. Velasco
c04d9c2198 Merge remote-tracking branch 'origin/pinEnhancement' into pinEnhancement 2015-05-05 13:42:51 +02:00
masensio
b9c4fab1cb Change message when entering an incorrect pass code 2015-05-05 13:37:18 +02:00
masensio
8debbb5f90 Changes from comments in PR#967, Second part 2015-05-05 13:18:49 +02:00
masensio
3c07444ff7 Changes from comments in PR#967 2015-05-05 12:56:14 +02:00