David A. Velasco [Wed, 25 Mar 2015 10:28:02 +0000 (11:28 +0100)]
Emergency fix: accesibility additions break Android 2.x
David A. Velasco [Wed, 25 Mar 2015 09:57:04 +0000 (10:57 +0100)]
Merge pull request #924 from owncloud/add_user_agent_support
Updated after adding custom user agent support to library
David A. Velasco [Wed, 25 Mar 2015 09:26:45 +0000 (10:26 +0100)]
Updated reference to library after adding support to set user agent
David A. Velasco [Wed, 25 Mar 2015 08:29:13 +0000 (09:29 +0100)]
Merge pull request #923 from owncloud/create_folder_during_upload_pr_701_with_develop
Create folder during upload (PR#701) and bug fixes
masensio [Wed, 25 Mar 2015 08:10:32 +0000 (09:10 +0100)]
Changes from comments in PR#924
Jenkins for ownCloud [Wed, 25 Mar 2015 05:13:49 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
masensio [Tue, 24 Mar 2015 13:53:53 +0000 (14:53 +0100)]
Update user agent string
masensio [Tue, 24 Mar 2015 13:44:05 +0000 (14:44 +0100)]
Update uger agent string
masensio [Tue, 24 Mar 2015 13:32:13 +0000 (14:32 +0100)]
Refactor parameter user_agent out of RemoteOperation and children
masensio [Tue, 24 Mar 2015 12:27:17 +0000 (13:27 +0100)]
Modify User Agent string
masensio [Tue, 24 Mar 2015 11:57:35 +0000 (12:57 +0100)]
Clean code, after validation
masensio [Tue, 24 Mar 2015 11:26:24 +0000 (12:26 +0100)]
Merge branch 'develop' into create_folder_during_upload_pr_701_with_develop
Jenkins for ownCloud [Tue, 24 Mar 2015 05:13:40 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Carla Schroder [Tue, 24 Mar 2015 02:33:43 +0000 (19:33 -0700)]
fix typo
masensio [Mon, 23 Mar 2015 14:01:17 +0000 (15:01 +0100)]
fix bug:When rotating the device, alert to choose the account is shown again
masensio [Mon, 23 Mar 2015 13:29:25 +0000 (14:29 +0100)]
Merge branch 'develop' into create_folder_during_upload_pr_701_with_develop
masensio [Mon, 23 Mar 2015 13:24:56 +0000 (14:24 +0100)]
Fix bug: User agent: jakarta is shown when doing GET request- Update library reference
Jenkins for ownCloud [Mon, 23 Mar 2015 05:13:36 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 22 Mar 2015 05:13:35 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 21 Mar 2015 05:13:36 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
masensio [Fri, 20 Mar 2015 14:12:33 +0000 (15:12 +0100)]
Fix bug: Folder is created in the wrong account
masensio [Fri, 20 Mar 2015 13:55:48 +0000 (14:55 +0100)]
Merge branch 'develop' into create_folder_during_upload_pr_701_with_develop
masensio [Fri, 20 Mar 2015 13:43:16 +0000 (14:43 +0100)]
Fix unit test: update library reference
Jenkins for ownCloud [Fri, 20 Mar 2015 05:13:42 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
David A. Velasco [Thu, 19 Mar 2015 11:59:17 +0000 (12:59 +0100)]
Merge pull request #914 from owncloud/accessibility
Added accesibility descriptions as a mean to add automatic tests un UI.
Jenkins for ownCloud [Thu, 19 Mar 2015 05:13:50 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
masensio [Wed, 18 Mar 2015 16:08:42 +0000 (17:08 +0100)]
Add user-agent string to setup options
masensio [Wed, 18 Mar 2015 08:37:55 +0000 (09:37 +0100)]
Merge branch 'develop' into add_user_agent_support
masensio [Wed, 18 Mar 2015 08:20:02 +0000 (09:20 +0100)]
Merge branch 'develop' into create_folder_during_upload_pr_701_with_develop
David A. Velasco [Wed, 18 Mar 2015 08:06:12 +0000 (09:06 +0100)]
Merge pull request #920 from owncloud/fix_crash_in_android_2
Fix crash in android 2: gridview
Jenkins for ownCloud [Wed, 18 Mar 2015 05:13:35 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
masensio [Tue, 17 Mar 2015 13:53:18 +0000 (14:53 +0100)]
Fix bug: Files/folders shown are not the correct when upload a file from other app and rotate the device
masensio [Tue, 17 Mar 2015 11:46:43 +0000 (12:46 +0100)]
Fix bug: App crashes when upload a file from other app, create a folder and rotate the device
Jenkins for ownCloud [Tue, 17 Mar 2015 05:13:40 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
masensio [Mon, 16 Mar 2015 13:27:23 +0000 (14:27 +0100)]
Fix bug: App crahes after accessing a folder with gridview and then not
masensio [Mon, 16 Mar 2015 10:15:27 +0000 (11:15 +0100)]
Merge branch 'develop' into create_folder_during_upload_pr_701_with_develop
Jenkins for ownCloud [Sun, 15 Mar 2015 05:13:34 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 14 Mar 2015 05:13:43 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
masensio [Fri, 13 Mar 2015 13:55:28 +0000 (14:55 +0100)]
Add user agent in android project
masensio [Fri, 13 Mar 2015 11:31:11 +0000 (12:31 +0100)]
Fix crash when navigate to upload a file
masensio [Fri, 13 Mar 2015 11:30:47 +0000 (12:30 +0100)]
Reformat some lines
masensio [Fri, 13 Mar 2015 09:12:27 +0000 (10:12 +0100)]
Merge branch 'develop' into fix_crash_in_android_2
Jenkins for ownCloud [Fri, 13 Mar 2015 05:13:37 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
masensio [Thu, 12 Mar 2015 17:41:03 +0000 (18:41 +0100)]
Fix crash in navigation in FileList
Jenkins for ownCloud [Thu, 12 Mar 2015 05:13:34 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 11 Mar 2015 05:13:43 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
masensio [Tue, 10 Mar 2015 13:58:21 +0000 (14:58 +0100)]
Merge branch 'develop' into accessibility
Conflicts:
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
David A. Velasco [Tue, 10 Mar 2015 13:51:58 +0000 (14:51 +0100)]
Merge pull request #918 from owncloud/share_password_support
Fixed sharing when password in enforced in server side.
masensio [Tue, 10 Mar 2015 13:28:36 +0000 (14:28 +0100)]
Merge remote-tracking branch 'origin/share_password_support' into share_password_support
masensio [Tue, 10 Mar 2015 13:27:35 +0000 (14:27 +0100)]
Merge remote-tracking branch 'origin/develop' into share_password_support
masensio [Tue, 10 Mar 2015 13:27:22 +0000 (14:27 +0100)]
Fix bug: Permission error is shown when it shouldn't
purigarcia [Tue, 10 Mar 2015 09:30:31 +0000 (10:30 +0100)]
Merge branch 'develop' into share_password_support
Jenkins for ownCloud [Tue, 10 Mar 2015 05:13:47 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
David A. Velasco [Mon, 9 Mar 2015 16:48:01 +0000 (17:48 +0100)]
Merge pull request #913 from owncloud/update_propfind_for_server_8.1
Update reference to library after adapting PROPFIND for next OC server 8.1
David A. Velasco [Mon, 9 Mar 2015 14:19:58 +0000 (15:19 +0100)]
Merge branch 'develop' into update_propfind_for_server_8.1
David A. Velasco [Mon, 9 Mar 2015 14:17:05 +0000 (15:17 +0100)]
Update library reference
masensio [Mon, 9 Mar 2015 14:16:42 +0000 (15:16 +0100)]
Fix bug: After trying to share a file without permission, it's not possible to share a file
masensio [Mon, 9 Mar 2015 12:47:52 +0000 (13:47 +0100)]
Fix bug: password is shown, when in fact we do not have permission to share
masensio [Mon, 9 Mar 2015 10:38:36 +0000 (11:38 +0100)]
When no enter a password, message should be 'You must enter a password'
masensio [Mon, 9 Mar 2015 10:34:44 +0000 (11:34 +0100)]
Changes from comments in PR#55
purigarcia [Mon, 9 Mar 2015 08:21:38 +0000 (09:21 +0100)]
Merge branch 'develop' into share_password_support
Jenkins for ownCloud [Mon, 9 Mar 2015 05:13:33 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 8 Mar 2015 06:13:33 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
masensio [Fri, 6 Mar 2015 11:48:56 +0000 (12:48 +0100)]
Process share with password
masensio [Fri, 6 Mar 2015 09:19:06 +0000 (10:19 +0100)]
Merge branch 'develop' into share_password_support
David A. Velasco [Fri, 6 Mar 2015 08:45:56 +0000 (09:45 +0100)]
Merge pull request #912 from owncloud/review_license
Reviewed license text in source files.
masensio [Fri, 6 Mar 2015 08:07:44 +0000 (09:07 +0100)]
Changes from comments in PR
masensio [Thu, 5 Mar 2015 17:02:40 +0000 (18:02 +0100)]
Show password dialog
masensio [Thu, 5 Mar 2015 16:54:03 +0000 (17:54 +0100)]
Create password dialog: SharePasswordDialog.java
masensio [Thu, 5 Mar 2015 16:02:40 +0000 (17:02 +0100)]
Create layout for password
masensio [Thu, 5 Mar 2015 12:27:45 +0000 (13:27 +0100)]
Update year in license
masensio [Thu, 5 Mar 2015 11:36:30 +0000 (12:36 +0100)]
Add author's line in license
masensio [Thu, 5 Mar 2015 09:56:02 +0000 (10:56 +0100)]
Update library reference
Jenkins for ownCloud [Thu, 5 Mar 2015 06:13:45 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 4 Mar 2015 06:13:41 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
jabarros [Tue, 3 Mar 2015 13:12:15 +0000 (14:12 +0100)]
Added item name to ContentDescription property in list item linearlayout of FileListListAdapter
Jenkins for ownCloud [Tue, 3 Mar 2015 06:13:33 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 1 Mar 2015 06:13:35 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 28 Feb 2015 06:13:44 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 27 Feb 2015 06:13:37 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 26 Feb 2015 06:13:46 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
David A. Velasco [Wed, 25 Feb 2015 10:02:02 +0000 (11:02 +0100)]
Merge pull request #886 from owncloud/cancel_transfer_for_deleted_users
Cancel pending or in-progress downloads and uploads when an account is deleted from the device.
masensio [Wed, 25 Feb 2015 08:09:41 +0000 (09:09 +0100)]
Bug fixed: Upload fails
masensio [Wed, 25 Feb 2015 07:56:00 +0000 (08:56 +0100)]
Merge branch 'develop' into cancel_transfer_for_deleted_users
Jenkins for ownCloud [Wed, 25 Feb 2015 06:13:42 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
masensio [Tue, 24 Feb 2015 14:09:54 +0000 (15:09 +0100)]
Merge remote-tracking branch 'origin/cancel_transfer_for_deleted_users' into cancel_transfer_for_deleted_users
David A. Velasco [Tue, 24 Feb 2015 14:02:26 +0000 (15:02 +0100)]
Grant that the proper RemoteOperationResult is built when an upload is cancelled while copying to temporary space
masensio [Tue, 24 Feb 2015 13:19:41 +0000 (14:19 +0100)]
Merge branch 'develop' into cancel_transfer_for_deleted_users
masensio [Tue, 24 Feb 2015 13:05:54 +0000 (14:05 +0100)]
Merge pull request #888 from owncloud/enable_cookies
Enable cookies
Jenkins for ownCloud [Tue, 24 Feb 2015 06:13:38 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
David A. Velasco [Mon, 23 Feb 2015 12:22:44 +0000 (13:22 +0100)]
Clean-up and minor refactoring
Jenkins for ownCloud [Sun, 22 Feb 2015 06:13:32 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 21 Feb 2015 06:13:31 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
masensio [Fri, 20 Feb 2015 12:20:48 +0000 (13:20 +0100)]
Merge branch 'master' into develop
masensio [Fri, 20 Feb 2015 09:51:18 +0000 (10:51 +0100)]
Changes from comments, FileUploader and FileDownloader implement OnAccountsUpdateListener
masensio [Fri, 20 Feb 2015 09:23:46 +0000 (10:23 +0100)]
New method in IndexesForest: remove(Account account). Use this method for cancelling downloads
Jenkins for ownCloud [Fri, 20 Feb 2015 06:13:38 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
masensio [Thu, 19 Feb 2015 17:48:04 +0000 (18:48 +0100)]
Changes from Comments in PR#886
Raquel [Thu, 19 Feb 2015 15:08:27 +0000 (16:08 +0100)]
Added changelog
masensio [Thu, 19 Feb 2015 12:02:53 +0000 (13:02 +0100)]
Merge branch 'develop' into enable_cookies
Conflicts:
src/com/owncloud/android/authentication/AuthenticatorActivity.java