Jorge Antonio Diaz-Benito Soriano
							
						 
					 | 
					
						
						
						
						
							
						
						
							b8830e0faf
							
						
					 | 
					
						
						
							
							Disabled abort-build-on-lint-error check (all modules have errors).
						
						
						
						
						
						
							
						
					 | 
					
						2015-08-18 13:14:17 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jorge Antonio Diaz-Benito Soriano
							
						 
					 | 
					
						
						
						
						
							
						
						
							25ec49acfb
							
						
					 | 
					
						
						
							
							Replaced obsolete Android plugins and updated Gradle plugin version to 0.13
						
						
						
						
						
						
							
						
					 | 
					
						2015-08-18 13:14:16 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jorge Antonio Diaz-Benito Soriano
							
						 
					 | 
					
						
						
						
						
							
						
						
							775fb5b1f2
							
						
					 | 
					
						
						
							
							Updated build.gradle to allow Android Studio to properly identify test_client as a module
						
						
						
						
						
						
							
						
					 | 
					
						2015-08-18 13:14:14 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jorge Antonio Diaz-Benito Soriano
							
						 
					 | 
					
						
						
						
						
							
						
						
							8e0739aed0
							
						
					 | 
					
						
						
							
							Added gradle folder to .gitignore
						
						
						
						
						
						
							
						
					 | 
					
						2015-08-18 13:14:13 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jorge Antonio Diaz-Benito Soriano
							
						 
					 | 
					
						
						
						
						
							
						
						
							f753b1bde8
							
						
					 | 
					
						
						
							
							Added INVALID_COPY_INTO_DESCENDANT code
						
						
						
						
						
						
							
						
					 | 
					
						2015-08-18 13:14:12 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jorge Antonio Diaz-Benito Soriano
							
						 
					 | 
					
						
						
						
						
							
						
						
							542e596bf5
							
						
					 | 
					
						
						
							
							Removed unnecessary command
						
						
						
						
						
						
							
						
					 | 
					
						2015-08-18 13:12:27 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jorge Antonio Diaz-Benito Soriano
							
						 
					 | 
					
						
						
						
						
							
						
						
							3e28768d8f
							
						
					 | 
					
						
						
							
							Updated some dependencies
						
						
						
						
						
						
							
						
					 | 
					
						2015-08-18 13:12:25 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jorge Antonio Diaz-Benito Soriano
							
						 
					 | 
					
						
						
						
						
							
						
						
							43e82df560
							
						
					 | 
					
						
						
							
							New Travis-CI conf test
						
						
						
						
						
						
							
						
					 | 
					
						2015-08-18 13:12:24 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jorge Antonio Diaz-Benito Soriano
							
						 
					 | 
					
						
						
						
						
							
						
						
							0842c4c407
							
						
					 | 
					
						
						
							
							Added some neccesities for the copy operation
						
						
						
						
						
						
							
						
					 | 
					
						2015-08-18 13:11:31 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jorge Antonio Diaz-Benito Soriano
							
						 
					 | 
					
						
						
						
						
							
						
						
							5f66b204bb
							
						
					 | 
					
						
						
							
							Updated .gitignore
						
						
						
						
						
						
							
						
					 | 
					
						2015-08-18 13:04:06 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jorge Antonio Diaz-Benito Soriano
							
						 
					 | 
					
						
						
						
						
							
						
						
							c3478eb8d4
							
						
					 | 
					
						
						
							
							Disabled abort-build-on-lint-error check (all modules have errors).
						
						
						
						
						
						
							
						
					 | 
					
						2015-08-18 13:04:05 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jorge Antonio Diaz-Benito Soriano
							
						 
					 | 
					
						
						
						
						
							
						
						
							4a76d429ab
							
						
					 | 
					
						
						
							
							Updated build.gradle to allow Android Studio to properly identify test_client as a module
						
						
						
						
						
						
							
						
					 | 
					
						2015-08-18 13:04:04 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jorge Antonio Diaz-Benito Soriano
							
						 
					 | 
					
						
						
						
						
							
						
						
							7fd0028cc9
							
						
					 | 
					
						
						
							
							Added sample_client build.gradle
						
						
						
						
						
						
							
						
					 | 
					
						2015-08-18 13:04:03 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jorge Antonio Diaz-Benito Soriano
							
						 
					 | 
					
						
						
						
						
							
						
						
							39b3f376e2
							
						
					 | 
					
						
						
							
							Added gradle folder to .gitignore
						
						
						
						
						
						
							
						
					 | 
					
						2015-08-18 13:04:02 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jorge Antonio Diaz-Benito Soriano
							
						 
					 | 
					
						
						
						
						
							
						
						
							d73180ab67
							
						
					 | 
					
						
						
							
							Added build.gradle
						
						
						
						
						
						
							
						
					 | 
					
						2015-08-18 13:04:01 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David A. Velasco
							
						 
					 | 
					
						
						
						
						
							
						
						
							dbc8c325d7
							
						
					 | 
					
						
						
							
							Merge branch 'develop'
						
						
						
						
						
						
							
						
					 | 
					
						2015-08-07 10:13:01 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David A. Velasco
							
						 
					 | 
					
						
						
						
						
							
						
						
							e3dddbdcc7
							
						
					 | 
					
						
						
							
							Merge pull request #81 from owncloud/updated_readme_about_target_of_PRs
						
						
						
						
						
						
						
						Updated README.md with new policy: PRs should go to master, no more t… 
						
						
							
						
					 | 
					
						2015-08-07 10:10:50 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David A. Velasco
							
						 
					 | 
					
						
						
						
						
							
						
						
							e71ba7faee
							
						
					 | 
					
						
						
							
							Removed reference to git branching model to avoid confussion
						
						
						
						
						
						
							
						
					 | 
					
						2015-08-07 09:09:20 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David A. Velasco
							
						 
					 | 
					
						
						
						
						
							
						
						
							0ae4d1dac9
							
						
					 | 
					
						
						
							
							Updated README.md with new policy: PRs should go to master, no more to develop
						
						
						
						
						
						
							
						
					 | 
					
						2015-08-06 12:40:59 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								masensio
							
						 
					 | 
					
						
						
						
						
							
						
						
							c8f6e5ad57
							
						
					 | 
					
						
						
							
							Merge pull request #80 from owncloud/username_in_saml_sso
						
						
						
						
						
						
						
						Added username to SAML SSO credentials 
						
						
							
						
					 | 
					
						2015-08-06 10:39:32 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David A. Velasco
							
						 
					 | 
					
						
						
						
						
							
						
						
							1fa8e79b3f
							
						
					 | 
					
						
						
							
							Fixed unit tests
						
						
						
						
						
						
							
						
					 | 
					
						2015-08-06 09:34:42 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David A. Velasco
							
						 
					 | 
					
						
						
						
						
							
						
						
							6752b25b8d
							
						
					 | 
					
						
						
							
							Added username to OwnCloudSamlSsoCredentials
						
						
						
						
						
						
							
						
					 | 
					
						2015-08-06 09:34:41 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David A. Velasco
							
						 
					 | 
					
						
						
						
						
							
						
						
							3b9777c5b6
							
						
					 | 
					
						
						
							
							Merge pull request #79 from owncloud/update_buildTools_to_22_0_1
						
						
						
						
						
						
						
						Update buildTools version to 22.0.1 
						
						
							
						
					 | 
					
						2015-08-04 12:27:03 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David A. Velasco
							
						 
					 | 
					
						
						
						
						
							
						
						
							3ecefdfbcc
							
						
					 | 
					
						
						
							
							Updated buildTools in all the Gradle files
						
						
						
						
						
						
							
						
					 | 
					
						2015-08-04 11:49:07 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David A. Velasco
							
						 
					 | 
					
						
						
						
						
							
						
						
							8d9e0bf682
							
						
					 | 
					
						
						
							
							Fixed build tools dependency in Travis
						
						
						
						
						
						
							
						
					 | 
					
						2015-08-04 11:33:18 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								masensio
							
						 
					 | 
					
						
						
						
						
							
						
						
							dc057816d3
							
						
					 | 
					
						
						
							
							Update buildTools version to 22.0.1
						
						
						
						
						
						
							
						
					 | 
					
						2015-08-04 11:14:07 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David A. Velasco
							
						 
					 | 
					
						
						
						
						
							
						
						
							bfa5e4c6ba
							
						
					 | 
					
						
						
							
							Merge pull request #78 from owncloud/update_jackrabbit_library
						
						
						
						
						
						
						
						Update JackRabbit library to 2.10.1 
						
						
							
						
					 | 
					
						2015-08-03 14:28:22 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								masensio
							
						 
					 | 
					
						
						
						
						
							
						
						
							482a70fba1
							
						
					 | 
					
						
						
							
							Replace jackrabbit 2.7.2 jar file by jackrabbit 2.10.1 jar file
						
						
						
						
						
						
							
						
					 | 
					
						2015-07-31 15:20:23 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								masensio
							
						 
					 | 
					
						
						
						
						
							
						
						
							4b1c9725c6
							
						
					 | 
					
						
						
							
							Replace jackrabbit 2.7.2 jar file by jackrabbit 2.10.1 jar file
						
						
						
						
						
						
							
						
					 | 
					
						2015-07-31 15:19:38 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								masensio
							
						 
					 | 
					
						
						
						
						
							
						
						
							d89387b8df
							
						
					 | 
					
						
						
							
							Update build.gradle with jackrabbit version 2.10.1
						
						
						
						
						
						
							
						
					 | 
					
						2015-07-31 11:22:04 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mendhak
							
						 
					 | 
					
						
						
						
						
							
						
						
							defe460a0a
							
						
					 | 
					
						
						
							
							Allow asynchronous execution without handler
						
						
						
						
						
						
							
						
					 | 
					
						2015-07-04 23:30:54 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David A. Velasco
							
						 
					 | 
					
						
						
						
						
							
						
						
							02c24c8a3b
							
						
					 | 
					
						
						
							
							Fixed existence check on files when automatic redirections are explicitly disabled (SAML SSO)
						
						
						
						
						
						
							
 oc-android-library-0.9.7
						
					 | 
					
						2015-07-02 14:02:31 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								masensio
							
						 
					 | 
					
						
						
						
						
							
						
						
							f5fbca24be
							
						
					 | 
					
						
						
							
							Merge pull request #74 from owncloud/auto_grid_only_with_all_pictures
						
						
						
						
						
						
						
						Added check of support of remote thumbnails to OwnCloudVersion 
						
						
							
						
					 | 
					
						2015-06-25 12:52:28 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David A. Velasco
							
						 
					 | 
					
						
						
						
						
							
						
						
							c84530d359
							
						
					 | 
					
						
						
							
							Added helper method to check if a server version supports remote thumbnails
						
						
						
						
						
						
							
						
					 | 
					
						2015-06-23 10:44:09 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David A. Velasco
							
						 
					 | 
					
						
						
						
						
							
						
						
							5d1f069003
							
						
					 | 
					
						
						
							
							Merge pull request #73 from owncloud/fix_shared_by_link_for_server_without_uploads
						
						
						
						
						
						
						
						Fix shared by link for server without public uploads 
						
						
							
						
					 | 
					
						2015-06-22 14:53:29 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								masensio
							
						 
					 | 
					
						
						
						
						
							
						
						
							8f87ad78f7
							
						
					 | 
					
						
						
							
							Merge branch 'develop' into fix_shared_by_link_for_server_without_uploads
						
						
						
						
						
						
							
						
					 | 
					
						2015-06-22 14:01:27 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David A. Velasco
							
						 
					 | 
					
						
						
						
						
							
						
						
							ff85ff2eef
							
						
					 | 
					
						
						
							
							Merge branch 'master' into develop
						
						
						
						
						
						
							
						
					 | 
					
						2015-06-22 11:15:46 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David A. Velasco
							
						 
					 | 
					
						
						
						
						
							
						
						
							08831dfef5
							
						
					 | 
					
						
						
							
							Merge pull request #67 from owncloud/fix-code-that-never-worked
						
						
						
						
						
						
						
						Use .equals instead of != 
						
						
							
						
					 | 
					
						2015-06-22 09:37:59 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								masensio
							
						 
					 | 
					
						
						
						
						
							
						
						
							a22b1da16b
							
						
					 | 
					
						
						
							
							Don't send public_upload value in createShare
						
						
						
						
						
						
							
						
					 | 
					
						2015-06-19 15:10:36 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David A. Velasco
							
						 
					 | 
					
						
						
						
						
							
						
						
							344d5b22e4
							
						
					 | 
					
						
						
							
							Merge pull request #71 from owncloud/forbidden_characters_from_server
						
						
						
						
						
						
						
						Support check of forbidden characters in server, for OC >= 8.1 
						
						
							
						
					 | 
					
						2015-06-17 09:13:12 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								masensio
							
						 
					 | 
					
						
						
						
						
							
						
						
							58deabb773
							
						
					 | 
					
						
						
							
							Changes from comments in Code Review
						
						
						
						
						
						
							
						
					 | 
					
						2015-06-16 15:15:36 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								masensio
							
						 
					 | 
					
						
						
						
						
							
						
						
							dcad9157aa
							
						
					 | 
					
						
						
							
							Prevent NullPointerException when OwncloudVersion is null in MoveRemoteFileOperation and RenameRemoteFileOperation
						
						
						
						
						
						
							
						
					 | 
					
						2015-06-16 10:51:50 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								masensio
							
						 
					 | 
					
						
						
						
						
							
						
						
							1811be1b52
							
						
					 | 
					
						
						
							
							Prevent NullPointException when OwncloudVersion is null in CreateRemoteFolderOperation
						
						
						
						
						
						
							
						
					 | 
					
						2015-06-16 10:39:40 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								masensio
							
						 
					 | 
					
						
						
						
						
							
						
						
							060ca75f17
							
						
					 | 
					
						
						
							
							Merge branch 'develop' into forbidden_characters_from_server
						
						
						
						
						
						
						
						Conflicts:
	src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java
	src/com/owncloud/android/lib/resources/files/RenameRemoteFileOperation.java 
						
						
							
						
					 | 
					
						2015-06-15 14:41:27 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								masensio
							
						 
					 | 
					
						
						
						
						
							
						
						
							639cb7eacd
							
						
					 | 
					
						
						
							
							Merge pull request #70 from owncloud/keep_permanent_redirection_in_existence_check
						
						
						
						
						
						
						
						Get that ExistenceCheckRemoteOperation remembers the sequence of foll… 
						
						
							
						
					 | 
					
						2015-06-15 13:14:36 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David A. Velasco
							
						 
					 | 
					
						
						
						
						
							
						
						
							41dcc33730
							
						
					 | 
					
						
						
							
							Get that ExistenceCheckRemoteOperation remembers the sequence of followed redirections after its execution
						
						
						
						
						
						
						
						Conflicts fixed:
	src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java
	src/com/owncloud/android/lib/resources/files/RenameRemoteFileOperation.java 
						
						
							
						
					 | 
					
						2015-06-11 10:32:05 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								masensio
							
						 
					 | 
					
						
						
						
						
							
						
						
							4ca0ff2203
							
						
					 | 
					
						
						
							
							Parse error 500 and InvalidPathException for Uploads
						
						
						
						
						
						
							
						
					 | 
					
						2015-06-03 11:09:58 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								masensio
							
						 
					 | 
					
						
						
						
						
							
						
						
							b8a3eb059c
							
						
					 | 
					
						
						
							
							Remove exhaust response in RenameRemoteFileOperation
						
						
						
						
						
						
							
						
					 | 
					
						2015-06-03 11:09:32 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								masensio
							
						 
					 | 
					
						
						
						
						
							
						
						
							16c9147383
							
						
					 | 
					
						
						
							
							Parse and show the error of invalid characters coming from the server side: Move, Rename, Uploads
						
						
						
						
						
						
							
						
					 | 
					
						2015-06-03 00:32:19 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Lukas Reschke
							
						 
					 | 
					
						
						
						
						
							
						
						
							b102d1cdf9
							
						
					 | 
					
						
						
							
							Change the order to prevent NullPointerExceptions
						
						
						
						
						
						
							
						
					 | 
					
						2015-06-02 16:56:35 +02:00 | 
					
					
						
						
							
							
							
						
					 |