5019 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Andy Scherzinger	10155b9815	added reference to SETUP.md ... added reference to SETUP.md to cover basic dev environment setup question right away.	2016-02-22 11:20:14 +01:00
Andy Scherzinger	8855ccbdc0	added issues link ... added issues link to search "existing ones"	2016-02-22 11:17:15 +01:00
Andy Scherzinger	8da6b4f335	formatting fixes ... minor fixes for formatting	2016-02-22 10:48:31 +01:00
Juan Carlos González Cabrero	ee66791dcb	Deleted keySuffix parameter from putIfAbsent method, wich was corrupting the path	2016-02-22 10:24:07 +01:00
David A. Velasco	286dc8fafd	Merge branch 'master' into reliable_uploads_actions_uploads_view	2016-02-22 10:21:46 +01:00
David A. Velasco	c9ad19692f	Simplified FileUploader - UploadFileOperation gets responsibility to update local data as a new SyncOperation	2016-02-22 09:25:42 +01:00
Juan Carlos González Cabrero	9acb660165	Avoid storing an OCFile before the upload is completed	2016-02-22 09:20:52 +01:00
Jenkins for ownCloud	c2bb832547	[tx-robot] updated from transifex	2016-02-22 01:13:33 -05:00
Jenkins for ownCloud	2adeab1fc5	[tx-robot] updated from transifex	2016-02-21 01:13:32 -05:00
Jenkins for ownCloud	6009ef939b	[tx-robot] updated from transifex	2016-02-20 01:13:39 -05:00
Maria Asensio	f88ab60a78	Merge pull request #1191 from owncloud/cancelUploadOnWlanExit ... Cancel upload on wlan exit	2016-02-19 15:08:13 +01:00
David A. Velasco	e5fbc8fed9	Refactoring UploadFileOperation.java	2016-02-19 13:38:59 +01:00
Juan Carlos González Cabrero	6e63e65f2d	Calls to the FileUploader service refactored and fixed	2016-02-19 12:52:22 +01:00
Maria Asensio	482d43a08d	Merge pull request #1473 from owncloud/target_marshmallow_rebased ... Move to compile target Marshmallow (Android 6 - v23) - rebased without FAB	2016-02-19 11:28:05 +01:00
masensio	9db05f6b16	Update library reference, after merging PR#109	2016-02-19 11:23:27 +01:00
David A. Velasco	1f3ff26001	Fixed broken initialization of UploadFileOperation	2016-02-19 11:08:49 +01:00
David A. Velasco	57de2968fb	Removed dependency of OCUpload on OCFile	2016-02-19 10:06:55 +01:00
Juan Carlos González Cabrero	5fd891413e	Line wrapping and getApplicationContext calls removed from last commit	2016-02-19 09:27:15 +01:00
Jenkins for ownCloud	5828ec35b8	[tx-robot] updated from transifex	2016-02-19 01:13:36 -05:00
Juan Carlos González Cabrero	e6cfedc285	Changed calls to FileUploader service to static methods to manage service Intents internally	2016-02-18 14:14:32 +01:00
Juan Carlos González Cabrero	d5fa3a5578	Retry action on list items of Updates view like in iOS	2016-02-18 10:21:03 +01:00
Juan Carlos González Cabrero	413d491112	Update uploads view when finish upload is deleted	2016-02-18 09:38:51 +01:00
David A. Velasco	40e9bb0529	Merged FileUploadService into FileUploader to avoid that changes from other branches are circumvented	2016-02-18 09:30:35 +01:00
Jenkins for ownCloud	79c7cc86bc	[tx-robot] updated from transifex	2016-02-18 01:13:43 -05:00
David A. Velasco	cfcb18eb54	Saving new file to be uploaded for the first time with the correct reference to its parent folder	2016-02-17 17:46:16 +01:00
Jenkins for ownCloud	e12734c551	[tx-robot] updated from transifex	2016-02-17 01:13:47 -05:00
David A. Velasco	f58c19bb55	Minor fixes from own CR	2016-02-16 17:05:27 +01:00
David A. Velasco	05e723ba20	Removed unneeded request for permission WRITE_SETTINGS, and commented permissions behaviour for API level >= 23 in AndroidManifest.xml	2016-02-16 13:59:49 +01:00
David A. Velasco	a0a16e52f6	Updated ref to oc-android-library after increasing its build target to API level 23	2016-02-16 13:42:57 +01:00
Juan Carlos González Cabrero	91156063d2	'Clear all uploads' option implemented	2016-02-16 09:37:30 +01:00
David A. Velasco	e7673b90d2	Fixed build via gradle of OC JB Workaround app and build target updated to 23	2016-02-16 09:25:33 +01:00
David A. Velasco	89870064dc	Merge pull request #1470 from owncloud/bug_7541 ... Fixes app crash when malformed URL is entered in login view.	2016-02-16 09:06:01 +01:00
Jenkins for ownCloud	e219eebaa0	[tx-robot] updated from transifex	2016-02-16 01:13:36 -05:00
Andy Scherzinger	3fa2d292bb	fixed ic_refresh icon work with 24dp origial grey600 version	2016-02-15 17:34:45 +01:00
David A. Velasco	82b0b7a84f	Merge branch 'master' into reliable_uploads_actions_uploads_view	2016-02-15 14:59:04 +01:00
Juan Carlos González Cabrero	9fe62d15ea	Refresh listview when clear failed/finished uploads clicked	2016-02-15 10:58:53 +01:00
Andy Scherzinger	86369e79fc	again format fixes	2016-02-15 09:31:52 +01:00
Andy Scherzinger	e551c1f466	fixed list identation	2016-02-15 09:30:41 +01:00
Andy Scherzinger	fb3d9cb005	nicer gradle wrapper ref	2016-02-15 09:22:26 +01:00
Andy Scherzinger	44df5b21f4	fixed merge conflicts	2016-02-15 09:18:15 +01:00
Jenkins for ownCloud	5f15321445	[tx-robot] updated from transifex	2016-02-15 01:13:39 -05:00
Jenkins for ownCloud	d31c2ada3b	[tx-robot] updated from transifex	2016-02-14 01:13:33 -05:00
Jenkins for ownCloud	5800ab977e	[tx-robot] updated from transifex	2016-02-13 01:13:37 -05:00
David A. Velasco	53df867a3c	Removed dependency on org.apache.http.legacy.jar	2016-02-12 13:32:57 +01:00
Andy Scherzinger	bc4de91e93	material style play icon added	2016-02-12 12:50:00 +01:00
Andy Scherzinger	9bdfc304c6	Move to NotificationCompat.Builder to create/replace notification (done for Android M compatibility @ compile target)	2016-02-12 12:39:46 +01:00
Andy Scherzinger	f85640527e	use API for coloring	2016-02-12 12:31:59 +01:00
Andy Scherzinger	999ad9f355	refactored permission handling to separate class	2016-02-12 12:31:59 +01:00
Andy Scherzinger	55b4952687	fixed snackbar coloring of the action button	2016-02-12 12:29:05 +01:00
Andy Scherzinger	9d9bc6958b	changes color of the OK button and the text	2016-02-12 12:29:05 +01:00