mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-23 21:55:48 +03:00
Code Issues Projects Releases Packages Wiki Activity
6127 commits 227 branches 1571 tags 618 MiB
Commit graph

87 commits

Author SHA1 Message Date
David A. Velasco
aa0e4b8cc8
Fix crash opening or sending files in Android 7 
# Conflicts:
#	res/values/setup.xml
#	src/com/owncloud/android/ui/activity/Preferences.java
 2016-11-02 23:34:50 +01:00
Andy Scherzinger
612199a9b7
further CR fixes, fixed comment in layout/migration_layout.xml 2016-11-02 12:09:52 +01:00
Bartosz Przybylski
9dc51a4880
Simplify storage selection process 2016-11-02 12:09:49 +01:00
Bartosz Przybylski
0ea54fa91c
Fix after rebase 2016-11-02 12:09:49 +01:00
Andy Scherzinger
3fc8d999db
rebase 2016-11-02 12:09:48 +01:00
tobiasKaminsky
b1963aed50
Prepare preferences and project to use user defined storage path 2016-11-02 12:09:47 +01:00
Joe Apicella
41d1aff589 add preference to show hidden files 2016-10-12 17:35:47 -07:00
Andy Scherzinger
4533d5f47f move setup call to settings screen 2016-09-10 13:53:49 +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
c875bbace1 Merge pull request #35 from nextcloud/feature_uploadsubfolders 
Feature uploadsubfolders
 2016-06-27 10:45:41 +02:00
Andy Scherzinger
f7178fa837 housekeeping Preferences, removed all accounts related code 2016-06-25 16:26:57 +02:00
Timo Witte
3c388ad120 implement the same for videos and do some code cleanup 2016-06-19 23:53:15 +02:00
Timo Witte
f68b53ba61 introduce upload subfolders configuration variable 2016-06-19 16:43:12 +02:00
Andy Scherzinger
c9a3397aac minor search provider config 2016-06-09 19:16:14 +02:00
Andy Scherzinger
91682b616c replace launcher icon including seasonal icon removal 2016-06-09 17:52:35 +02:00
Andy Scherzinger
74a05bb2a9 moved logs from drawer menu to "More" section in the settings 2016-05-18 12:35:57 +02:00
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
tobiasKaminsky
e92297ccaf split "on charging" to photo and video 2015-10-18 12:51:08 +02:00
tobiasKaminsky
1db620124a update according to jan 2015-10-18 10:21:29 +02:00
tobiasKaminsky
7fe9c02bff Merge branch 'uploadWhenCharging' of github.com:owncloud/android into uploadWhenCharging 2015-10-18 10:08:46 +02: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
masensio
efb3989ee6 Merge branch 'develop' into uploadWhenCharging 
Conflicts:
	res/values-fr/strings.xml
	res/xml/preferences.xml
 2015-09-01 16:51:40 +02:00
tobiasKaminsky
37df675ca3 update 2015-07-22 21:00:09 +02:00
tobiasKaminsky
8c92889fa1 Merge remote-tracking branch 'upstream/develop' into uploadWhenCharging 2015-07-22 20:15:14 +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
tobiasKaminsky
365376f7f0 - bugfix 
- changed preferences order
 2014-11-22 14:05:51 +01:00
tobiasKaminsky
fa99fbe2d9 - Instant upload only when charging 2014-11-22 13:48:03 +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