1713 commits

Author	SHA1	Message	Date
David A. Velasco	bed85b265a	Some minor clean-up	2015-04-17 13:48:45 +02:00
David A. Velasco	8aa0060f4a	Fixed bug: depecrated showdialog should not be used anymore, DialogFragment used instead	2015-04-17 13:45:45 +02:00
masensio	98f73400ca	Fix bug: when installing the app for the first time, app crashes	2015-04-17 12:49:39 +02:00
masensio	f12956fe2a	Remove comments	2015-04-17 11:05:13 +02:00
masensio	74b8e1a536	Replace rawQuery by query, onUpgrade --> updateDownloadedFiles	2015-04-17 09:00:53 +02:00
masensio	77ed62dbcf	Replace account.name by newAccountName in onUpgrade	2015-04-16 17:21:47 +02:00
masensio	27147e5e08	Select * in updateDownloadedFiles	2015-04-15 18:50:59 +02:00
masensio	ab7c998d07	Changes in update for downloaded files	2015-04-15 18:37:12 +02:00
masensio	123c7fc1cd	Update downloaded files	2015-04-15 18:15:57 +02:00
masensio	d9e22f0752	Merge pull request #946 from owncloud/upgrading_account_manager ... Upgrading account manager	2015-04-15 13:07:14 +02:00
David A. Velasco	cc9431feeb	Upgraded accounts in AccountManager with new account name	2015-04-15 12:52:07 +02:00
masensio	19be4b4a6f	Remove old update sql for 10 version, in onUpgrade method	2015-04-15 12:25:18 +02:00
masensio	ef948a46fd	Change update query and add log in onUpgrade (10 DB version)	2015-04-15 10:14:19 +02:00
David A. Velasco	1c579d1eb0	Removed 'support' for WebDAV entry point before OC 4, and dependent unused code	2015-04-14 15:00:43 +02:00
David A. Velasco	28d3b5fdaa	Removed unused method	2015-04-14 14:42:39 +02:00
David A. Velasco	47dcbb219e	Modify upgrade of account names in database; upgrade of accounts in AccountManager will be done before, not after	2015-04-14 14:34:27 +02:00
masensio	7efd1076aa	Upgrade account name in all the rows of files table in database	2015-04-14 11:37:08 +02:00
masensio	56703df78e	Udpate imports in MainApp	2015-04-09 13:35:50 +02:00
masensio	7696c08565	Hotfix user_agent	2015-04-09 11:16:13 +02:00
David A. Velasco	340428d820	Once again, disable session based client	2015-03-31 14:29:09 +02:00
David A. Velasco	4fbce341be	Fixed crashes in Android 2.x due to accesibility code	2015-03-30 14:38:26 +02:00
masensio	9177f1487a	Enable session support ( in MainApp )	2015-03-26 09:23:46 +01:00
David A. Velasco	fef1f5c31e	Emergency fix: accesibility additions break Android 2.x	2015-03-25 11:28:02 +01:00
David A. Velasco	6bef4abf74	Merge pull request #924 from owncloud/add_user_agent_support ... Updated after adding custom user agent support to library	2015-03-25 10:57:04 +01:00
masensio	90d84ca927	Changes from comments in PR#924	2015-03-25 09:10:32 +01:00
masensio	0de25b228c	Update uger agent string	2015-03-24 14:44:05 +01:00
masensio	6af93bfdde	Refactor parameter user_agent out of RemoteOperation and children	2015-03-24 14:32:13 +01:00
masensio	6d3bbd8bf3	Modify User Agent string	2015-03-24 13:27:17 +01:00
masensio	c3616e9001	Clean code, after validation	2015-03-24 12:57:35 +01:00
masensio	7c49aa940d	fix bug:When rotating the device, alert to choose the account is shown again	2015-03-23 15:01:17 +01:00
masensio	d6701bf8d5	Fix bug: Folder is created in the wrong account	2015-03-20 15:12:33 +01:00
masensio	c0da8a93f2	Merge branch 'develop' into create_folder_during_upload_pr_701_with_develop	2015-03-20 14:55:48 +01:00
David A. Velasco	5ebd90ed2d	Merge pull request #914 from owncloud/accessibility ... Added accesibility descriptions as a mean to add automatic tests un UI.	2015-03-19 12:59:17 +01:00
masensio	7a42dc2bf4	Add user-agent string to setup options	2015-03-18 17:08:42 +01:00
masensio	b22e231909	Merge branch 'develop' into add_user_agent_support	2015-03-18 09:37:55 +01:00
masensio	879160bebe	Merge branch 'develop' into create_folder_during_upload_pr_701_with_develop	2015-03-18 09:20:02 +01:00
masensio	e230ce33f7	Fix bug: Files/folders shown are not the correct when upload a file from other app and rotate the device	2015-03-17 14:53:18 +01:00
masensio	5d843eec5d	Fix bug: App crashes when upload a file from other app, create a folder and rotate the device	2015-03-17 12:46:43 +01:00
masensio	95e5a905cc	Fix bug: App crahes after accessing a folder with gridview and then not	2015-03-16 14:27:23 +01:00
masensio	876204faf0	Merge branch 'develop' into create_folder_during_upload_pr_701_with_develop	2015-03-16 11:15:27 +01:00
masensio	06d5cc9477	Add user agent in android project	2015-03-13 14:55:28 +01:00
masensio	d55c21ccfb	Fix crash when navigate to upload a file	2015-03-13 12:31:11 +01:00
masensio	5c54df6af0	Reformat some lines	2015-03-13 12:30:47 +01:00
masensio	b3147346eb	Fix crash in navigation in FileList	2015-03-12 18:41:03 +01:00
masensio	c963eb0fad	Merge branch 'develop' into accessibility ... Conflicts: src/com/owncloud/android/ui/adapter/FileListListAdapter.java	2015-03-10 14:58:21 +01:00
masensio	88ff4ff910	Fix bug: Permission error is shown when it shouldn't	2015-03-10 14:27:22 +01:00
masensio	40ca3d9b21	Fix bug: After trying to share a file without permission, it's not possible to share a file	2015-03-09 15:16:42 +01:00
masensio	4a47e96bc7	Fix bug: password is shown, when in fact we do not have permission to share	2015-03-09 13:47:52 +01:00
masensio	6f1fe5ad6d	Process share with password	2015-03-06 12:48:56 +01:00
masensio	82fa95fe43	Merge branch 'develop' into share_password_support	2015-03-06 10:19:06 +01:00
masensio	9da433bb7b	Changes from comments in PR	2015-03-06 09:07:44 +01:00
masensio	9e55ef9585	Show password dialog	2015-03-05 18:02:40 +01:00
masensio	b08e9e35e6	Create password dialog: SharePasswordDialog.java	2015-03-05 17:54:03 +01:00
masensio	0bef9fdedb	Update year in license	2015-03-05 13:27:45 +01:00
masensio	3d3046dc26	Add author's line in license	2015-03-05 12:36:30 +01:00
jabarros	21c7755858	Added item name to ContentDescription property in list item linearlayout of FileListListAdapter	2015-03-03 14:12:15 +01:00
masensio	01fc29c892	Bug fixed: Upload fails	2015-02-25 09:09:41 +01:00
masensio	8d773ef002	Merge remote-tracking branch 'origin/cancel_transfer_for_deleted_users' into cancel_transfer_for_deleted_users	2015-02-24 15:09:54 +01:00
David A. Velasco	4d2b382785	Grant that the proper RemoteOperationResult is built when an upload is cancelled while copying to temporary space	2015-02-24 15:02:26 +01:00
masensio	2d697473a1	Merge branch 'develop' into cancel_transfer_for_deleted_users	2015-02-24 14:19:41 +01:00
David A. Velasco	2be8e301e5	Clean-up and minor refactoring	2015-02-23 13:22:44 +01:00
masensio	e3a61d283f	Changes from comments, FileUploader and FileDownloader implement OnAccountsUpdateListener	2015-02-20 10:51:18 +01:00
masensio	0f7ea542c9	New method in IndexesForest: remove(Account account). Use this method for cancelling downloads	2015-02-20 10:23:46 +01:00
masensio	83ad608faa	Changes from Comments in PR#886	2015-02-19 18:48:04 +01:00
masensio	0a03b6d3d4	Merge branch 'develop' into enable_cookies ... Conflicts: src/com/owncloud/android/authentication/AuthenticatorActivity.java	2015-02-19 13:02:53 +01:00
masensio	cb175f2994	Merge branch 'develop' into cancel_transfer_for_deleted_users ... Conflicts: AndroidManifest.xml	2015-02-19 12:54:59 +01:00
masensio	e93016d7e0	Try to cancel transfers when an account is deleted outside of the app: Done	2015-02-19 12:50:53 +01:00
masensio	2058391230	Cancel downloads for deleted users	2015-02-18 18:39:10 +01:00
masensio	90b786853e	Fix bug: Black screen is shown when trying to go to files view after changing the password	2015-02-18 12:23:25 +01:00
David A. Velasco	fc435f64f0	Fixed recovery of position list when browsing up after two rotations	2015-02-18 11:29:31 +01:00
David A. Velasco	2cfed6eaa7	Recovered ExtendedListView; ExtendedListFragment updated to handle to possible layouts	2015-02-17 14:00:18 +01:00
masensio	acb2da8f02	Cancel the current upload when it hasn't started yet	2015-02-16 13:56:37 +01:00
masensio	a091d39076	Fix building	2015-02-13 15:07:11 +01:00
masensio	fba65e37f6	Merge remote-tracking branch 'origin/enable_cookies' into enable_cookies ... Conflicts: src/com/owncloud/android/authentication/AuthenticatorActivity.java src/com/owncloud/android/authentication/AuthenticatorAsyncTask.java	2015-02-13 14:39:35 +01:00
masensio	75880ec553	Adapt behaviour Authentication AyncTask + rotations	2015-02-13 14:29:15 +01:00
David A. Velasco	15dc7be9d9	Count of files & folders removed from view to choose target folder for a MOVE operation	2015-02-11 16:51:46 +01:00
David A. Velasco	f75ddcb97e	Fixing build	2015-02-10 10:48:55 +01:00
David A. Velasco	b5d70ad8e7	App updated to OwnCloudAccount with deferred load of credentials	2015-02-10 10:29:51 +01:00
masensio	2c4b08395d	Fix bug: Move view should not show as a grid	2015-02-10 09:57:42 +01:00
David A. Velasco	246c25d27e	Kill former session when authentication token is updated	2015-02-09 15:30:17 +01:00
masensio	1e7a75c042	Add AuthenticatorAsyncTask	2015-02-09 15:09:04 +01:00
masensio	0b217c465d	Convert accessRootFolderRemoteOperation method in AsyncTask	2015-02-09 14:13:40 +01:00
David A. Velasco	64435cab25	Revert "Enable session support for all authentication methods in the app" ... This reverts commit 02372fde24.	2015-02-09 10:35:25 +01:00
David A. Velasco	170c041505	Revert "Fix bug: When editing the account, it is possible to include any password. Remove cookies when change password" ... This reverts commit 3605bd70da.	2015-02-09 10:34:39 +01:00
masensio	3605bd70da	Fix bug: When editing the account, it is possible to include any password. Remove cookies when change password	2015-02-06 13:05:48 +01:00
David A. Velasco	f728c502c5	Fixed some log levels	2015-02-05 16:34:15 +01:00
David A. Velasco	55c9c3a6c6	Updated services clean-up; Android 4.3 and 4.4 keep a huge number of threads in other case	2015-02-05 16:28:37 +01:00
masensio	3ff42b6220	Cancel the transfers of an account when the account is deleted: Cancel current upload	2015-02-05 09:40:09 +01:00
masensio	beb7d352f9	Cancel the transfers of an account when the account is deleted, part 1	2015-02-04 18:38:11 +01:00
David A. Velasco	28e4b35595	Quotes updated in subject message for shared link, better format string	2015-02-03 13:17:14 +01:00
David A. Velasco	02372fde24	Enable session support for all authentication methods in the app	2015-02-03 13:04:19 +01:00
David A. Velasco	5116bd99e2	Merge branch 'master' into release-1.7.0	2015-02-03 12:46:23 +01:00
masensio	b64fd4cc5b	Merge branch 'develop' into cancel_transfer_for_deleted_users	2015-02-03 11:25:09 +01:00
David A. Velasco	e4e50d44c4	Corrections from my own comments	2015-02-03 09:52:22 +01:00
masensio	aa7b7af721	Cancel transfers of an account when it detects that the account doesn't exist	2015-02-02 14:51:46 +01:00
David A. Velasco	4af15f7b4e	Merge branch 'develop' into imageGrid	2015-02-02 13:48:30 +01:00
masensio	ab8bf56a15	Detect if the account exists before the tranfer starts	2015-02-02 13:23:33 +01:00
masensio	c6124920d1	Changes from comments in PR 844	2015-02-02 09:34:43 +01:00
tobiasKaminsky	fb095ecc71	save	2015-01-30 17:43:17 +01:00
masensio	7f6c5bd3b2	Merge commit 'refs/pr/701' into create_folder_during_upload_pr_701_with_develop	2015-01-30 12:10:15 +01:00
David A. Velasco	7ddb745bef	Clean-up excess of logs in SAML dialog	2015-01-30 11:34:44 +01:00
David A. Velasco	54dc3efc18	Load SAML log-in dialog from the original URL so that cookies returned with the redirection are not lost	2015-01-30 11:34:43 +01:00
masensio	4354329b46	Fix bug: When renaming a folder, in the photos apps both folder are shown	2015-01-29 11:22:47 +01:00
masensio	d19128e770	Merge branch 'develop' into delete_local_files	2015-01-28 10:37:08 +01:00
David A. Velasco	bcef916292	Removed commented code	2015-01-28 09:40:59 +01:00
masensio	d3b0747dde	Merge pull request #866 from owncloud/download_folder ... Download a folder	2015-01-28 09:31:25 +01:00
masensio	a69c04d8e9	Fix bug: audio are not refreshed when delete them from the app	2015-01-27 14:31:44 +01:00
masensio	8ebaba45e7	Show status icons in gridview	2015-01-27 13:51:44 +01:00
David A. Velasco	0df1eeaac4	Fixed download of folder after updating credentials in the app	2015-01-27 13:50:14 +01:00
masensio	281a6b8e1a	Fix bug (Media Scan) Files are not refreshed when delete from the app)	2015-01-26 15:15:00 +01:00
David A. Velasco	e89e030077	Commented excess of logs	2015-01-26 13:37:46 +01:00
David A. Velasco	7d16de3c07	Fixed cancellation of SynchronizeOperationFolder	2015-01-26 13:32:54 +01:00
masensio	d2d20d9ec1	Fix bug: Footer is not shown correct in the grid view	2015-01-26 13:09:07 +01:00
David A. Velasco	d860ae7cd4	Added indexed tree of synchronizing folders to SyncFolderHandler	2015-01-26 09:42:44 +01:00
David A. Velasco	9093ef8f9f	Refactored SyncFolderHandler out of OperationsService	2015-01-23 09:34:45 +01:00
David A. Velasco	a07937cb6f	Minimize refresh of list of files on reception of events from FileDownloader	2015-01-22 22:15:08 +01:00
tobiasKaminsky	bceecf9d17	- moved timeout to PINCODE_TIMEOUT	2015-01-22 21:21:02 +01:00
David A. Velasco	265e32dee6	Added cancelation for subtrees	2015-01-22 20:01:41 +01:00
David A. Velasco	5b54915209	Added indexed tree of folders downloading anything	2015-01-22 17:06:09 +01:00
jabarros	68eb22929d	'Fixed. 'Upload pictures via WIFI only' is hidden when going to files and come back to settings	2015-01-22 13:49:31 +01:00
jabarros	18b45ff589	Fixed. Some message dissapear from list view as 'loading' and 'nothing in here...'	2015-01-22 13:14:57 +01:00
jabarros	81a8604f7f	Fixed. Remove size from folders in the Upload view	2015-01-21 18:18:39 +01:00
jabarros	38ea01dc1e	Move GridViewWithHeaderAndFooter class to third_parties/in/srain/cube/	2015-01-21 17:51:16 +01:00
jabarros	d57a472a93	Merge branch 'imageGrid' into imageGrid_footer	2015-01-21 13:06:00 +01:00
jabarros	6cc3596ce8	Fixed. Size of the folders is shown in the file list when it should not	2015-01-21 12:37:28 +01:00
jabarros	e548665897	Fixed. App crashes when accessing to some folders in upload view	2015-01-21 12:15:52 +01:00
jabarros	9b1b5f5e3b	Fixed. Footer message should be showed in the list view mode. Also added in grid view mode.	2015-01-21 11:08:15 +01:00
jabarros	dea36157e7	Update unsuccessful downloaded file	2015-01-20 13:00:37 +01:00
jabarros	d8ac7b2241	Merge branch 'download_folder__refactoring_observance_of_downloads_in_progress' into download_folder_update_database	2015-01-20 12:42:27 +01:00
jabarros	05c236ba62	Store file on db with 'downloading' state after adding it to pending downloads	2015-01-20 12:27:40 +01:00
David A. Velasco	d2883905c6	Revert changes for files uploading	2015-01-20 11:28:36 +01:00
jabarros	6674379a5f	Remove is_uploading field from database	2015-01-20 11:07:44 +01:00
David A. Velasco	49849786e5	Removed call to methods to check transfer state of files through binders and replaced with methods on OCFile	2015-01-20 09:42:58 +01:00
jabarros	d0cee8be85	Merge branch 'develop' into SettingsGreyedOut	2015-01-20 09:25:20 +01:00
tobiasKaminsky	3c79991b12	Merge branches 'develop' and 'imageGrid' of github.com:owncloud/android into imageGrid2 ... Conflicts: gradle/wrapper/gradle-wrapper.properties owncloud-android-library	2015-01-19 22:24:33 +01:00
tobiasKaminsky	b5fdba576f	changes as requested	2015-01-19 22:13:45 +01:00
tobiasKaminsky	04b77aa2f4	rebased ... footer view disabled due to GridView does not support it	2015-01-19 22:10:29 +01:00
tobiasKaminsky	d4e0f3bdb1	Merge branch 'develop2' into imageGrid2 ... Conflicts: owncloud-android-library res/layout/list_fragment.xml res/values-fr/strings.xml src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java src/com/owncloud/android/ui/adapter/FileListListAdapter.java src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java src/com/owncloud/android/ui/fragment/ExtendedListFragment.java src/com/owncloud/android/ui/fragment/LocalFileListFragment.java src/com/owncloud/android/ui/fragment/OCFileListFragment.java	2015-01-19 21:02:37 +01:00
jabarros	115268008e	Increase db number and added getters and setter for new 'uploading' and 'downloading' fields in OCFile	2015-01-19 14:41:34 +01:00
David A. Velasco	b6e4f0f4ae	Merge pull request #798 from LukeOwncloud/develop ... On downgrading upload db, delete and re-create	2015-01-19 13:44:30 +01:00
jabarros	3515ab160c	Added uploading and downloading fields into filelist table	2015-01-19 13:10:21 +01:00
jabarros	e98fc8b141	Merge branch 'develop' into download_folder	2015-01-19 12:49:28 +01:00
jabarros	6022456fd5	Trigger Media Scan on parent folder when deleting a file or a folder from locally	2015-01-19 10:39:23 +01:00
tobiasKaminsky	6d5c6f86e5	Merge branch 'develop2' into imageGrid2 ... Conflicts: owncloud-android-library res/layout/list_fragment.xml res/values-fr/strings.xml src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java src/com/owncloud/android/ui/adapter/FileListListAdapter.java src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java src/com/owncloud/android/ui/fragment/ExtendedListFragment.java src/com/owncloud/android/ui/fragment/LocalFileListFragment.java src/com/owncloud/android/ui/fragment/OCFileListFragment.java	2015-01-18 17:00:29 +01:00
David A. Velasco	2275f2eca4	Move every sendBroadcast from SynchronizeFolderOperation to SyncFolderHandler scope	2015-01-13 20:07:43 +01:00
jabarros	72942b5cb7	Add context description tag to action bar title	2015-01-13 14:08:57 +01:00
jabarros	6c70154a50	Merge branch 'develop' into thumbnailForUpload	2015-01-12 14:30:06 +01:00
jabarros	b7e80e6ace	Other minor changes after CR	2015-01-12 14:17:29 +01:00
David A. Velasco	5ee9c129a9	Fixed stuck 'downloading' icon in download of folders	2015-01-12 13:51:30 +01:00
jabarros	5d228838e2	Changes after CR	2015-01-12 12:52:40 +01:00
David A. Velasco	76904d2c8e	Fix on search of operation to cancel	2015-01-12 10:43:40 +01:00
jabarros	6fee98e6a4	Fix. Subfolders are not cancelled correctly	2015-01-09 15:16:52 +01:00
jabarros	cc15321173	Fixed. In the upload view, videos does not have the correct icon	2015-01-09 09:46:43 +01:00
David A. Velasco	74d4f5302e	Fixed icon for MIME type application/javascript	2015-01-09 09:44:02 +01:00
tobiasKaminsky	d54345d040	Merge remote-tracking branch 'upstream/develop' into uploadNewFolder ... Conflicts: src/com/owncloud/android/ui/activity/Uploader.java	2015-01-08 22:41:41 +01:00
tobiasKaminsky	6b742de58e	- removed uneccessary improts	2015-01-08 22:33:28 +01:00
David A. Velasco	1975f9e776	Aesthetic fixes	2015-01-08 16:56:21 +01:00
David A. Velasco	cb5f8b3fcd	Considered MIME types for .py, .js, and fixed .xls, .ppt, and some clean-up	2015-01-08 16:43:25 +01:00
jabarros	e6fc5d13ad	Notify the download cancelation for updating the screen and remove the yellow arrow that continues being shown after the cancel	2015-01-08 15:02:42 +01:00
jabarros	737381eaad	Fix for downloads that are not cancelled	2015-01-08 14:59:27 +01:00
jabarros	46d045fd62	Merge branch 'download_folder' into download_folder__fixing_recursive_cancellation	2015-01-08 14:26:38 +01:00
David A. Velasco	643162cac9	Consider application/xml for XML files	2015-01-08 10:55:42 +01:00
David A. Velasco	8da1926f02	Merge pull request #820 from owncloud/obeySortOrder_fixmerge ... Obey sort order in gallery of images.	2015-01-08 09:08:42 +01:00
David A. Velasco	14bbe5bf01	First try	2015-01-07 18:23:53 +01:00
jabarros	d05d5ffe1a	Merge branch 'develop' into download_folder	2015-01-07 14:04:46 +01:00
jabarros	f737785b4f	Change error message when trying download a folder that does not exist	2015-01-07 13:47:38 +01:00
jabarros	90e49a96e4	Added folder name to 'file not found' error message	2015-01-07 13:04:46 +01:00
jabarros	1db11eb586	Fix. App does not realize that the folder does not exist	2015-01-07 11:22:24 +01:00
tobiasKaminsky	0ae80926ac	update	2015-01-05 19:53:40 +01:00
tobiasKaminsky	5345fed890	- fix #667	2015-01-01 13:55:06 +01:00
tobiasKaminsky	30b332745d	- last whitespace	2015-01-01 13:07:31 +01:00
tobiasKaminsky	cb725acdf3	- removed whitespaces ... - renamed pin description	2015-01-01 13:06:25 +01:00
jabarros	fa159e4891	Fix. Some icons are not correct. Showed default file icon when there is not mimetype	2014-12-31 14:25:24 +01:00
jabarros	61b267d309	Fix. App does not realize that the folder does not exits when traying to download a folder	2014-12-31 13:48:36 +01:00
jabarros	6caad2be05	Fixed. Icons which have extensions in UpperCase, in the uploads view are not correct	2014-12-30 11:55:13 +01:00
tobiasKaminsky	5def3658a9	fix double pin entry on start	2014-12-30 09:32:33 +01:00
tobiasKaminsky	0e061f6f06	- fix #47	2014-12-29 22:36:15 +01:00
jabarros	cd1a150bf9	Create getThumbnailDimension and add some comments	2014-12-29 17:06:33 +01:00
jabarros	fe5c6b6542	Refactor ThumbnailsCacheManager to reduce repeated code	2014-12-29 14:54:45 +01:00
jabarros	2319a52bab	Merge branch 'develop' into thumbnailForUpload	2014-12-29 09:27:50 +01:00
jabarros	0d6320aa79	Move isImage method to BitmapUtils class	2014-12-29 09:26:44 +01:00
tobiasKaminsky	cb5f0971af	- moved check to PinCheck ... - hardcoded 10s time-out	2014-12-29 09:15:51 +01:00
tobiasKaminsky	ed74bba5fb	temp	2014-12-27 16:48:40 +01:00
tobiasKaminsky	be4d7d14d2	- fix #76	2014-12-27 16:20:34 +01:00
jabarros	da87634804	Merge branch 'develop' into rename_with_special_character	2014-12-26 14:27:52 +01:00
jabarros	4257aa1d9c	Merge branch 'develop' into obeySortOrder_fixmerge	2014-12-26 11:10:22 +01:00
jabarros	0b7c37671f	Merge pull request #755 from owncloud/OpenWithInContextMenu ... "open with" in ContextMenu of downloaded files	2014-12-26 09:13:58 +01:00
jabarros	f0905fbaac	Merge pull request #784 from ekeitho/develop ... subject mail populated when user shares >>file/folder<<	2014-12-26 09:04:02 +01:00
Keith Abdulla	1db0d7daf2	create an extra string resource	2014-12-23 09:31:59 -08:00
jabarros	1cc6d8c612	Fixed. Yellow arrow is not gone when there is not something to download	2014-12-23 09:15:59 +01:00
Keith Abdulla	38d0a19307	fix string format and context method	2014-12-19 20:11:25 -08:00
David A. Velasco	981d4580cf	Merge pull request #718 from owncloudChalmers/multi2 ... Multiselect functionalty targeting https://github.com/owncloud/android/issues/596	2014-12-19 12:56:14 +01:00
jabarros	6e3d3cd016	Merge branch 'develop' into thumbnailForUpload	2014-12-19 10:58:08 +01:00
tobiasKaminsky	e23fa3acaa	renamed sortDirectory to sortFolder	2014-12-18 21:19:39 +01:00
jabarros	ec820a29ac	Removed specific check for character '%' when renaming a folder	2014-12-17 13:36:38 +01:00
David A. Velasco	f382ae73e3	Removed unneeded logs	2014-12-17 12:54:45 +01:00
David A. Velasco	cc77ea37de	Added cancellation checks in SynchronizeFolderOperation before every RemoteOperation execution	2014-12-17 11:10:53 +01:00
jabarros	732ab432a4	Merge pull request #812 from owncloud/download_folder__update_contextual_menu_asap ... Allow cancelling download of folders as soon as the SynchronizeFolderOpe...	2014-12-17 09:47:18 +01:00
David A. Velasco	1d0f705509	Allow cancelling download of folders as soon as the SynchronizeFolderOperation is in the OperationsService	2014-12-17 09:32:13 +01:00
jabarros	98929a9c8f	Merge branch 'download_folder' into download_folder_cancel_downloads	2014-12-16 15:04:39 +01:00