26377 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Espen Fossen	851c576d02	Added pom for building via maven. Actionbarsherlock and android resources gets resolved as maven dependencies, and the apk is built via android-maven-plugin.	2013-02-02 15:00:36 +01:00
David A. Velasco	0f99bd59a1	HOTFIX (oc 1.3.20, ocw 1.0.2): fixed the creation of new accounts after installing the workaround app and rebooting	2013-01-31 16:17:32 +01:00
David A. Velasco	82ee5c46ee	Merge branch 'master' into temporal_icons	2013-01-31 12:50:03 +01:00
David A. Velasco	543b3cc24d	Workaround version up: 1.0.1	2013-01-30 16:58:52 +01:00
David A. Velasco	698348cadc	Fixed workaround icon	2013-01-30 16:33:43 +01:00
David A. Velasco	13b75b73e3	Merge branch 'master' into temporal_icons	2013-01-30 16:17:41 +01:00
David A. Velasco	fdd1dbf2d7	Version up: 1.3.19	2013-01-30 16:17:23 +01:00
David A. Velasco	1a8096380d	Temporal file icons from iOS app	2013-01-30 16:16:08 +01:00
David A. Velasco	86ad114c26	Translations updated	2013-01-30 14:31:38 +01:00
David A. Velasco	37f0586c47	Merge branch 'file_icons' into workaround_integration	2013-01-30 13:49:36 +01:00
David A. Velasco	5da9c095a4	Added dialog in the main app to advise users about the workaround app	2013-01-30 13:46:15 +01:00
David A. Velasco	f1f8c749d1	Save new token / credentials to make them permanent	2013-01-29 11:49:42 +01:00
David A. Velasco	fb8a8a2166	Fixed behaviour when authorization is denied by user; added toast message to explain the need to update credentials	2013-01-28 13:15:28 +01:00
David A. Velasco	63106c9238	Locked edition of URL and password in redirection due to expired credentials; error messages reviewed; fixed capture of redirection from web browser in OAuth	2013-01-25 15:11:10 +01:00
David A. Velasco	1e5aa5345f	Fixed visibility of authorization details when the device is turned aside; removed unused classes from old OAuth flow	2013-01-24 18:31:40 +01:00
David A. Velasco	d6f725bfeb	Fixed icon for text files	2013-01-24 14:03:38 +01:00
David A. Velasco	f440d30e42	Code ready to provide different icons for well-known MIME types	2013-01-24 13:34:27 +01:00
David A. Velasco	ac07e35d8a	Merge remote-tracking branch 'origin/oauth_login' into oauth_login	2013-01-24 10:30:18 +01:00
David A. Velasco	088b1e83a4	Cleaning-up AuthenticatorActivty code	2013-01-24 10:29:11 +01:00
David A. Velasco	aa19d76441	Cleaning-up AuthenticatorActivty code	2013-01-24 10:27:53 +01:00
David A. Velasco	0ad4898ccf	Added helper app to work around the issue of lost credentials at boot time affecting ownCloud apps installed from the Google Play Store in Android 4.1.x	2013-01-18 13:33:08 +01:00
David A. Velasco	e9f13d77ce	Redirect app to login screen when any operation started from a foreground component fails due to bad credentials	2013-01-17 16:03:59 +01:00
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	66442da081	Fixed double upload of files with OAuth + Bearer authorization	2012-12-19 18:42:38 +01: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