1604 commits

Author	SHA1	Message	Date
Andy Scherzinger	f72289f7bf	Merge branch 'master' of https://github.com/owncloud/android into material_buttons	2015-11-02 08:41:51 +01:00
Andy Scherzinger	6e54dfc55c	flipped size and mod date	2015-11-02 08:40:18 +01:00
Jenkins for ownCloud	2f237fb0cc	[tx-robot] updated from transifex	2015-11-02 01:13:44 -05:00
Jenkins for ownCloud	f817e49515	[tx-robot] updated from transifex	2015-11-01 01:13:47 -04:00
Jenkins for ownCloud	bba2964726	[tx-robot] updated from transifex	2015-10-31 01:13:54 -04:00
Maria Asensio	eaa0612bfa	Merge pull request #1109 from owncloud/sync_full_folder ... Replaced 'download folder' with 'synchronize', triggering the synchronization in two-ways of all the files in a folder	2015-10-30 14:14:52 +01:00
Jenkins for ownCloud	720c49136a	[tx-robot] updated from transifex	2015-10-30 01:13:47 -04:00
Jenkins for ownCloud	00c6d8bffe	[tx-robot] updated from transifex	2015-10-29 01:13:42 -04:00
masensio	b9ef747a0b	Merge branch 'master' into sync_full_folder ... Conflicts: owncloud-android-library src/com/owncloud/android/files/services/FileUploader.java	2015-10-27 08:52:17 +01:00
Jenkins for ownCloud	3918ec18a8	[tx-robot] updated from transifex	2015-10-27 01:13:47 -04:00
Andy Scherzinger	2603a35105	Merge branch 'master' of https://github.com/owncloud/android into material_buttons	2015-10-26 13:57:04 +01:00
Jenkins for ownCloud	2702951056	[tx-robot] updated from transifex	2015-10-23 01:13:41 -04:00
Andy Scherzinger	5c1e6e59ba	Merge branch 'master' of https://github.com/owncloud/android into material_buttons	2015-10-22 13:05:06 +02:00
David A. Velasco	08443f90c5	Merge pull request #1177 from owncloud/notification_coloring ... Add ownCloud color to notifications for lollipop	2015-10-22 09:10:10 +02:00
Andy Scherzinger	dffd81e00c	removed primary color usage for textColor of the input fields on the loginscreen	2015-10-21 11:31:58 +02:00
Jenkins for ownCloud	8269b6dee6	[tx-robot] updated from transifex	2015-10-21 01:13:40 -04:00
Jenkins for ownCloud	1db483d521	[tx-robot] updated from transifex	2015-10-20 01:13:41 -04:00
Andy Scherzinger	d64946f859	Merge branch 'master' of https://github.com/owncloud/android into material_buttons	2015-10-19 13:00:15 +02:00
Jenkins for ownCloud	d1dfc9958d	[tx-robot] updated from transifex	2015-10-19 01:13:44 -04:00
Jenkins for ownCloud	47e74b6271	[tx-robot] updated from transifex	2015-10-18 01:13:42 -04:00
Jenkins for ownCloud	185b670e5c	[tx-robot] updated from transifex	2015-10-17 01:13:48 -04:00
Andy Scherzinger	c56b3568c5	Merge branch 'master' of https://github.com/owncloud/android into notification_coloring	2015-10-14 10:34:48 +02:00
Andy Scherzinger	2610eb6805	Merge branch 'master' of https://github.com/owncloud/android into material_buttons	2015-10-14 10:33:49 +02:00
Jenkins for ownCloud	c47b0ab77a	[tx-robot] updated from transifex	2015-10-14 01:13:38 -04:00
Jenkins for ownCloud	28198ee983	[tx-robot] updated from transifex	2015-10-13 01:13:37 -04:00
Jenkins for ownCloud	a317483f44	[tx-robot] updated from transifex	2015-10-12 01:13:37 -04:00
Andy Scherzinger	e5a61893ec	Merge branch 'master' of https://github.com/owncloud/android into material_buttons	2015-10-11 12:30:05 +02:00
Jenkins for ownCloud	42f38fe876	[tx-robot] updated from transifex	2015-10-11 01:13:36 -04:00
Jenkins for ownCloud	f206eaaeb4	[tx-robot] updated from transifex	2015-10-10 01:13:37 -04:00
Andy Scherzinger	a61f862677	directly link owncloud_blue color ID to setup.xml's actionbar_start_color to enable proper color manipulation. Technical debt: setup should rename the actionbar_start_color (and actionbar_end_color) since it is basically the primary-oiiod value due to material design terms.	2015-10-09 15:04:39 +02:00
Jenkins for ownCloud	f9b7cbd2d5	[tx-robot] updated from transifex	2015-10-09 01:13:37 -04:00
Andy Scherzinger	41a883549f	Merge branch 'master' of https://github.com/owncloud/android into material_buttons	2015-10-07 19:03:23 +02:00
Maria Asensio	567355eed0	Merge pull request #1190 from owncloud/1182_Open_With_Fix ... Fix for #1182 on Android 5	2015-10-07 11:19:16 +02:00
Jenkins for ownCloud	8ba051f851	[tx-robot] updated from transifex	2015-10-07 01:13:37 -04:00
Jenkins for ownCloud	435d4969fe	[tx-robot] updated from transifex	2015-10-06 01:13:31 -04:00
Andy Scherzinger	8f0ea82efd	Fix for #1182 on Android 5	2015-10-05 18:44:50 +02:00
Jenkins for ownCloud	eddd3aa450	[tx-robot] updated from transifex	2015-10-04 01:13:38 -04:00
Jenkins for ownCloud	f056247e75	[tx-robot] updated from transifex	2015-10-03 01:13:37 -04:00
masensio	8f67624a4f	Fix: Long press menu shows two extra options: old cancel download and old cancel upload	2015-10-01 10:37:37 +02:00
masensio	9494620cc4	Merge branch 'master' into sync_full_folder ... Conflicts: src/com/owncloud/android/providers/FileContentProvider.java	2015-09-30 12:24:01 +02:00
masensio	8090269d55	Merge branch 'master' of github.com:owncloud/android ... Conflicts: CHANGELOG.md	2015-09-30 10:49:47 +02:00
Jenkins for ownCloud	b6c5188fd0	[tx-robot] updated from transifex	2015-09-29 01:13:58 -04:00
masensio	4316d7082f	Remove strings for values-en_DE	2015-09-28 13:57:22 +02:00
masensio	ee9aa68d23	Merge branch 'release-1.8'	2015-09-28 12:33:47 +02:00
Jenkins for ownCloud	9a3872d003	[tx-robot] updated from transifex	2015-09-28 02:33:53 -04:00
Andy Scherzinger	5417b2a4e5	Merge branch 'release-1.8' of https://github.com/owncloud/android into material_buttons	2015-09-25 16:09:01 +02:00
David A. Velasco	056b7c964d	Updated error message for failed folder synchronization ('download' not anymore)	2015-09-25 15:13:59 +02:00
David A. Velasco	e6c1454458	Persist conflicts in local database and show with an icon in the list of files	2015-09-25 15:13:46 +02:00
David A. Velasco	9b5506f81e	Join cancelation of downloads and uploads in 'cancel sync', both for files and folders	2015-09-25 15:13:41 +02:00
David A. Velasco	e885c78dc7	Added icon for files synchronizing; folders use it whenever downloading or uploading any file inside	2015-09-25 15:13:38 +02:00