Commit graph

3978 commits

Author SHA1 Message Date
Jenkins for ownCloud
2b0e8eddda [tx-robot] updated from transifex 2015-03-21 01:13:36 -04: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
masensio
9d8b22dfa9 Fix unit test: update library reference 2015-03-20 14:43:16 +01:00
Jenkins for ownCloud
205bd47325 [tx-robot] updated from transifex 2015-03-20 01:13:42 -04: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
Jenkins for ownCloud
1a39af3e95 [tx-robot] updated from transifex 2015-03-19 01:13:50 -04:00
masensio
7a42dc2bf4 Add user-agent string to setup options 2015-03-18 17:08:42 +01:00
purigarcia
14da84b827 Add sunfire plugin to execute test as mvn test 2015-03-18 16:32:10 +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
David A. Velasco
2a9aae2ed1 Merge pull request #920 from owncloud/fix_crash_in_android_2
Fix crash in android 2: gridview
2015-03-18 09:06:12 +01:00
Jenkins for ownCloud
4fedf76cb0 [tx-robot] updated from transifex 2015-03-18 01:13:35 -04: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
Jenkins for ownCloud
b7796c99f6 [tx-robot] updated from transifex 2015-03-17 01:13:40 -04: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
Jenkins for ownCloud
3c55631bee [tx-robot] updated from transifex 2015-03-15 01:13:34 -04:00
Jenkins for ownCloud
8b900a6410 [tx-robot] updated from transifex 2015-03-14 01:13:43 -04: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
8fa5936eb0 Merge branch 'develop' into fix_crash_in_android_2 2015-03-13 10:12:27 +01:00
purigarcia
3aa425a7b5 upload a few automated test 2015-03-13 09:42:18 +01:00
Jenkins for ownCloud
67ecc0f262 [tx-robot] updated from transifex 2015-03-13 01:13:37 -04:00
masensio
b3147346eb Fix crash in navigation in FileList 2015-03-12 18:41:03 +01:00
Jenkins for ownCloud
311f0bd332 [tx-robot] updated from transifex 2015-03-12 01:13:34 -04:00
Jenkins for ownCloud
3826462073 [tx-robot] updated from transifex 2015-03-11 01:13:43 -04: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
David A. Velasco
d83491f62d Merge pull request #918 from owncloud/share_password_support
Fixed sharing when password in enforced in server side.
2015-03-10 14:51:58 +01:00
masensio
a421aaa7d5 Merge remote-tracking branch 'origin/share_password_support' into share_password_support 2015-03-10 14:28:36 +01:00
masensio
01483a38bf Merge remote-tracking branch 'origin/develop' into share_password_support 2015-03-10 14:27:35 +01:00
masensio
88ff4ff910 Fix bug: Permission error is shown when it shouldn't 2015-03-10 14:27:22 +01:00
purigarcia
24d6782386 Merge branch 'develop' into share_password_support 2015-03-10 10:30:31 +01:00
Jenkins for ownCloud
5f3175229a [tx-robot] updated from transifex 2015-03-10 01:13:47 -04:00
David A. Velasco
863017d291 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
2015-03-09 17:48:01 +01:00
David A. Velasco
33f9f9a210 Merge branch 'develop' into update_propfind_for_server_8.1 2015-03-09 15:19:58 +01:00
David A. Velasco
c2cc34e4cf Update library reference 2015-03-09 15:17:05 +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
03b5cb9dd6 When no enter a password, message should be 'You must enter a password' 2015-03-09 11:38:36 +01:00
masensio
1a42f742c0 Changes from comments in PR#55 2015-03-09 11:34:44 +01:00
purigarcia
151c70c443 Merge branch 'develop' into share_password_support 2015-03-09 09:21:38 +01:00
Jenkins for ownCloud
eac3e1ddf1 [tx-robot] updated from transifex 2015-03-09 01:13:33 -04:00
Jenkins for ownCloud
c404060351 [tx-robot] updated from transifex 2015-03-08 01:13:33 -05: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
David A. Velasco
eafaf80dd4 Merge pull request #912 from owncloud/review_license
Reviewed license text in source files.
2015-03-06 09:45:56 +01:00
masensio
9da433bb7b Changes from comments in PR 2015-03-06 09:07:44 +01:00