3391 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
masensio	ce9f67ba14	Merge branch 'develop' into fix_upload_fails_sending_another_app	2015-04-30 13:23:37 +02:00
David A. Velasco	84e99c3cc7	Prevent that PIN code is requested when system windows partially overlapping the app disappear and the app is resumed	2015-04-30 13:21:28 +02:00
masensio	7d5c573766	Show Waiting dialog, while copy temporal file async task is working	2015-04-30 13:04:51 +02:00
Jenkins for ownCloud	f2f9fbf264	[tx-robot] updated from transifex	2015-04-30 02:30:10 -04:00
masensio	e242c5a45f	Copy file to upload for all kind of files, not only for images.	2015-04-29 18:27:45 +02:00
David A. Velasco	e0867d2b28	Refactored location of passcode check: a callback to rule them all	2015-04-29 16:50:30 +02:00
masensio	b064bd4591	Execute the file to upload copy in an AsyncTask	2015-04-29 12:42:10 +02:00
Jenkins for ownCloud	c847e97e31	[tx-robot] updated from transifex	2015-04-29 01:13:49 -04:00
masensio	42fde39ff1	Get file to upload and copy into a temporal file (Uploads#uploadFiles	2015-04-28 14:22:35 +02:00
David A. Velasco	802a164616	Merge branch 'develop' into pinEnhancement ... Conflicts SOLVED: 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/fragment/OCFileListFragment.java	2015-04-28 14:20:17 +02:00
masensio	03912b8335	Merge pull request #963 from owncloud/fix_account_not_changed_after_rotation ... FileActivity does not need to 'remember' the current account in configur...	2015-04-28 09:00:15 +02:00
David A. Velasco	b058d008a1	FileActivity does not need to 'remember' the current account in configuration changes	2015-04-27 12:27:09 +02:00
Jenkins for ownCloud	3489fa1ccb	[tx-robot] updated from transifex	2015-04-25 01:13:48 -04:00
Jenkins for ownCloud	25f488cfe1	[tx-robot] updated from transifex	2015-04-24 01:13:45 -04:00
Jenkins for ownCloud	3dc60cd6f7	[tx-robot] updated from transifex	2015-04-23 01:13:49 -04:00
David A. Velasco	2fcffbd3d5	Merge pull request #957 from owncloud/fix_crash_invalid_server_url ... Fix crash when typed invalid URL	2015-04-22 11:01:52 +02:00
David A. Velasco	9b68fb6fe7	Merge pull request #951 from owncloud/loging_different_servers_same_pattern ... Support for accounts with same user name in servers located in the same domain but different path	2015-04-22 10:50:48 +02:00
David A. Velasco	1b628540c9	Fixes after CR	2015-04-22 10:33:58 +02:00
David A. Velasco	01536e1094	Updated reference to library after merging paired PR	2015-04-22 09:36:39 +02:00
David A. Velasco	968c535e19	Merge branch 'develop' into loging_different_servers_same_pattern ... Conflicts SOLVED in: src/com/owncloud/android/ui/activity/FileActivity.java	2015-04-22 09:35:37 +02:00
masensio	70759950ba	Update workaround version	2015-04-21 14:45:01 +02:00
masensio	870b8c0726	Filter dots at the beginning of the url	2015-04-21 13:50:13 +02:00
David A. Velasco	21c34ee6d4	Transaction signaled as successful in the right place - and some clean-up	2015-04-21 10:16:11 +02:00
masensio	f531f284fb	Merge pull request #956 from owncloud/fix_app_closes_new_account_and_try_to_upload ... Fix app closes new account and try to upload	2015-04-20 11:37:17 +02:00
tobiasKaminsky	6b0af82960	HOTFIX: prevent OOM when scrolling Thumbnails	2015-04-19 11:04:32 +02:00
Jenkins for ownCloud	d5ea104e99	[tx-robot] updated from transifex	2015-04-19 01:13:33 -04:00
Jenkins for ownCloud	2f196c54d6	[tx-robot] updated from transifex	2015-04-18 01:13:48 -04:00
David A. Velasco	5ca1b94865	Fixed now - FileDisplayActivity is not recreated anymore when the user selects another account	2015-04-17 14:32:35 +02:00
masensio	eac77d8749	Show an error message for invalid server url	2015-04-17 14:10:41 +02:00
David A. Velasco	ea14d6247e	Got rid of other old dialogs in FileDisplayActivity	2015-04-17 13:49:01 +02:00
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
Jenkins for ownCloud	65b2da31cc	[tx-robot] updated from transifex	2015-04-17 01:13:50 -04: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
David A. Velasco	4457dbd317	Merge branch 'develop' into upgrading_account_manager	2015-04-15 12:16:24 +02:00
masensio	ef948a46fd	Change update query and add log in onUpgrade (10 DB version)	2015-04-15 10:14:19 +02:00
Jenkins for ownCloud	15512f8d63	[tx-robot] updated from transifex	2015-04-15 01:13:36 -04: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