3597 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
masensio	4384d755a4	Update library refernce: Upgrade jackrabbit to 2.10.1	2015-07-31 12:36:42 +02:00
Jenkins for ownCloud	2ac67e5e06	[tx-robot] updated from transifex	2015-07-28 01:14:02 -04:00
AndyScherzinger	fcf4f1238d	Merge branch 'master' of https://github.com/owncloud/android into develop	2015-07-26 22:34:13 +02:00
Andy Scherzinger	c9c0684cbc	Update README.md ... Added more information for contributing code, development setup and build status	2015-07-26 22:16:06 +02:00
Jenkins for ownCloud	82f4123260	[tx-robot] updated from transifex	2015-07-25 01:13:46 -04:00
Jenkins for ownCloud	3d18b6b207	[tx-robot] updated from transifex	2015-07-24 01:14:12 -04:00
David A. Velasco	c21fa6c6e5	Merge pull request #1050 from owncloud/favourites_context_menu ... 'Kept-in-sync' renamed as 'Favourites' and added to context menu in list of files	2015-07-23 09:37:13 +02:00
Jenkins for ownCloud	650c4fd290	[tx-robot] updated from transifex	2015-07-23 01:13:51 -04:00
purigarcia	61e6191342	change the name of the method from keepInSync to favorite. Other changes commented in the review	2015-07-22 18:13:45 +02:00
David A. Velasco	ff82b51e49	Merge pull request #1048 from owncloud/shareWithYou_icon_in_fileList ... ShareWithMe icon in file list	2015-07-20 12:27:52 +02:00
purigarcia	f7211fe486	remove empty line	2015-07-20 12:20:15 +02:00
purigarcia	5cc79b0919	modify for the review	2015-07-20 12:18:44 +02:00
David A. Velasco	2c3d44f47e	Merge pull request #1053 from owncloud/pincode_request_is_not_starting_when_rotating ... Fixed: pass code request not restarted anymore when the device is rotated	2015-07-20 11:18:15 +02:00
purigarcia	c7817b9302	modify code to be simpler	2015-07-20 10:57:53 +02:00
Jenkins for ownCloud	1976dfe9a1	[tx-robot] updated from transifex	2015-07-20 01:14:05 -04:00
Jenkins for ownCloud	aab283a15b	[tx-robot] updated from transifex	2015-07-18 01:14:06 -04:00
Jenkins for ownCloud	f173670351	[tx-robot] updated from transifex	2015-07-17 01:14:04 -04:00
Jenkins for ownCloud	48cd33ae2d	[tx-robot] updated from transifex	2015-07-14 01:14:02 -04:00
Jenkins for ownCloud	05896ff491	[tx-robot] updated from transifex	2015-07-13 01:14:04 -04:00
Jenkins for ownCloud	00e6d45abb	[tx-robot] updated from transifex	2015-07-12 01:14:02 -04:00
Jenkins for ownCloud	7bb1307a6b	[tx-robot] updated from transifex	2015-07-11 01:14:06 -04:00
purigarcia	66fd64a0fc	Merge branch 'develop' into pincode_request_is_not_starting_when_rotating	2015-07-10 08:53:03 +02:00
purigarcia	a3bfcdcd85	Merge branch 'develop' into favourites_context_menu	2015-07-10 08:44:56 +02:00
purigarcia	59a9bc8004	Merge branch 'develop' into shareWithYou_icon_in_fileList	2015-07-10 08:43:23 +02:00
Jenkins for ownCloud	1e08c40f31	[tx-robot] updated from transifex	2015-07-10 01:14:03 -04:00
purigarcia	066324f60a	save the state before rotate	2015-07-09 16:40:29 +02:00
Jenkins for ownCloud	d32032fc96	[tx-robot] updated from transifex	2015-07-09 01:14:02 -04:00
purigarcia	a2ac8c19a3	shareByLink in folder in gridview is shown is shown	2015-07-08 18:18:51 +02:00
purigarcia	451513a35d	in gridview in the folder, icons are not shown	2015-07-08 18:14:38 +02:00
purigarcia	0e95ee3e67	shareWithMe is shown in the file list	2015-07-08 17:41:41 +02:00
purigarcia	31768aabce	update the menu in the preview of the video	2015-07-08 16:54:39 +02:00
purigarcia	c1d4106c71	refresh menu in the preview of an image	2015-07-08 14:40:07 +02:00
purigarcia	782713b391	add action finished in FileActivity	2015-07-08 13:33:14 +02:00
purigarcia	38186052e7	remove a log	2015-07-08 11:15:22 +02:00
purigarcia	354e3aed5c	add actions in the preview	2015-07-08 10:57:37 +02:00
purigarcia	4e66d6acd8	Actions in the detail view	2015-07-08 10:32:58 +02:00
purigarcia	96e2a2b97b	toggleKeepInSync is moved to FileOperationsHelper	2015-07-08 10:22:41 +02:00
purigarcia	f226b5f93a	add the action in the context menu	2015-07-08 10:17:27 +02:00
purigarcia	684104ccb8	reuse a existing method, remove the new one	2015-07-08 09:12:40 +02:00
purigarcia	f0c302b0f8	first step to detect if the file is favorite	2015-07-08 09:08:49 +02:00
purigarcia	d039386831	options are not shown if it is a foler	2015-07-08 08:58:06 +02:00
purigarcia	32346efa62	this two options are not shown if the file is downloading or uploading	2015-07-08 08:55:41 +02:00
purigarcia	7df9aa7310	add unfavorite option in context menu	2015-07-08 08:50:24 +02:00
purigarcia	ebe5a62f73	change the name from favorites to keep_up_to_date	2015-07-08 08:43:49 +02:00
purigarcia	e0efee57b4	add keep up to date option in the menu	2015-07-08 08:36:10 +02:00
Jenkins for ownCloud	7623a8af61	[tx-robot] updated from transifex	2015-07-08 01:14:04 -04:00
masensio	629cff2d3f	Merge branch 'master' into develop	2015-07-07 13:15:35 +02:00
masensio	174fa1f36b	delete values-tzl	2015-07-07 10:41:22 +02:00
masensio	21ec36e39f	Merge branch 'release-1.7.2'	2015-07-06 13:55:36 +02:00
masensio	b80b1c93b7	Update library reference	2015-07-06 13:53:18 +02:00