2452 commits

Author	SHA1	Message	Date
masensio	29cb1277c3	Checking File Error failed uploads	2016-01-25 14:54:31 +01:00
masensio	15d5350ef6	Checking Folder Error failed uploads	2016-01-25 14:23:23 +01:00
masensio	198c1bf3b0	Checking Credential Error failed uploads: show error as Credential error and relogin	2016-01-25 13:02:22 +01:00
masensio	b6f8e93504	Checking Network Connection failed uploads	2016-01-25 10:59:53 +01:00
masensio	66ec45f633	Review behaviour of failed uploads: list in uploads view	2016-01-22 10:59:43 +01:00
masensio	814a70f6a3	Update refresh icon in uploads view	2016-01-20 18:41:52 +01:00
masensio	b353ed62cd	Show thumbnail or file icon depending on the file type in Uploads view	2016-01-20 18:06:35 +01:00
masensio	6448857a55	Fix problem with instant upload when parent folder is not created before	2016-01-20 14:24:23 +01:00
masensio	2c4daf3a93	Update the status of current upload when it finishes	2016-01-20 11:19:43 +01:00
masensio	6f58527273	Update progress bar for Current Upload	2016-01-19 17:32:50 +01:00
masensio	6a8d0383c6	Show current uploads in uploads list view. Apply code review changes, merging FileUpload + FileUploadService	2016-01-18 14:20:55 +01:00
masensio	373daff473	Third step: merging services FileUploader + FileUploadService	2016-01-15 15:03:27 +01:00
masensio	3a908b8c1d	Second step: merging services FileUploader + FileUploadService	2016-01-15 11:06:12 +01:00
masensio	92c33d932c	First step to add lastest changes in FileUploader into FileUploadService	2016-01-14 13:27:12 +01:00
masensio	2ec9899060	Show null path in uploads view	2016-01-12 18:28:22 +01:00
masensio	8c71b9ec29	Clean FileDisplayActivity: delete comments from merge conflicts and casting (Parcelable) on OCFile objects	2016-01-12 16:28:35 +01:00
masensio	990f16ca47	Add drawe access from uploads view	2016-01-12 14:16:22 +01:00
masensio	de39244b83	Fix problems with DB access after updating upload	2016-01-11 14:51:41 +01:00
masensio	2181239c6d	Merge branch 'master' into reliable_uploads_actions_uploads_view	2016-01-08 11:21:23 +01:00
David A. Velasco	ffbd118e8d	Removed calls to ApplicationContext and minor refactoring	2016-01-05 12:03:02 +01:00
David A. Velasco	4ec4b66921	Fix update of text in menu after removal of static methods	2016-01-05 12:03:00 +01:00
tobiasKaminsky	337191ff1a	minor code optimizations	2016-01-05 12:02:59 +01:00
tobiasKaminsky	45c82e4fed	removed static functions (according to CR)	2016-01-05 12:02:57 +01:00
tobiasKaminsky	9bcef74f6d	changes according to CR	2016-01-05 11:54:55 +01:00
tobiasKaminsky	cd04b0d389	do not show "switch" menu item on file details/preview text/video/audio	2016-01-05 11:50:03 +01:00
tobiasKaminsky	6920a7495e	do not show "switch" menu item on file details/preview text/video/audio	2016-01-05 11:50:02 +01:00
tobiasKaminsky	d7e9ef92b8	fixed according to review	2016-01-05 11:50:00 +01:00
tobiasKaminsky	db46b19824	decision grid vs. list view remembered per folder, inherited by parents	2016-01-05 11:20:08 +01:00
tobiasKaminsky	6bd7065c73	wip	2016-01-05 11:16:00 +01:00
masensio	aeaa422fed	Close cursors in UploadStorageManager methods	2015-12-29 13:22:31 +01:00
masensio	540d123ad5	Merge branch 'master' into reliable_uploads_actions_uploads_view	2015-12-29 12:46:45 +01:00
Andy Scherzinger	a812784ddd	Merge branch 'master' of https://github.com/owncloud/android into material_buttons ... Conflicts (resolved): res/layout/drawer.xml res/values/colors.xml res/values/setup.xml	2015-12-28 20:03:25 +01:00
Andy Scherzinger	cc2ba716fb	Merge branch 'material_buttons' of https://github.com/owncloud/android into material_buttons	2015-12-28 19:22:40 +01:00
Andy Scherzinger	dd8c65dcd9	fix for #1381	2015-12-28 19:21:05 +01:00
masensio	aca6e66d19	Optimize set for boolean parameters in UploadsStorageManager. Fix problem in Uploads DB creation method	2015-12-28 15:04:33 +01:00
masensio	eee7ea369d	Merge branch 'master' into reliable_uploads_actions_uploads_view	2015-12-28 10:13:38 +01:00
Bartosz Przybylski	3f61dc5a8a	#1338: Correctly use delayUntil property of SyncResult	2015-12-18 15:55:05 +01:00
David A. Velasco	d5c4d7ab92	Changes from code review	2015-12-17 15:49:55 +01:00
masensio	e89104b40e	Save OCFile into DB when a file is prepare to be uploaded, before uploading (WIP)	2015-12-16 09:17:35 +01:00
masensio	390e06efa8	Adapt UploadDBObject (new OCUpload) to manage uploads data	2015-12-15 13:00:38 +01:00
David A. Velasco	41f1924bb6	Access to Uploads table through ContentResolver instead of direct access as DB	2015-12-11 15:40:59 +01:00
masensio	10874aa7a7	Add new table for uploads on database	2015-12-11 14:35:45 +01:00
masensio	1a74d5ba59	Changes from comments in reliable_uploads code review	2015-12-11 11:15:53 +01:00
masensio	a840e67a68	Add 'Uploads' option into NavigationDrawer	2015-12-11 08:43:33 +01:00
masensio	a2b680edd0	Merge branch 'reliable_uploads' into reliable_uploads_actions_uploads_view	2015-12-10 17:35:32 +01:00
masensio	dc0aea30f0	Merge branch 'master' into reliable_uploads ... Conflicts: AndroidManifest.xml res/values/strings.xml src/com/owncloud/android/datamodel/OCFile.java src/com/owncloud/android/db/ProviderMeta.java src/com/owncloud/android/files/FileMenuFilter.java src/com/owncloud/android/files/FileOperationsHelper.java src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java src/com/owncloud/android/files/services/FileUploader.java src/com/owncloud/android/operations/SynchronizeFolderOperation.java src/com/owncloud/android/operations/UploadFileOperation.java src/com/owncloud/android/ui/activity/FileDisplayActivity.java src/com/owncloud/android/utils/FileStorageUtils.java	2015-12-10 17:18:52 +01:00
Andy Scherzinger	71e87d98a8	Merge branch 'master' of https://github.com/owncloud/android into material_buttons	2015-12-09 15:14:22 +01:00
Maria Asensio	896e4859c0	Merge pull request #1168 from owncloud/avoidDuplicateFiles ... Avoid duplicate files	2015-12-09 09:27:54 +01:00
tobiasKaminsky	9e678fc697	changed according to latest comments	2015-12-02 19:55:41 +01:00
tobiasKaminsky	04fc2e3cc2	changed according to latest discussion	2015-12-01 22:00:53 +01:00