3655 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Jorge Antonio Diaz-Benito Soriano	eb1e41bc76	Added error messages for copy action. English only.	2015-08-18 17:04:47 +02:00
Jorge Antonio Diaz-Benito Soriano	ccf8741fab	Added copy action	2015-08-18 17:00:51 +02:00
Jorge Antonio Diaz-Benito Soriano	bc50129881	Fixed 'Move' action	2015-08-18 16:21:39 +02:00
Jorge Antonio Diaz-Benito Soriano	db40d1ad68	Added 'ACTION_COPY_FILES'.	2015-08-18 16:15:00 +02:00
Jorge Antonio Diaz-Benito Soriano	dcffd79b60	Tweaks for source 1.5	2015-08-18 15:55:00 +02:00
Jorge Antonio Diaz-Benito Soriano	91f027fd06	Make oC-android-library track the copy_operation branch	2015-08-18 15:42:05 +02:00
Jorge Antonio Diaz-Benito Soriano	b843bc4387	Updated submodule to point to the branch with the additional stuff for the copy action	2015-08-18 14:20:18 +02:00
Jorge Antonio Diaz-Benito Soriano	7c19fcdc94	Added error messages for copy action. English only.	2015-08-18 13:44:28 +02:00
Jorge Antonio Diaz-Benito Soriano	fe5b6aa4a8	Added copy action	2015-08-18 13:35:28 +02:00
Jorge Antonio Diaz-Benito Soriano	c7205b8f56	Added CopyActivity	2015-08-18 11:39:18 +02:00
Jorge Antonio Diaz-Benito Soriano	dc8ceffddc	Fixed 'Move' action	2015-08-18 11:37:23 +02:00
Jorge Antonio Diaz-Benito Soriano	d9db150a31	Added 'ACTION_COPY_FILES'.	2015-08-18 11:17:54 +02:00
Jorge Antonio Diaz-Benito Soriano	f4432afdeb	Added 'Copy' action	2015-08-18 10:58:37 +02:00
masensio	95db3421f6	Merge branch 'master' into develop	2015-08-18 10:16:13 +02:00
Jenkins for ownCloud	ba4b258697	[tx-robot] updated from transifex	2015-08-17 01:13:37 -04:00
Jenkins for ownCloud	d09baff068	[tx-robot] updated from transifex	2015-08-15 01:13:39 -04:00
Jenkins for ownCloud	a244bdf1ca	[tx-robot] updated from transifex	2015-08-13 01:13:38 -04:00
Jenkins for ownCloud	c4b639e964	[tx-robot] updated from transifex	2015-08-12 01:13:37 -04:00
Jenkins for ownCloud	c19bb85a24	[tx-robot] updated from transifex	2015-08-11 01:13:39 -04:00
Jenkins for ownCloud	2b79f3292f	[tx-robot] updated from transifex	2015-08-10 01:13:35 -04:00
Jenkins for ownCloud	2206585f52	[tx-robot] updated from transifex	2015-08-09 01:13:36 -04:00
Jenkins for ownCloud	5258172ffd	[tx-robot] updated from transifex	2015-08-08 01:13:38 -04:00
Jenkins for ownCloud	8d4d1bfffb	[tx-robot] updated from transifex	2015-08-07 04:57:36 -04:00
Jenkins for ownCloud	80c112ad1a	[tx-robot] updated from transifex	2015-08-07 04:44:18 -04:00
David A. Velasco	537e075fca	Merge branch 'develop' ... Conflicts FIXED: owncloud-android-library	2015-08-07 10:17:03 +02:00
David A. Velasco	00482b6dcb	Merge pull request #1088 from owncloud/updated_docs_about_target_of_PRs ... Updated documents and .gitmodules with new policy: PRs should go to m…	2015-08-07 10:10:57 +02:00
David A. Velasco	3141659306	Updated documents and .gitmodules with new policy: PRs should go to master, no more to develop	2015-08-07 09:15:14 +02:00
Jenkins for ownCloud	e935e9239d	[tx-robot] updated from transifex	2015-08-07 01:13:50 -04:00
masensio	419dbeabec	Merge pull request #1052 from owncloud/change_subject_when_sharing_in_saml ... change the subject when sharing in saml	2015-08-06 11:00:59 +02:00
masensio	1ae203760e	Update library reference with fix for saml username	2015-08-06 10:53:35 +02:00
masensio	0110601cb2	Update library reference	2015-08-06 10:44:55 +02:00
David A. Velasco	6a8034ec24	Added username to SAML credentials	2015-08-06 10:23:29 +02:00
purigarcia	91000ba405	change the subject	2015-08-06 10:23:27 +02:00
Jenkins for ownCloud	e0594d4005	[tx-robot] updated from transifex	2015-08-06 01:14:11 -04:00
masensio	9a0361945c	Merge pull request #1068 from owncloud/conflictDialog_newWording ... Conflict dialog: new wording	2015-08-05 12:53:03 +02:00
David A. Velasco	156cb5e81b	Updated conflict message (same as in web app)	2015-08-04 17:29:42 +02:00
David A. Velasco	3512eae861	Fixed double request for ConflictsResolveActivity	2015-08-04 16:47:46 +02:00
tobiasKaminsky	e1ab4a41aa	download file if "use server version"	2015-08-04 12:39:59 +02:00
tobiasKaminsky	d2df3f9b33	re-added values-tzl	2015-08-04 12:39:58 +02:00
tobiasKaminsky	c907f6a742	Partially revert 50819ce	2015-08-04 12:39:57 +02:00
tobiasKaminsky	1327ce7315	renamed string values	2015-08-04 12:39:56 +02:00
David A. Velasco	6698b2d5f1	Merge pull request #1086 from owncloud/update_buildTools_to_22_0_1 ... Update buildTools version to 22.0.1	2015-08-04 12:36:24 +02:00
David A. Velasco	2470ee9af2	Updated reference to library	2015-08-04 12:28:57 +02:00
masensio	9d815b0187	Update buildTools version to 22.0.1	2015-08-04 11:14:51 +02:00
David A. Velasco	04f70fa8c9	Merge pull request #1083 from owncloud/update_jackrabbit_library ... Update JackRabbit library	2015-08-04 10:38:15 +02:00
Jenkins for ownCloud	74d5911e56	[tx-robot] updated from transifex	2015-08-04 01:14:04 -04:00
masensio	d77f1d7ec0	Update build.gradle to 1.2.3	2015-08-03 15:07:20 +02:00
masensio	1aa1a1fd50	Update library reference	2015-07-31 15:21:18 +02:00
masensio	4384d755a4	Update library refernce: Upgrade jackrabbit to 2.10.1	2015-07-31 12:36:42 +02:00
Jenkins for ownCloud	519ba0393c	[tx-robot] updated from transifex	2015-07-31 01:14:01 -04:00