2374 commits

Author	SHA1	Message	Date
David A. Velasco	d93397a58f	Changes from my own CR	2016-03-04 12:51:39 +01:00
David A. Velasco	5707fce666	Fixed crash due to lifecycle of registered SyncBroadcastReceiver	2016-03-04 11:46:12 +01:00
tobiasKaminsky	3ce879be24	according to CR	2016-02-05 17:27:35 +01:00
tobiasKaminsky	0e89c1f01b	solved bug	2016-02-02 21:13:41 +01:00
tobiasKaminsky	da0d98629c	Merge remote-tracking branch 'remotes/upstream/master' into uploadShowsFiles_Master	2016-02-02 21:05:16 +01:00
David A. Velasco	831de4534e	Merge pull request #1296 from owncloud/bug_1251 ... Don't allow to remove passcode without entering it, nor set it incomplete	2016-02-01 12:52:36 +01:00
David A. Velasco	a4e336acc2	Removed automatic back-browse; error codes from server do not distinguish between excess of permissions, removed share or removed file	2016-01-27 13:13:23 +01:00
David A. Velasco	c9017a2b0a	Fixed operation of app after SAML expired sessions while editing share permissions	2016-01-27 11:09:24 +01:00
David A. Velasco	2681f8c22b	Improved navigation after errors due to removal of shares, files or users from a separate client	2016-01-25 11:08:28 +01:00
David A. Velasco	6ac53bc1ba	Grant that UI is correctly refreshed on rotations	2016-01-25 09:42:02 +01:00
David A. Velasco	2f1084012f	Tweaked UI behaviour for resharing folders with partial edit permissions	2016-01-25 08:25:24 +01:00
tobiasKaminsky	1023aa1eba	update todo	2016-01-24 08:39:10 +01:00
tobiasKaminsky	cc637a61c6	add lastMod	2016-01-24 08:33:36 +01:00
Andy Scherzinger	cc8df75355	fix NPR (Uploader doesn't have a progressbar, so we can't set a status for it (!)	2016-01-22 22:16:03 +01:00
David A. Velasco	628e713268	Update model changed: permission updates are requested to the server as soon as the user changes any value	2016-01-20 18:18:14 +01:00
David A. Velasco	0d4c9b9961	Show error message from server when update of permissions fail	2016-01-20 12:22:24 +01:00
David A. Velasco	83092452a2	Dynamic retrieval of maximum permissions allowed to reshare is not trustful - removed	2016-01-20 11:57:53 +01:00
David A. Velasco	3b4b8ceadd	Dinamycally find out the maximum permissions to reshare	2016-01-18 14:08:38 +01:00
Andy Scherzinger	341abcd358	move to progress bar instead of unsupported legacy Indeterminate platform calls	2016-01-12 23:08:06 +01:00
David A. Velasco	e7901656a1	Polish UI to edit permissions	2016-01-11 15:34:41 +01:00
David A. Velasco	bba66e773d	Reset state of check boxes if update of privileges fails	2016-01-11 12:17:46 +01:00
David A. Velasco	6f5d09ada2	Update share permissions when 'DONE' button is clicked	2016-01-11 12:17:45 +01:00
David A. Velasco	d826451e2d	Added buttons to unshare (working) and finish (not working) in EditShareFragment layout	2016-01-11 12:17:11 +01:00
David A. Velasco	5fcb70beee	Added fragment to edit share permissions with basic layout	2016-01-11 12:17:08 +01:00
tobiasKaminsky	021fe9d14b	changes according to CR	2016-01-10 20:17:21 +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
tobiasKaminsky	323bef93a9	change due to merge	2015-12-31 13:33:46 +01:00
tobiasKaminsky	b2ae3fa467	Merge remote-tracking branch 'remotes/upstream/master' into uploadShowsFiles	2015-12-31 13:26:36 +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
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
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
masensio	a7304351b1	Fix issue 1319: Error on the preview, Android 4.1.2	2015-12-01 16:08:01 +01:00
David A. Velasco	d1a06c2dd3	Prevent that repeated requests to FileDownloader/FileUploader/SyncFolderHandler get to the worker thread	2015-12-01 13:20:50 +01:00
Andy Scherzinger	4f7d416b81	BugFix for #1312 - setting ListPreference selection on pre kitkat	2015-11-30 14:22:52 +01:00
tobiasKaminsky	5d77cfc62d	fix 1313	2015-11-27 17:11:13 +01:00