305 commits

Author	SHA1	Message	Date
Andy Scherzinger	8c15fb5075	prepare 1.3.1	2016-09-20 19:02:15 +02:00
tobiasKaminsky	5472396e23	fixed version numbering	2016-09-17 15:59:07 +02:00
Andy Scherzinger	8bcd7e0b8c	1.3.0 RC2 versioning	2016-09-08 10:29:59 +02:00
tobiasKaminsky	a24f89be16	wip	2016-09-06 17:25:57 +02:00
Andy Scherzinger	ffa3d15088	RC1 versioning	2016-09-06 14:24:05 +02:00
tobiasKaminsky	ac695b7444	fix sharing for beta	2016-07-30 18:38:21 +02:00
tobiasKaminsky	9587af3e9d	Merge remote-tracking branch 'remotes/origin/master' into uploadWhenCharging	2016-07-30 16:56:44 +02:00
Andy Scherzinger	871ce5307b	1.2.0 release preparation	2016-07-27 09:12:31 +02:00
Andy Scherzinger	7d0e65f109	1.2.0 RC2 preparations	2016-07-22 19:01:30 +02:00
Andy Scherzinger	40788c7b5d	1.2.0 RC1 preparations	2016-07-21 13:27:28 +02:00
Bartosz Przybylski	a4d30e88e5	update authority to match authority in java files	2016-07-17 23:38:36 +02:00
Bartosz Przybylski	a4900f9bfa	Add authorities prefixes to providers	2016-07-15 00:42:33 +02:00
Andy Scherzinger	198b1ce8c6	Final release updates	2016-07-04 18:07:00 +02:00
Andy Scherzinger	f63b66cde6	1.1.0 RC2 preparation	2016-07-02 18:48:00 +02:00
tobiasKaminsky	01ab992c25	revert code removing	2016-07-02 18:24:43 +02:00
tobiasKaminsky	750ae62381	fix manage space activity	2016-07-02 18:24:43 +02:00
Andy Scherzinger	6c685a8307	correct version number for 1.1.0-RC1 --> 10010001	2016-06-27 19:56:31 +02:00
Andy Scherzinger	9dc9441aae	RC 1.1.0 preparation	2016-06-27 19:51:54 +02:00
Andy Scherzinger	718fec0935	remove card view, change edit text and icon coloring	2016-06-26 22:59:28 +02:00
Andy Scherzinger	220de2fef3	fix for #41	2016-06-25 16:27:21 +02:00
Andy Scherzinger	37da1a7920	wip account management - account list changes aren't propagated back to the drawer yet, preferences haven't been cleaned up yet	2016-06-25 16:26:52 +02:00
Andy Scherzinger	ed33c0aff4	initial rewrite to make use of the toolbar	2016-06-25 16:26:44 +02:00
Bartosz Przybylski	db7a4641c2	Add documents provider	2016-06-20 22:15:02 +02:00
Andy Scherzinger	71005ab04b	version code/name for 1.0.1	2016-06-19 23:45:44 +02:00
Andy Scherzinger	20fc4b8267	revert, to show app name for upload from other app	2016-06-13 21:50:10 +02:00
Andy Scherzinger	cecab96b2f	implementation of #1193 - optimizing the uploader layout and taking user configured sorting into account	2016-06-13 21:49:57 +02:00
tobiasKaminsky	3cabd02fc0	update version to 1.0.0	2016-06-11 00:12:46 +02:00
Andy Scherzinger	91682b616c	replace launcher icon including seasonal icon removal	2016-06-09 17:52:35 +02:00
Andy Scherzinger	7208a73cce	Merge oC 'release_2.0.1' downstream	2016-06-08 15:28:16 +02:00
tobiasKaminsky	1147778794	allow nextcloud to be parallel to owncloud	2016-06-07 21:58:37 +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
jabarros	5948c1c387	Rename Uploader activity to ReceiveExternalFilesActivity	2016-05-23 13:04:31 +02:00
David A. Velasco	b14f32894b	Grant that Uploader activity is not attached to reused tasks while granting that passcode-protected Uploader is correctly shown after entering pasccode	2016-04-21 11:31:48 +02:00
David A. Velasco	43fad90ba3	Updated version number for app and JB workaround app	2016-04-21 11:31:48 +02:00
Juan Carlos González Cabrero	91c2435b4e	Change Uploader activity to exclude the backstack task from recents	2016-04-14 09:39:10 +02:00
Juan Carlos González Cabrero	9e36ae2238	Modify Uploader activity to be singleton in the activity stack, and assure finish when the upload scheme is file	2016-04-14 09:39:10 +02:00
David A. Velasco	f6ea9b597a	Merge branch 'master' into reliable_uploads_actions_uploads_view ... Conflicts FIXED in res/values/styles.xml (trivial)	2016-03-30 13:27:09 +02:00
Andy Scherzinger	d893654bc1	Fix Headline in share edit and user search	2016-03-22 13:29:23 +01:00
David A. Velasco	52d05b37d4	Enabled again 'basic' recovery of instant uploads on WiFi connection	2016-03-03 12:52:16 +01:00
David A. Velasco	366a1f7c51	Reconnect cancellation of uploads when Wifi is lost to interrupt only-wifi instant uploads	2016-02-22 14:37:36 +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	40e9bb0529	Merged FileUploadService into FileUploader to avoid that changes from other branches are circumvented	2016-02-18 09:30:35 +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	82b0b7a84f	Merge branch 'master' into reliable_uploads_actions_uploads_view	2016-02-15 14:59:04 +01:00
Andy Scherzinger	288b92c61a	marshmallow changes redone	2016-02-12 12:15:46 +01:00
David A. Velasco	0509df49ed	Version number up to 1.9.1	2016-02-04 14:51:54 +01:00
masensio	96ce49707b	Clean app data (keeping the PASSCODE untouched) from ManageSpaceActivity	2016-02-03 13:37:45 +01:00
masensio	d6653ef684	Add android:manageSpaceActivity to AndroidManifest.xml. Create empty activity ManageSpaceActivity.java	2016-02-03 13:37:43 +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
David A. Velasco	79c0171416	Removed unneeded permissions	2015-11-25 09:42:15 +01:00