1387 commits

Author	SHA1	Message	Date
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
David A. Velasco	156cb5e81b	Updated conflict message (same as in web app)	2015-08-04 17:29:42 +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
Jenkins for ownCloud	74d5911e56	[tx-robot] updated from transifex	2015-08-04 01:14:04 -04:00
Jenkins for ownCloud	519ba0393c	[tx-robot] updated from transifex	2015-07-31 01:14:01 -04:00
Jenkins for ownCloud	bacebffeb7	[tx-robot] updated from transifex	2015-07-30 01:14:02 -04:00
Jenkins for ownCloud	28284da055	[tx-robot] updated from transifex	2015-07-29 01:14:04 -04:00
Jenkins for ownCloud	2ac67e5e06	[tx-robot] updated from transifex	2015-07-28 01:14:02 -04: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
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	a3bfcdcd85	Merge branch 'develop' into favourites_context_menu	2015-07-10 08:44:56 +02:00
Jenkins for ownCloud	1e08c40f31	[tx-robot] updated from transifex	2015-07-10 01:14:03 -04:00
Jenkins for ownCloud	d32032fc96	[tx-robot] updated from transifex	2015-07-09 01:14:02 -04: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
Jenkins for ownCloud	cfe5b84573	[tx-robot] updated from transifex	2015-07-05 01:14:02 -04:00
Jenkins for ownCloud	d762a8747b	[tx-robot] updated from transifex	2015-07-03 01:15:16 -04:00
Jenkins for ownCloud	491e8a0bb3	[tx-robot] updated from transifex	2015-07-01 01:14:53 -04:00
Jenkins for ownCloud	eaf860d7c1	[tx-robot] updated from transifex	2015-06-30 01:13:52 -04:00
Jenkins for ownCloud	9ab961aa88	[tx-robot] updated from transifex	2015-06-29 01:13:34 -04:00
Jenkins for ownCloud	93b6c37400	[tx-robot] updated from transifex	2015-06-28 01:13:41 -04:00
Jenkins for ownCloud	24c564ab5f	[tx-robot] updated from transifex	2015-06-27 01:13:58 -04:00
David A. Velasco	9babe1b38c	Merge branch 'develop' into release-1.7.2	2015-06-25 14:43:04 +02:00
Jenkins for ownCloud	b4c217b505	[tx-robot] updated from transifex	2015-06-25 01:13:56 -04:00
Jenkins for ownCloud	4aed07aae1	[tx-robot] updated from transifex	2015-06-24 01:13:55 -04:00
masensio	378b28f346	Update some file icons	2015-06-23 14:50:02 +02:00
David A. Velasco	8107d9dc4f	Fixed wrong format of files & folder count	2015-06-23 14:40:51 +02:00
David A. Velasco	36128298d4	Updated file icons with higher resolutions	2015-06-23 14:40:49 +02:00
Jenkins for ownCloud	51a539f4ee	[tx-robot] updated from transifex	2015-06-23 01:14:15 -04:00
David A. Velasco	8c5b2b7b13	Merge remote-tracking branch 'origin/release-1.7.2' into release-1.7.2	2015-06-22 14:56:13 +02:00
masensio	fb57bbc8c8	Merge pull request #1023 from owncloud/fix_issues_from_Transifex ... Message with count of list(s) and folder(s) reestructured for better translations	2015-06-22 14:14:36 +02:00
masensio	2fbd757d66	Merge branch 'develop' into fix_shared_by_link_for_server_without_public_uploads ... Conflicts: owncloud-android-library	2015-06-22 14:03:21 +02:00
masensio	84678c9903	Fix: Import file from other app shows all folders as TextView	2015-06-22 12:58:41 +02:00