1435 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Thomas Müller	e18815cc31	use ant to build	2014-01-21 18:07:53 +01:00
Thomas Müller	df218f99b8	Starting off with travis-ci integration based on https://github.com/embarkmobile/android-maven-example/blob/master/.travis.yml	2014-01-21 17:16:57 +01:00
David A. Velasco	8cf7a1c3db	Merge pull request #347 from owncloud/refactor_remote_saml_authentication ... Refactored remote saml authentication	2014-01-20 00:10:54 -08:00
David A. Velasco	f601a31b50	Removed excess comma	2014-01-20 09:09:59 +01:00
Mr. Jenkins	69743392f1	[tx-robot] updated from transifex	2014-01-20 01:14:27 -05:00
Mr. Jenkins	6483c8b913	[tx-robot] updated from transifex	2014-01-19 01:14:31 -05:00
Mr. Jenkins	61f53ad160	[tx-robot] updated from transifex	2014-01-18 01:14:30 -05:00
masensio	1d70ae81ea	OC-2640: Fix Bug: Log in screen disappear when trying to log in again with the same user	2014-01-17 15:12:12 +01:00
masensio	b79383d131	OC-2633: Fixes for comments in code. PR #347	2014-01-17 14:25:38 +01:00
masensio	5581bd9c11	Merge branch 'develop' into refactor_remote_saml_authentication	2014-01-17 14:20:14 +01:00
masensio	10dac35232	OC-2633: Fixes for comments in code. PR #347	2014-01-17 14:20:00 +01:00
Mr. Jenkins	2f5806da44	[tx-robot] updated from transifex	2014-01-17 01:14:30 -05:00
David A. Velasco	95afa6c8bf	Merge pull request #330 from LukeOwncloud/update_jackrabbit ... Update jackrabbit library, with dependencies now in separate files.	2014-01-16 08:55:28 -08:00
masensio	e65985bd33	Merge branch 'develop' into refactor_remote_saml_authentication	2014-01-15 11:00:37 +01:00
masensio	ea18765828	OC-2465: review code	2014-01-15 10:52:06 +01:00
Mr. Jenkins	ce5b3e3118	[tx-robot] updated from transifex	2014-01-15 01:56:46 -05:00
masensio	d3e0c5c6ce	OC-2465: Delete a log line in SsoWebViewClient	2014-01-14 11:37:10 +01:00
masensio	b5ca58b712	Merge branch 'develop' into refactor_remote_saml_authentication	2014-01-14 11:12:31 +01:00
masensio	8f0128cbab	OC-2541: Adapt the code the new saml implementation. Get the username from OCS-API	2014-01-14 11:06:03 +01:00
Mr. Jenkins	bd5f59d376	[tx-robot] updated from transifex	2014-01-14 01:54:26 -05:00
masensio	ddce8f769a	OC-2541: Add GetUserNameRemoteOperation to get userName from API (JSON).	2014-01-13 11:43:49 +01:00
Mr. Jenkins	09eb142860	[tx-robot] updated from transifex	2014-01-11 01:14:30 -05:00
masensio	fe6ab707e4	OC-2465: Move getUserNameForSamlSso to AccountUtils in oc_framework	2014-01-09 11:07:54 +01:00
masensio	f4dc4e45f8	Merge branch 'develop' into refactor_remote_saml_authentication	2014-01-09 10:04:04 +01:00
masensio	c535af9942	OC-2465: Move SsoWebViewClient to oc_framework	2014-01-09 10:01:54 +01:00
Mr. Jenkins	03fb21540a	[tx-robot] updated from transifex	2014-01-09 01:14:27 -05:00
David A. Velasco	56fa4445e8	Merge pull request #345 from owncloud/fix_pincode_in_instant_uploads ... Fixed pincode request in instant uploads	2014-01-08 09:12:06 -08:00
David A. Velasco	70e239fb41	Merge pull request #326 from owncloud/refactor_remote_operation_to_read_file ... Refactored remote operation to read properties of a file into oc_framework	2014-01-08 09:01:37 -08:00
David A. Velasco	70e6c2136a	Replaced last call to PropFindMethod in app with ReadRemoteFileOperation	2014-01-08 17:58:04 +01:00
masensio	5bab662e90	OC-2461: Fix bug: After insert the pincode, if the device is rotate the pincode is asked again	2014-01-08 13:02:16 +01:00
masensio	bcc972d63d	OC-2459: Ask for pincode, when click on an instant upload notification	2014-01-08 11:11:19 +01:00
Mr. Jenkins	0e83e57373	[tx-robot] updated from transifex	2014-01-08 01:14:28 -05:00
masensio	5dc172cd6c	OC-2397: Fix bug in read file: File doesn't refresh when you select to refresh after change it	2014-01-07 13:10:53 +01:00
masensio	e6e86b60c5	Merge remote-tracking branch 'origin/refactor_remote_operation_to_read_file' into refactor_remote_operation_to_read_file	2014-01-07 10:18:02 +01:00
masensio	44e3288168	Merge branch 'develop' into refactor_remote_operation_to_read_file ... Conflicts: src/com/owncloud/android/utils/FileStorageUtils.java	2014-01-07 10:16:39 +01:00
Mr. Jenkins	72f6313df8	[tx-robot] updated from transifex	2014-01-07 01:14:46 -05:00
Mr. Jenkins	d9979bc30e	[tx-robot] updated from transifex	2014-01-06 01:14:49 -05:00
Mr. Jenkins	18637068f3	[tx-robot] updated from transifex	2014-01-05 01:14:45 -05:00
Mr. Jenkins	ff56f513e2	[tx-robot] updated from transifex	2014-01-02 01:15:03 -05:00
Mr. Jenkins	45593a5cfb	[tx-robot] updated from transifex	2013-12-30 01:14:29 -05:00
Mr. Jenkins	39dfccd2d4	[tx-robot] updated from transifex	2013-12-29 01:14:28 -05:00
Mr. Jenkins	d11e4898af	[tx-robot] updated from transifex	2013-12-27 01:14:29 -05:00
Mr. Jenkins	8185eb1189	[tx-robot] updated from transifex	2013-12-26 01:14:28 -05:00
Mr. Jenkins	0d7fa8b9d6	[tx-robot] updated from transifex	2013-12-24 01:14:28 -05:00
Mr. Jenkins	e25658837a	[tx-robot] updated from transifex	2013-12-22 01:15:05 -05:00
Mr. Jenkins	6effcdc5c3	[tx-robot] updated from transifex	2013-12-21 01:14:58 -05:00
masensio	842c08954b	Clean some import warnings	2013-12-19 09:30:27 +01:00
masensio	685c26589b	Changes from comments in PR #337	2013-12-19 09:24:28 +01:00
Mr. Jenkins	429837e24b	[tx-robot] updated from transifex	2013-12-19 01:14:58 -05:00
masensio	db8a7b427a	Merge pull request #325 from owncloud/refactor_remote_operation_to_download_file ... Refactor remote operation to download file	2013-12-18 01:05:37 -08:00