mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-30 18:21:10 +03:00
Code Issues Projects Releases Packages Wiki Activity
554 commits 233 branches 1574 tags 574 MiB
Commit graph

554 commits

This branch
This branch
All branches
Author SHA1 Message Date
David A. Velasco
2b5785556e Merge branch 'master' into oauth_login 
Conflicts:
	AndroidManifest.xml
	res/values-de-rDE/strings.xml
	res/values-de/strings.xml
	res/values/strings.xml
	src/com/owncloud/android/Uploader.java
	src/com/owncloud/android/datamodel/FileDataStorageManager.java
	src/com/owncloud/android/files/OwnCloudFileObserver.java
	src/com/owncloud/android/files/services/FileDownloader.java
	src/com/owncloud/android/files/services/FileUploader.java
	src/com/owncloud/android/operations/RemoteOperationResult.java
	src/com/owncloud/android/syncadapter/FileSyncAdapter.java
	src/com/owncloud/android/ui/activity/AuthenticatorActivity.java
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
	src/com/owncloud/android/ui/activity/UploadFilesActivity.java
	src/com/owncloud/android/ui/fragment/FileDetailFragment.java
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
 2013-01-17 14:25:49 +01:00
David A. Velasco
73f8797b75 Redirect app to login screen when operations in file details view fail due to bad credentials 2013-01-17 13:01:51 +01:00
David A. Velasco
c4cd9ef44c Prevent that the workaround app fixing the lost of credentials in Jelly Bean replaces the authenticator in the ownCloud 2013-01-16 12:54:15 +01:00
David A. Velasco
4aba533e6e Version 1.3.18 bump 2013-01-14 12:57:41 +01:00
David A. Velasco
f91d3ce792 Fixed null pointer in FileObserverService initialization 2013-01-14 12:38:46 +01:00
David A. Velasco
6729ce4349 Merge pull request #73 from s17t/master 
Minor changes
 2013-01-14 02:23:03 -08:00
F.T.
2ed5f33d95 Italian strings for narrow screens; fixed version string. 2013-01-12 18:37:10 +01:00
F.T.
68c8a5da79 Fix owncloud/android#37 2013-01-12 18:33:18 +01:00
David A. Velasco
7f881d1712 Merge branch 'master' into crash_fixes 2013-01-11 18:44:47 +01:00
David A. Velasco
05d053beae Merge pull request #66 from jmiazga/master 
Issue 46 fix
 2013-01-11 05:37:42 -08:00
David A. Velasco
bc1591da6c Translations update 2013-01-11 13:26:34 +01:00
David A. Velasco
75c84c7b06 German translation updated 2013-01-11 12:45:10 +01:00
David A. Velasco
7239b9eb9d Translations update 2013-01-10 18:38:41 +01:00
David A. Velasco
840c842f03 Fixed bug: empty folders are kept in device database when sucessfully removed 2013-01-10 16:27:05 +01:00
David A. Velasco
4905f9a396 Fixed bug preventing the enter in empty folders when uploading files from external apps through 'share to' or 'send' 2013-01-10 16:12:59 +01:00
David A. Velasco
471bff2aec Fixed crash when uploading a file in any account after cleaning app data 2013-01-10 11:39:22 +01:00
David A. Velasco
afa58b8ac6 Fixed bad update of details view for an uploading file when it finishes, resulting in a renamed file due to other file in the server with the same name ; and subsequent crash got by pressing 'Cancel' 2013-01-09 16:55:25 +01:00
David A. Velasco
35b25f04eb Fixed crash in test of files downloading / uploading 2013-01-09 10:11:21 +01:00
David A. Velasco
a1a31b68d9 Fixed crash when an upload is confirmed with no file selected 2013-01-08 17:48:58 +01:00
David A. Velasco
6faa03a084 Remove unused Object member causing problems with serialization; back to previous serializationUID 2013-01-08 17:31:04 +01:00
jmiazga
124b43cb4e text selection is kept when user toggles between visible and non visible password 2013-01-04 09:40:13 -05:00
David A. Velasco
11b88e0fcc Added support to OAuth2 'authorization code' grat type: get & save access token, use it to access ownCloud 2012-12-19 14:12:53 +01:00
David A. Velasco
c38a3b2ef1 Merge master into oauth_login 2012-12-18 11:20:03 +01:00
David A. Velasco
5be4bf17e1 Adding support to OAuth2 'authorization code' grant type [WIP] 2012-12-18 11:07:05 +01:00
David A. Velasco
1412712d89 Version bump: 1.3.17 2012-12-10 15:59:50 +01:00
David A. Velasco
e83a73cb9d Avoid the necessity to synchronize the account after the upgrade to 1.3.16 2012-12-10 14:01:45 +01:00
David A. Velasco
2b5bb1fb90 Minimize the number of unnecessary file trasnfers after the upgrade to 1.3.16 for files already in the device 2012-12-06 15:28:12 +01:00
David A. Velasco
f74e7ab11a Merge remote-tracking branch 'origin/sync_review_2' 2012-12-06 14:03:50 +01:00
David A. Velasco
a08c92cf9a Fixed bug in synchronization after adding new field to improve the check of changes in server 2012-12-06 14:02:09 +01:00
David A. Velasco
279670c303 Merge remote-tracking branch 'origin/sync_review_2' 2012-12-05 23:23:10 +01:00
David A. Velasco
abd5f51554 Fixed check of modifications applied in server (still based on modification date) 2012-12-05 16:14:01 +01:00
David A. Velasco
4476c04736 Fixed copy and movement of files to ownCloud local folder with explicit creation of parent directory and target file 2012-12-05 16:01:19 +01:00
David A. Velasco
082c11a1e3 Fixed movement of files: parent folder must be created before move; besides, extra checks to avoid NULL pointers in dialogs 2012-12-05 12:37:37 +01:00
David A. Velasco
80448dc192 Fixed NULL pointers and wrong handling of dialogs 2012-12-05 12:22:26 +01:00
David A. Velasco
8361540852 Fixed lack of File#getUsableSpace() in Android versions previous to GINGERBREAD 2012-12-04 14:36:49 +01:00
David A. Velasco
4558866223 Give the user a chance to move the files selected for an upload when there is not space enough to copy them into the ownCloud folder 2012-12-04 14:20:02 +01:00
David A. Velasco
f68d10abc7 Give the user the option to move all the foreign files into the ownCloud local folder when the try to copy them during an account synchronization failed 2012-12-04 12:49:18 +01:00
David A. Velasco
801d8922d3 Fixed bug: toast message infinitely repeated 2012-11-30 15:10:48 +01:00
David A. Velasco
a7535406d4 Customized error message for uploads when the local file cannot by copied to the ownCloud local directory 2012-11-30 14:39:31 +01:00
David A. Velasco
b59784af89 No more NULL pointers from getDirectoryContent (2) 2012-11-30 13:33:23 +01:00
David A. Velasco
e81a7790eb No more NULL pointers from getDirectoryContent 2012-11-30 13:28:00 +01:00
David A. Velasco
9f8814c557 Fixed bug: toast message infinitely repeated 2012-11-30 13:18:17 +01:00
David A. Velasco
3ef64834e9 Added scroll to generic explanation activity. Enabled the copy of past uploads into ownCloud folder during synchronization. 2012-11-30 11:58:46 +01:00
David A. Velasco
2a913bfbeb Files uploaded in the past are copied to the local ownCloud directory during account synchronization 2012-11-30 11:29:18 +01:00
David A. Velasco
a2f48dc563 New German update 2012-11-29 16:52:29 +01:00
David A. Velasco
5dec5264b2 Updated some languages (remaining coming soon) 2012-11-29 16:01:53 +01:00
David A. Velasco
236895e7f8 Refactored app name in strings.xml 2012-11-29 12:26:55 +01:00
David A. Velasco
757f9027f5 Updating language strings; some hardcoded strings moved to strings.xml; workaround for bug in error popup 2012-11-29 11:28:34 +01:00
David A. Velasco
a1c538db20 Some cleanup 2012-11-27 15:15:17 +01:00
David A. Velasco
fd9086a883 New policy: uploaded files are copied to the local storage ownCloud directory bu default 2012-11-27 14:28:19 +01:00