62 commits

Author	SHA1	Message	Date
tobiasKaminsky	5b7f44e0f7	renamed security category to details for further use ... moved position	2016-02-02 17:45:01 +01:00
tobiasKaminsky	04fc2e3cc2	changed according to latest discussion	2015-12-01 22:00:53 +01:00
tobiasKaminsky	2aac1e5270	Merge remote-tracking branch 'remotes/upstream/master' into avoidDuplicateFiles_Master	2015-11-21 08:48:40 +01:00
David A. Velasco	305536f8c2	Users and groups retrieved from server to fill search suggestions	2015-10-30 16:31:08 +01:00
David A. Velasco	e3d509a451	Complete search widget to send search requests to parent activity	2015-10-30 16:28:35 +01:00
Andy Scherzinger	35a68aa337	custom list preference implementation for visual material consistency on pre-lollipop	2015-09-27 20:21:09 +02:00
tobiasKaminsky	19bc90bf56	default value: do nothing ... show summary for behaviour	2015-09-25 17:21:58 +02:00
tobiasKaminsky	4b8a5a9c92	#819, part 2: Instant uploads, depends on setting	2015-09-19 14:33:29 +02:00
David A. Velasco	510c00f66d	Cleaned code in PassCodeActivity	2015-05-05 00:07:24 +02:00
David A. Velasco	9593b580b7	Replaced 'PIN code' by 'pass code'	2015-05-04 11:41:09 +02:00
David A. Velasco	802a164616	Merge branch 'develop' into pinEnhancement ... Conflicts SOLVED: src/com/owncloud/android/ui/activity/FileDisplayActivity.java src/com/owncloud/android/ui/activity/Preferences.java src/com/owncloud/android/ui/activity/Uploader.java src/com/owncloud/android/ui/fragment/OCFileListFragment.java	2015-04-28 14:20:17 +02:00
masensio	0bef9fdedb	Update year in license	2015-03-05 13:27:45 +01:00
tobiasKaminsky	cb725acdf3	- removed whitespaces ... - renamed pin description	2015-01-01 13:06:25 +01:00
tobiasKaminsky	0e061f6f06	- fix #47	2014-12-29 22:36:15 +01:00
jabarros	5c0e9ca5f2	Changes after CR	2014-11-26 09:05:23 +01:00
jabarros	a2de2f28ab	Add new preference on settings for setting the upload video path	2014-11-19 10:14:27 +01:00
jabarros	87b242019c	Create custom Preference ui for truncate automatically the upload folder path in the middle when it is too long	2014-11-18 14:57:19 +01:00
jabarros	12b4b0397f	Add view for selecting upload path folder browsing through local file list in preferences view	2014-11-18 11:01:55 +01:00
jabarros	016bdfac1f	Fixed. Upload path is not place correctly in setting view	2014-10-15 08:21:23 +02:00
jabarros	1e7e893321	Merge branch 'master' of https://github.com/loripino21/android into instant_upload_path_chooseable	2014-10-06 14:58:34 +02:00
loripino21	30726d2cfa	Update preferences.xml	2014-09-23 10:09:02 +02:00
loripino21	63187c7555	Update preferences.xml	2014-09-23 10:04:54 +02:00
loripino21	b221772982	Update preferences.xml	2014-09-01 11:56:38 +02:00
jabarros	8d8c9eb315	Include 'add account' button after last account listed	2014-08-06 09:25:25 +02:00
jabarros	471d64a16c	Change the title of preference for adding new accounts and remove unused commented code	2014-08-06 09:23:21 +02:00
jabarros	8ce8577fa7	Show all the active accounts on settings view and make behaviour of accounts checkbox similar to radio buttons	2014-08-05 15:05:03 +02:00
jabarros	5cba80a1ab	Add new preference category on settings and list in it the accounts	2014-08-05 11:22:16 +02:00
David A. Velasco	68f4ceb5a7	Separate options to enable & disable instant upload of new pictures and new videos	2014-04-21 10:49:31 +02:00
masensio	6e86dfb001	OC-3376: 'manage account' field is multiline, in preferences	2014-03-18 13:36:16 +01:00
masensio	7c19578421	OC-3354: (Fix bug) In the pincode field, it the field doesn't fit, suspension points doesn't appear	2014-03-17 14:04:18 +01:00
Dominique Hazael-Massieux	59fdac1d26	using longtitle checkboxes	2014-02-13 19:08:26 +01:00
David A. Velasco	cc39a76a90	Reviewed integration with sychronization framework to fix problems in Android 4.4	2013-11-11 10:08:16 +01:00
David A. Velasco	528db9b192	Removed unused menu a preference resources, and related code	2013-10-23 16:42:48 +02:00
masensio	865940064d	Merge branch 'contact_settings' into setup_app_name	2013-10-22 13:02:41 +02:00
masensio	01dcdc0672	OC-1797: Imprint is not shown --> FIXED	2013-10-22 13:02:14 +02:00
masensio	b66e309dfa	Merge branch 'contact_settings' into setup_app_name ... Conflicts: res/values/setup.xml	2013-10-18 12:42:00 +02:00
masensio	7488345470	OC-1663: Replace references to app_name in code	2013-10-17 16:54:43 +02:00
masensio	9681b8687e	OC-1656: Disable/enable help-imprint-feedback options	2013-10-16 08:56:41 +02:00
David A. Velasco	12bffce50c	Added help link, feedback email, recommendations through email, and (disabled) imprint link to app settings	2013-07-05 10:47:34 +02:00
David A. Velasco	0f2a7475b1	Disabled logging options until fixed	2013-06-26 09:13:28 +02:00
David A. Velasco	bdc0332c23	Copyright note fixes	2013-04-17 12:26:13 +02:00
zerginator	5a22c7e79f	Cleaned stuff , add a history delete button and renamed ... Log2EmailActivity in LogHistoryActivity	2013-04-01 10:26:40 +02:00
zerginator	8e36e7cc3e	This wraps the android.util.logging into Log_OC which , if its enabled ... in the app, logs the logcat into a file. It also includes the phone information (MODEL, VERSION...) https://github.com/owncloud/android/issues/97	2013-03-12 07:56:27 +01:00
zerginator	18a715072c	moved About App into preferences ... https://github.com/owncloud/android/issues/57	2013-03-10 20:38:46 +01:00
David A. Velasco	2623e9c195	Replaced GPL v3 with GPL v2; PLEASE, note that GPL v2 still allows the code is used under the terms of later versions of GPL, depending upon the will of the user, so no right is being diminished	2013-02-08 09:22:46 +01:00
David A. Velasco	ccfd7772df	Removed some unused classes	2013-02-08 09:05:37 +01:00
David A. Velasco	bb257ec729	Updated copyright in source files	2013-02-07 18:45:10 +01:00
Bartek Przybylski	671cb91cef	add upload via wifi only option	2012-10-08 21:26:18 +02:00
David A. Velasco	3ab381f0e0	More hardcoded strings passed to string resources	2012-07-30 12:58:36 +02:00
David A. Velasco	7c93676d6f	Make resource values for some hardcoded string	2012-07-27 15:02:03 +02:00