2087 commits

Author	SHA1	Message	Date
David A. Velasco	259c94a45b	Merge branch 'master' into reliable_uploads_actions_uploads_view	2016-03-15 09:48:12 +01:00
David A. Velasco	09e1f443fc	Window brackground color defined indirectly	2016-03-15 08:53:44 +01:00
Jenkins for ownCloud	787adbdc30	[tx-robot] updated from transifex	2016-03-15 01:13:43 -04:00
Andy Scherzinger	0d8f9cdc2e	issue #1426 - Background color should be white everywhere	2016-03-14 16:16:59 +01:00
Andy Scherzinger	1df0587ce3	fixed alignment of upload list elements	2016-03-14 16:11:45 +01:00
Jenkins for ownCloud	6241e5712d	[tx-robot] updated from transifex	2016-03-12 01:13:44 -05:00
Jenkins for ownCloud	6b00ca7d0d	[tx-robot] updated from transifex	2016-03-10 01:13:46 -05:00
Thomas Müller	ea2fe8cb4e	Merge pull request #1399 from owncloud/uploadShowsFiles_Master ... Upload shows files	2016-03-09 13:10:53 +01:00
David A. Velasco	b2c81d3b08	Merge pull request #1100 from owncloud/material_fab ... Material FAB with speed dial implementation	2016-03-09 08:38:33 +01:00
Jenkins for ownCloud	2b04879c38	[tx-robot] updated from transifex	2016-03-09 01:13:45 -05:00
David A. Velasco	0117123335	Set same color for normal state of FAB and 'primary buttons'	2016-03-08 17:11:59 +01:00
David A. Velasco	ec9b705536	Wording and padding fixes in uploads list	2016-03-08 13:17:55 +01:00
Jenkins for ownCloud	1fb4ccf85b	[tx-robot] updated from transifex	2016-03-08 01:13:42 -05:00
Jenkins for ownCloud	47cff3c5c9	[tx-robot] updated from transifex	2016-03-07 01:13:41 -05:00
Jenkins for ownCloud	ee28eae263	[tx-robot] updated from transifex	2016-03-05 01:13:47 -05:00
David A. Velasco	beb10a91cd	Uploads over settings in navigation drawer	2016-03-03 13:00:32 +01:00
Andy Scherzinger	6c83af4521	using color_accent instead of internal owncloud color reference	2016-03-02 11:36:45 +01:00
Jenkins for ownCloud	624c40685a	[tx-robot] updated from transifex	2016-03-02 01:13:47 -05:00
Andy Scherzinger	2d0fc03ef0	remove divider according to #1428	2016-03-01 15:37:32 +01:00
Jenkins for ownCloud	1af1a4d0b6	[tx-robot] updated from transifex	2016-03-01 01:13:44 -05:00
Jenkins for ownCloud	872a2509e4	[tx-robot] updated from transifex	2016-02-29 01:13:33 -05:00
Jenkins for ownCloud	4d40ab45a7	[tx-robot] updated from transifex	2016-02-28 01:13:36 -05:00
Jenkins for ownCloud	3d32c36e07	[tx-robot] updated from transifex	2016-02-27 01:13:44 -05:00
masensio	573d94453b	Delete context menu in UploadListFragment	2016-02-26 14:34:41 +01:00
masensio	8006c893f9	Clean code, from uploads view implementation	2016-02-26 14:15:42 +01:00
Jenkins for ownCloud	9a6e371368	[tx-robot] updated from transifex	2016-02-26 01:13:46 -05:00
Bartosz Przybylski	b6b830e722	Revert incorrect merge decision	2016-02-25 18:24:56 +01:00
Andy Scherzinger	8bf7c22ad7	fix for scrolling beyond the fab see #1346	2016-02-25 18:15:01 +01:00
Andy Scherzinger	5e9bf598f3	force all menu items into the overflow menu (see discussion https://github.com/owncloud/android/issues/1232#issuecomment-153075076)	2016-02-25 18:15:00 +01:00
Andy Scherzinger	d4ce0d920f	hide FAB in copy/move folder chooser	2016-02-25 18:07:49 +01:00
Andy Scherzinger	8d23bdcf9f	added accents color definition on missed out top level theme definitions.	2016-02-25 18:07:42 +01:00
Andy Scherzinger	3d7985b084	minor refresh button fixes	2016-02-25 18:07:42 +01:00
Andy Scherzinger	be421ce04d	don't show labels all the time just during the first usage and application lifecycle. When the app is restarted the labels then won't show again.	2016-02-25 18:07:42 +01:00
Andy Scherzinger	d7ff626db3	added sorting icon from material, spring cleaning in lower resolution icons and obsolete Android versions	2016-02-25 18:07:29 +01:00
Andy Scherzinger	e8c64ebf8d	initial implementaion for click events + using the import icon for upload from other apps, also fixed the checkboxes for hdpi/mdpi	2016-02-25 18:07:28 +01:00
Andy Scherzinger	b1dd299cdb	coloer changes for #1132	2016-02-25 18:07:11 +01:00
Andy Scherzinger	e0bacfaaea	initial implementation of the FAB with Speed Dial	2016-02-25 18:07:11 +01:00
Juan Carlos González Cabrero	a506014d58	Checking of local file when an upload retry is requested	2016-02-24 10:41:50 +01:00
David A. Velasco	d2940f6214	Used OC trashbin icon in uploads view	2016-02-24 10:11:54 +01:00
Jenkins for ownCloud	674095a911	[tx-robot] updated from transifex	2016-02-24 01:13:33 -05:00
Jenkins for ownCloud	4b20242ee7	[tx-robot] updated from transifex	2016-02-23 01:13:44 -05:00
Juan Carlos González Cabrero	87076468da	New resolution for ic_cancel icon	2016-02-22 14:09:56 +01:00
David A. Velasco	286dc8fafd	Merge branch 'master' into reliable_uploads_actions_uploads_view	2016-02-22 10:21:46 +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	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
Jenkins for ownCloud	5828ec35b8	[tx-robot] updated from transifex	2016-02-19 01:13:36 -05:00
Jenkins for ownCloud	79c7cc86bc	[tx-robot] updated from transifex	2016-02-18 01:13:43 -05:00
Jenkins for ownCloud	e12734c551	[tx-robot] updated from transifex	2016-02-17 01:13:47 -05: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
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
Andy Scherzinger	bc4de91e93	material style play icon added	2016-02-12 12:50:00 +01:00
Andy Scherzinger	9d9bc6958b	changes color of the OK button and the text	2016-02-12 12:29:05 +01:00
Andy Scherzinger	cbf134a6e2	move strings to resource file	2016-02-12 12:29:05 +01:00
Jenkins for ownCloud	dfb8df1201	[tx-robot] updated from transifex	2016-02-12 01:13:35 -05:00
Jenkins for ownCloud	986b2c7b2b	[tx-robot] updated from transifex	2016-02-11 01:13:41 -05:00
David A. Velasco	7366dbff09	Update branch master with released code for version 1.9.1	2016-02-10 11:35:07 +01:00
Jenkins for ownCloud	e224125ae0	[tx-robot] updated from transifex	2016-02-10 01:13:36 -05:00
David A. Velasco	3885db5013	Positive button of remove dialog(s) changed to 'Yes'	2016-02-09 08:59:35 +01:00
Jenkins for ownCloud	62b13a6be9	[tx-robot] updated from transifex	2016-02-09 01:13:38 -05:00
Jenkins for ownCloud	f52e182971	[tx-robot] updated from transifex	2016-02-08 01:13:30 -05:00
Jenkins for ownCloud	27bcedfc72	[tx-robot] updated from transifex	2016-02-07 01:13:37 -05:00
Jenkins for ownCloud	35286be480	[tx-robot] updated from transifex	2016-02-06 01:13:35 -05:00
Jenkins for ownCloud	ff9862badd	[tx-robot] updated from transifex	2016-02-05 01:13:37 -05:00
David A. Velasco	6eca835d1d	Renamed scaring 'delete account' to 'remove account'	2016-02-04 14:51:54 +01:00
David A. Velasco	008153a541	Changed text color of secondary buttons to black	2016-02-04 14:51:54 +01:00
David A. Velasco	7931c321f2	Merge pull request #1461 from owncloud/manage_space_activity ... Added own Activity to manage space instead of default "Clear data" button in device settings	2016-02-04 14:50:53 +01:00
Jenkins for ownCloud	9bfaaf3b8b	[tx-robot] updated from transifex	2016-02-04 01:13:37 -05:00
David A. Velasco	a827cfa791	Merge pull request #1314 from owncloud/prefDetails ... Renamed "security" category to "details" in app settings, for further use	2016-02-03 17:51:13 +01:00
masensio	9fd38ca0dd	Changes from comments in Code Review: staring and NPE	2016-02-03 16:03:10 +01:00
masensio	dc2fdb9744	Changes from comments in Code Review: Strings and minor things	2016-02-03 14:28:12 +01:00
masensio	14530aa7b8	Changes from comments in PR Code Review	2016-02-03 13:45:53 +01:00
masensio	3d623ca911	Review string manage_space_description	2016-02-03 13:37:47 +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
Jenkins for ownCloud	c8dcf8b7ac	[tx-robot] updated from transifex	2016-02-03 01:13:37 -05:00
tobiasKaminsky	da0d98629c	Merge remote-tracking branch 'remotes/upstream/master' into uploadShowsFiles_Master	2016-02-02 21:05:16 +01:00
tobiasKaminsky	5b7f44e0f7	renamed security category to details for further use ... moved position	2016-02-02 17:45:01 +01:00
David A. Velasco	9761b34c76	Merge pull request #1439 from owncloud/wording-fixes ... Wording fixes, simplify some strings and fix capitalization	2016-02-02 17:33:25 +01:00
Jenkins for ownCloud	9c18126bf0	[tx-robot] updated from transifex	2016-02-02 01:13:41 -05:00
Jenkins for ownCloud	3951b2db95	[tx-robot] updated from transifex	2016-02-01 01:13:31 -05:00
Jenkins for ownCloud	73d327a407	[tx-robot] updated from transifex	2016-01-31 01:13:30 -05:00
Jenkins for ownCloud	52d043be21	[tx-robot] updated from transifex	2016-01-30 01:13:40 -05:00
Jenkins for ownCloud	2795750c55	[tx-robot] updated from transifex	2016-01-29 01:13:33 -05:00
Jenkins for ownCloud	8bf14931b0	[tx-robot] updated from transifex	2016-01-28 01:13:39 -05:00
masensio	9c57aafab5	Review appereance of Uploads View	2016-01-27 13:59:51 +01:00
Maria Asensio	2e074864a2	Merge pull request #1451 from owncloud/share__edit_privileges ... Share edit privileges	2016-01-27 11:28:16 +01:00
masensio	44f2894731	Checking Uploads with the same name	2016-01-26 17:53:13 +01:00
masensio	2f231561af	Checking Priviledges Error failed uploads	2016-01-25 15:20:50 +01:00
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
Jenkins for ownCloud	f1fcab8e18	[tx-robot] updated from transifex	2016-01-24 01:13:30 -05:00
Jenkins for ownCloud	2818c41641	[tx-robot] updated from transifex	2016-01-23 01:13:36 -05:00
Jenkins for ownCloud	6a72d01d0e	[tx-robot] updated from transifex	2016-01-22 01:13:32 -05:00
masensio	f11646bc6e	Review ic_refresh dimensions	2016-01-21 09:29:58 +01:00
Jenkins for ownCloud	e909f8b625	[tx-robot] updated from transifex	2016-01-21 01:13:38 -05:00
masensio	814a70f6a3	Update refresh icon in uploads view	2016-01-20 18:41:52 +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
masensio	b353ed62cd	Show thumbnail or file icon depending on the file type in Uploads view	2016-01-20 18:06:35 +01:00
David A. Velasco	0d4c9b9961	Show error message from server when update of permissions fail	2016-01-20 12:22:24 +01:00
masensio	2c4daf3a93	Update the status of current upload when it finishes	2016-01-20 11:19:43 +01:00
Jenkins for ownCloud	e3d882b386	[tx-robot] updated from transifex	2016-01-20 01:13:33 -05:00
masensio	6f58527273	Update progress bar for Current Upload	2016-01-19 17:32:50 +01:00
Jenkins for ownCloud	9c59c5fb4c	[tx-robot] updated from transifex	2016-01-19 01:13:40 -05:00
Jan-Christoph Borchardt	61a1d97abc	wording fixes, simplify some strings and fix capitalization	2016-01-18 15:10:50 +01:00
Jenkins for ownCloud	98229db831	[tx-robot] updated from transifex	2016-01-18 01:13:31 -05:00
Jenkins for ownCloud	a5aa573594	[tx-robot] updated from transifex	2016-01-17 01:13:33 -05:00
Jenkins for ownCloud	81494e6246	[tx-robot] updated from transifex	2016-01-15 01:13:37 -05:00
Jenkins for ownCloud	13f8ed9d39	[tx-robot] updated from transifex	2016-01-14 01:13:41 -05:00
David A. Velasco	81b8918939	Fixed color of 'stop sharing' button in Android 4.x	2016-01-13 14:23:50 +01:00
David A. Velasco	e4078a5734	Added scroll to permissions editor to grant usability in landscape	2016-01-13 13:43:07 +01:00
Jenkins for ownCloud	6165134f60	[tx-robot] updated from transifex	2016-01-13 01:13:43 -05:00
masensio	990f16ca47	Add drawe access from uploads view	2016-01-12 14:16:22 +01:00
David A. Velasco	e7901656a1	Polish UI to edit permissions	2016-01-11 15:34:41 +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
Jenkins for ownCloud	d8dca7243d	[tx-robot] updated from transifex	2016-01-11 01:13:42 -05:00
tobiasKaminsky	021fe9d14b	changes according to CR	2016-01-10 20:17:21 +01:00
Jenkins for ownCloud	233a881765	[tx-robot] updated from transifex	2016-01-10 01:13:46 -05:00
Jenkins for ownCloud	c371aa5b00	[tx-robot] updated from transifex	2016-01-09 01:13:44 -05:00
masensio	2181239c6d	Merge branch 'master' into reliable_uploads_actions_uploads_view	2016-01-08 11:21:23 +01:00
Maria Asensio	ab7b3c09c3	Merge pull request #1099 from owncloud/switchListVsGrid ... Switch list vs grid	2016-01-08 10:18:00 +01:00
Jenkins for ownCloud	f97d57283b	[tx-robot] updated from transifex	2016-01-08 01:13:42 -05:00
Jenkins for ownCloud	73b58324a8	[tx-robot] updated from transifex	2016-01-07 01:13:44 -05:00
Jenkins for ownCloud	804be08c1b	[tx-robot] updated from transifex	2016-01-06 01:13:42 -05:00
David A. Velasco	d26da3cbc2	Recovered changes lost in complex rebase	2016-01-05 12:12:18 +01:00
tobiasKaminsky	d7e9ef92b8	fixed according to review	2016-01-05 11:50:00 +01:00
tobiasKaminsky	2586298380	moved switch menu item to three dots menu	2016-01-05 11:21:37 +01:00
tobiasKaminsky	6bd7065c73	wip	2016-01-05 11:16:00 +01:00
Jenkins for ownCloud	1fbcd81bd4	[tx-robot] updated from transifex	2016-01-05 01:13:48 -05:00
Jenkins for ownCloud	bc9a890b6f	[tx-robot] updated from transifex	2016-01-04 01:13:42 -05:00
Jenkins for ownCloud	d75f615031	[tx-robot] updated from transifex	2016-01-01 01:13:43 -05:00
tobiasKaminsky	b2ae3fa467	Merge remote-tracking branch 'remotes/upstream/master' into uploadShowsFiles	2015-12-31 13:26:36 +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
Maria Asensio	9954f71408	Merge pull request #1351 from owncloud/Update_of_brandable_colors ... Added colors for header of navigation drawer and login button to the …	2015-12-28 14:17:05 +01:00
masensio	eee7ea369d	Merge branch 'master' into reliable_uploads_actions_uploads_view	2015-12-28 10:13:38 +01:00
Jenkins for ownCloud	ca03f14752	[tx-robot] updated from transifex	2015-12-28 01:13:40 -05:00
Jenkins for ownCloud	f137759e6b	[tx-robot] updated from transifex	2015-12-25 01:13:46 -05:00
Jenkins for ownCloud	30a4201b33	[tx-robot] updated from transifex	2015-12-23 01:45:19 -05:00
David A. Velasco	bd1f6452ac	Make button colours easy to brand	2015-12-22 17:22:24 +01:00
Jenkins for ownCloud	3182a9e00f	[tx-robot] updated from transifex	2015-12-19 01:13:41 -05:00
David A. Velasco	dee7c33235	Added style to buttons in share_file_layout and centered refresh button in account_setup	2015-12-17 16:58:47 +01:00
David A. Velasco	d5c4d7ab92	Changes from code review	2015-12-17 15:49:55 +01:00
Jenkins for ownCloud	669ebe083c	[tx-robot] updated from transifex	2015-12-17 01:13:44 -05:00
David A. Velasco	147e6989c8	Added colors for header of navigation drawer and login button to the list of brandable colors	2015-12-14 12:50:52 +01:00
Jenkins for ownCloud	dadf31f522	[tx-robot] updated from transifex	2015-12-13 01:13:30 -05:00
Jenkins for ownCloud	27bc03b6de	[tx-robot] updated from transifex	2015-12-12 01:13:40 -05:00
masensio	ade956dd7b	Merge branch 'master' into reliable_uploads_actions_uploads_view	2015-12-11 09:50:36 +01:00
masensio	a840e67a68	Add 'Uploads' option into NavigationDrawer	2015-12-11 08:43:33 +01:00
Jenkins for ownCloud	8855855a52	[tx-robot] updated from transifex	2015-12-11 01:13:40 -05: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
Jenkins for ownCloud	3e25c84863	[tx-robot] updated from transifex	2015-12-10 01:13:44 -05: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
Jenkins for ownCloud	2f7690879a	[tx-robot] updated from transifex	2015-12-08 01:13:37 -05:00
Jenkins for ownCloud	d696f10e06	[tx-robot] updated from transifex	2015-12-07 01:13:29 -05:00
Jenkins for ownCloud	106a2324e1	[tx-robot] updated from transifex	2015-12-06 01:13:29 -05:00
Jenkins for ownCloud	2e9c4ed217	[tx-robot] updated from transifex	2015-12-05 01:13:42 -05:00
Jenkins for ownCloud	d44f2a3a10	[tx-robot] updated from transifex	2015-12-04 01:13:39 -05:00
masensio	59442c80ea	Update string	2015-12-03 12:58:22 +01:00
Jenkins for ownCloud	db2256765d	[tx-robot] updated from transifex	2015-12-03 01:13:40 -05:00
Jenkins for ownCloud	872e32475b	[tx-robot] updated from transifex	2015-12-02 01:13:53 -05:00
tobiasKaminsky	04fc2e3cc2	changed according to latest discussion	2015-12-01 22:00:53 +01:00
Jenkins for ownCloud	eb5a24d25c	[tx-robot] updated from transifex	2015-12-01 01:13:42 -05:00
Jenkins for ownCloud	6f04c58f59	[tx-robot] updated from transifex	2015-11-30 01:13:52 -05:00
Jenkins for ownCloud	82fd5e47e2	[tx-robot] updated from transifex	2015-11-29 01:13:42 -05:00
Jenkins for ownCloud	248aaf4bf0	[tx-robot] updated from transifex	2015-11-28 01:13:42 -05:00
Jenkins for ownCloud	c173743870	[tx-robot] updated from transifex	2015-11-27 01:13:44 -05:00
Jenkins for ownCloud	70f59f6ad9	[tx-robot] updated from transifex	2015-11-26 01:13:44 -05:00
David A. Velasco	f5369ac4b2	Hide UI elements about public share when this is disabled in the server	2015-11-25 09:32:31 +01:00
masensio	3087a3af3e	Review padding values for expiration date and password rows in share view	2015-11-25 09:32:28 +01:00
masensio	030eaffcfc	List view is shown completelly on the ShareFileFragment	2015-11-25 09:32:27 +01:00
masensio	e08513a762	Delete any rest of old public share/unshare flow	2015-11-25 09:32:26 +01:00
David A. Velasco	729a9b7c77	Set or clear password to protect public link in ShareFileFragment	2015-11-25 09:32:19 +01:00
David A. Velasco	f1b3208f1a	Updated ShareFileFragment layout with extra section for public shares	2015-11-25 09:32:15 +01:00
David A. Velasco	a39c857680	Removed unneeded FrameLayout	2015-11-25 09:32:14 +01:00
Jenkins for ownCloud	d60023867c	[tx-robot] updated from transifex	2015-11-25 01:13:40 -05:00
Jenkins for ownCloud	83e2bd588d	[tx-robot] updated from transifex	2015-11-24 01:13:40 -05:00
Jenkins for ownCloud	d244d558e3	[tx-robot] updated from transifex	2015-11-23 01:13:32 -05:00
Andy Scherzinger	ecdb95fa0c	Merge branch 'master' of https://github.com/owncloud/android into material_buttons	2015-11-22 17:10:37 +01:00
Jenkins for ownCloud	bbfa65cba6	[tx-robot] updated from transifex	2015-11-22 01:13:39 -05:00
tobiasKaminsky	2aac1e5270	Merge remote-tracking branch 'remotes/upstream/master' into avoidDuplicateFiles_Master	2015-11-21 08:48:40 +01:00
Jenkins for ownCloud	f8f99af255	[tx-robot] updated from transifex	2015-11-21 01:13:37 -05:00
Jenkins for ownCloud	76bfd8d452	[tx-robot] updated from transifex	2015-11-20 01:13:34 -05:00
Jenkins for ownCloud	05232de750	[tx-robot] updated from transifex	2015-11-19 01:13:47 -05:00
Jenkins for ownCloud	8331456825	[tx-robot] updated from transifex	2015-11-13 01:13:44 -05:00
Jenkins for ownCloud	adfe21b886	[tx-robot] updated from transifex	2015-11-11 01:13:45 -05:00
Jenkins for ownCloud	c229790208	[tx-robot] updated from transifex	2015-11-10 01:13:45 -05:00
Jenkins for ownCloud	c386801013	[tx-robot] updated from transifex	2015-11-09 01:13:41 -05:00
Jenkins for ownCloud	11be7f0f54	[tx-robot] updated from transifex	2015-11-08 01:13:44 -05:00
Jenkins for ownCloud	48b35330f1	[tx-robot] updated from transifex	2015-11-07 01:13:50 -05:00
Andy Scherzinger	c31f602fd1	Merge branch 'master' of https://github.com/owncloud/android into material_buttons ... Conflicts: res/layout/list_item.xml	2015-11-06 11:38:51 +01:00
Maria Asensio	19cce9c90f	Merge pull request #1184 from Wikinaut/show-certificate-digest ... fix #1024 show cert fingerprints when adding new account w/ untrusted certificate	2015-11-06 11:23:30 +01:00
Jenkins for ownCloud	bf53dfb3af	[tx-robot] updated from transifex	2015-11-06 01:14:02 -05:00
Maria Asensio	7e96305668	Merge pull request #1252 from owncloud/share_with_users ... Share with users & groups	2015-11-05 13:19:24 +01:00
David A. Velasco	b985935f22	Removed spurious file	2015-11-05 10:24:38 +01:00
Jenkins for ownCloud	94b21ef5d9	[tx-robot] updated from transifex	2015-11-05 01:13:44 -05:00
Andy Scherzinger	f7fe0e00de	moved back to #eee for the divider coloring since the coloring hasn't worked yet for the standard list views, see discussion #1232	2015-11-04 10:51:43 +01:00
Jenkins for ownCloud	62287458b8	[tx-robot] updated from transifex	2015-11-04 01:13:47 -05:00
Jenkins for ownCloud	653a812684	[tx-robot] updated from transifex	2015-11-03 01:13:49 -05:00
Andy Scherzinger	2cfc7237ea	correct text field names	2015-11-02 15:26:00 +01:00
Andy Scherzinger	838aaff224	change devider color to #f8f8f8	2015-11-02 15:25:43 +01:00
Andy Scherzinger	90097b107d	typos fixed	2015-11-02 12:22:49 +01:00
Andy Scherzinger	efdcb97963	setting divider color to #eee as decided by @jancborchardt	2015-11-02 12:05:52 +01:00
Andy Scherzinger	f72289f7bf	Merge branch 'master' of https://github.com/owncloud/android into material_buttons	2015-11-02 08:41:51 +01:00
Andy Scherzinger	6e54dfc55c	flipped size and mod date	2015-11-02 08:40:18 +01:00
Jenkins for ownCloud	2f237fb0cc	[tx-robot] updated from transifex	2015-11-02 01:13:44 -05:00
Jenkins for ownCloud	f817e49515	[tx-robot] updated from transifex	2015-11-01 01:13:47 -04:00
Jenkins for ownCloud	bba2964726	[tx-robot] updated from transifex	2015-10-31 01:13:54 -04:00
masensio	f1bd33ce00	Fix: Having the device in landscape current shared users are not shown. Redimension 'Share with' dialog	2015-10-30 16:53:06 +01:00
masensio	d1294ca584	Good behaviiour in servers not supporting SHAREE API: show the menu option and a messsage when try to share with a new user/group	2015-10-30 16:50:49 +01:00
masensio	f8548b49f1	Delete search_user_item.xml	2015-10-30 16:48:33 +01:00
masensio	671fef617b	Show users/groups in Search Fragment list	2015-10-30 16:48:31 +01:00
masensio	b3dc5f477c	Show 'Add Users or Groups' button properly	2015-10-30 16:47:31 +01:00
David A. Velasco	33a9d1f447	Get rid of dependency on Context in CreateShareOperation	2015-10-30 16:41:59 +01:00
masensio	fcdef568ea	Remove share_group_indicator string	2015-10-30 16:39:23 +01:00
masensio	ceffbc4aa8	Remove unshare with users/groups option from the menu	2015-10-30 16:39:21 +01:00
David A. Velasco	305536f8c2	Users and groups retrieved from server to fill search suggestions	2015-10-30 16:31:08 +01:00
masensio	1fbc44b574	Add new string for share_groups_indicator	2015-10-30 16:28:41 +01:00
masensio	fff362d103	Add unshare with user option to share with view	2015-10-30 16:28:37 +01:00
David A. Velasco	e3d509a451	Complete search widget to send search requests to parent activity	2015-10-30 16:28:35 +01:00
masensio	20b0ec8977	Show users/groups in share with view, getting the data from the server	2015-10-30 16:26:26 +01:00
masensio	88eca70dbf	fix Travis	2015-10-30 16:25:55 +01:00
masensio	00a221ea8f	Remove android.support.widget components from the sharewith view. Waiting for introducing Floating button in the project	2015-10-30 16:25:54 +01:00
David A. Velasco	0db4fc9b17	Sync user and group shares into database	2015-10-30 16:25:52 +01:00
masensio	905b68b4ec	Show the 'search' layout in phone and tablet	2015-10-30 15:23:03 +01:00
David A. Velasco	bc5687b74a	Changed title in sharing dialog from 'Share link' to 'Sharing' (seen in web UI)	2015-10-30 15:23:00 +01:00
masensio	2855a81cf0	Create the layout for searching users/groups	2015-10-30 15:22:58 +01:00
masensio	c6c5b732c7	Add get list of users in the library	2015-10-30 15:22:12 +01:00
masensio	f28faf0c26	Show the layout to hsare with user in phone and tablet	2015-10-30 15:21:48 +01:00
masensio	8e3d7bdc8f	Create the layout to share with a user	2015-10-30 15:10:42 +01:00
masensio	3a527a8fe4	Add 'Share with users/groups' to long press menu	2015-10-30 15:04:34 +01:00
Maria Asensio	eaa0612bfa	Merge pull request #1109 from owncloud/sync_full_folder ... Replaced 'download folder' with 'synchronize', triggering the synchronization in two-ways of all the files in a folder	2015-10-30 14:14:52 +01:00
Jenkins for ownCloud	720c49136a	[tx-robot] updated from transifex	2015-10-30 01:13:47 -04:00
Jenkins for ownCloud	00c6d8bffe	[tx-robot] updated from transifex	2015-10-29 01:13:42 -04:00
masensio	b9ef747a0b	Merge branch 'master' into sync_full_folder ... Conflicts: owncloud-android-library src/com/owncloud/android/files/services/FileUploader.java	2015-10-27 08:52:17 +01:00
Jenkins for ownCloud	3918ec18a8	[tx-robot] updated from transifex	2015-10-27 01:13:47 -04:00
Andy Scherzinger	2603a35105	Merge branch 'master' of https://github.com/owncloud/android into material_buttons	2015-10-26 13:57:04 +01:00
Jenkins for ownCloud	2702951056	[tx-robot] updated from transifex	2015-10-23 01:13:41 -04:00
Andy Scherzinger	5c1e6e59ba	Merge branch 'master' of https://github.com/owncloud/android into material_buttons	2015-10-22 13:05:06 +02:00