5230 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Andy Scherzinger	03ff4adba2	Merge pull request #1582 from owncloud/reorderIssueTemplate ... reorder issue template	2016-06-03 17:19:30 +02:00
Andy Scherzinger	3c03d8df02	fixed rebase issue, readded lost descriptive text	2016-06-03 17:03:59 +02:00
tobiasKaminsky	18a5670074	reorder	2016-06-03 17:01:54 +02:00
David A. Velasco	b0f07f971b	Merge pull request #1700 from owncloud/inject_signing_config_from_env_vars ... Load release signing config from environment variables	2016-06-03 13:42:44 +02:00
David A. Velasco	7e44bbb6f5	Load release signing config from environment variables	2016-06-03 13:14:29 +02:00
David A. Velasco	9090d52c7d	Merge pull request #1699 from owncloud/allow_change_APK_names ... Allow changing APK names	2016-06-03 12:33:49 +02:00
David A. Velasco	58b7f7475a	Updated build files to fix APK name of workaround app	2016-06-03 11:18:18 +02:00
David A. Velasco	af22eae068	Updated build.gradle to modify APK names with parameters set as environment variables	2016-06-03 11:07:08 +02:00
Jenkins for ownCloud	418f240aa3	[tx-robot] updated from transifex	2016-06-03 01:13:59 -04:00
Andy Scherzinger	9ce1dbcfac	#1415 - semi transparent checkmark in checked checkbox image ... #1415 - semi transparent checkmark in checked checkbox image	2016-06-02 14:30:34 +02:00
Andy Scherzinger	2fec9e8ea0	mdpi checkmark	2016-06-02 13:39:11 +02:00
Andy Scherzinger	9e4e93a5bc	fixed checkmark color	2016-06-02 13:39:11 +02:00
Andy Scherzinger	dd8a18508e	added semi transparent checmark to checked checkbox image (see #1415)	2016-06-02 13:39:10 +02:00
Juan Carlos González Cabrero	28f20ec3ef	Check if the OCFile has a previous conflict before calling a sync operation	2016-06-02 12:40:09 +02:00
Juan Carlos González Cabrero	ee3b518f75	Upgrade version number on both android module and workaround	2016-06-02 09:11:18 +02:00
Jenkins for ownCloud	4edb808b50	[tx-robot] updated from transifex	2016-06-02 01:13:57 -04:00
David A. Velasco	77a9e62313	Merge pull request #1685 from owncloud/change_overlay_synced_icons ... Change overlay synced icons	2016-06-01 17:24:27 +02:00
jabarros	ad32dfea20	Added white border to available offline icon	2016-06-01 17:07:13 +02:00
Andy Scherzinger	9bb572e3e7	fixed sizes of the available offline icon and added a xxhdpi variant	2016-06-01 17:07:13 +02:00
jabarros	b15b49f56f	Revert the remove of favorite icon (star)	2016-06-01 17:07:13 +02:00
jabarros	26c7a451e1	Change 'Favorite/Unfavorite' item menu to 'Set/Unset as available offline'	2016-06-01 17:07:13 +02:00
jabarros	e11eecd2b5	Change favorite icon to available offline new one	2016-06-01 17:07:13 +02:00
jabarros	a9a944799e	Added and changed synchronizing, sync error and successfully synced icons	2016-06-01 17:07:13 +02:00
Jenkins for ownCloud	1c0bc898f2	[tx-robot] updated from transifex	2016-06-01 01:16:10 -04:00
David A. Velasco	46b1c5ceea	Merge pull request #1688 from owncloud/1628_prevent_that_upload_delayed_waiting_Wifi_notifies_an_error ... Prevent that uploads delayed waiting for Wifi are shown as failed uploads	2016-05-30 12:14:48 +02:00
David A. Velasco	7f33ba5d4a	Clear actions in menu don't deal with uploads waiting for Wifi as if were failed	2016-05-30 11:03:22 +02:00
David A. Velasco	d41accdb6a	Removed classes for compatibility of notifications with Android API level lesser than 14, not supported any more	2016-05-30 10:45:01 +02:00
David A. Velasco	52d8b7c264	Prevent that upload-in-progress notification is shown for instant uploads unless they are really performed	2016-05-30 10:45:01 +02:00
David A. Velasco	dab4ef4550	Moved upload waiting for Wifi to the section 'current' in uploads view	2016-05-30 10:45:01 +02:00
David A. Velasco	a5ef75a840	Prevent error notification for delayed uploads waiting for Wifi	2016-05-30 10:45:01 +02:00
Jenkins for ownCloud	f1b66e1281	[tx-robot] updated from transifex	2016-05-30 01:13:57 -04:00
David A. Velasco	9087c93d7c	Merge pull request #1687 from owncloud/share_Android__avoid_duplication_of_received_files ... Prevent that files sent to OC from other apps are duplicated in local storage	2016-05-27 13:03:17 +02:00
David A. Velasco	cfbe5498f8	Prevent that files sent to OC from other apps are duplicated in local storage	2016-05-27 12:46:01 +02:00
Jenkins for ownCloud	de30acbbf7	[tx-robot] updated from transifex	2016-05-27 01:13:51 -04:00
Jenkins for ownCloud	6fdbb65d23	[tx-robot] updated from transifex	2016-05-26 01:13:50 -04:00
Jenkins for ownCloud	78540e4e02	[tx-robot] updated from transifex	2016-05-25 01:13:51 -04:00
David A. Velasco	ba0d2ff7af	Merge pull request #1646 from owncloud/readme-design ... Make readme/repository more attractive for contributors	2016-05-24 18:19:26 +02:00
Raquel Pérez Bartolomé	3d560abf3a	Update README.md ... Added beta version	2016-05-24 17:55:31 +02:00
Jan-Christoph Borchardt	87c401a1e1	make readme/repository more attractive for contributors	2016-05-24 17:55:31 +02:00
David A. Velasco	81218b9945	Merge pull request #1672 from owncloud/automatic_tests ... Added setup for automated tests, and first sample tests.	2016-05-24 13:09:08 +02:00
David A. Velasco	873795bffc	Commented duplicated update of Android SDK in Travis environment	2016-05-24 12:53:41 +02:00
jabarros	5f1e5fdf59	Changes after CR	2016-05-24 12:53:41 +02:00
jabarros	ddd5152a11	Fix error after doing rebase	2016-05-24 12:53:41 +02:00
jabarros	365fe2845b	Added ui automator test case	2016-05-24 12:53:41 +02:00
jabarros	9a422887e7	First UI Automator example test	2016-05-24 12:53:41 +02:00
jabarros	c0c2133222	Added AndroidManifest with api level 18 for UI Automator tests	2016-05-24 12:53:41 +02:00
jabarros	cb630e5709	Setup Espresso environment	2016-05-24 12:53:41 +02:00
David A. Velasco	8ef1ade039	Disable UI tests in Travis until we get a stable setup	2016-05-24 12:53:41 +02:00
David A. Velasco	2dfd98cbdd	Turn on device screen before Espress tests start	2016-05-24 12:53:41 +02:00
David A. Velasco	7a6335430d	Normalized environment variables for end2end tests	2016-05-24 12:53:41 +02:00