mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-19 07:22:06 +03:00
Code Issues Projects Releases Packages Wiki Activity
6265 commits 222 branches 1585 tags 637 MiB
Commit graph

6265 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andy Scherzinger
f133eaad07
rebase/merge 2016-11-02 23:34:28 +01:00
Andy Scherzinger
5f5f0ce029
lib1.0.4 2016-11-02 23:34:28 +01:00
Andy Scherzinger
609647e622
Revert "added jcenter repo" 
This reverts commit b54e954c96014babd176d8f50ba6b7a9e44dea38.
 2016-11-02 23:34:28 +01:00
Andy Scherzinger
3f2d376ff4
link to v24 version of the Nc lib 2016-11-02 23:34:27 +01:00
Andy Scherzinger
9ff3aff7bd
added jcenter repo 2016-11-02 23:34:27 +01:00
Andy Scherzinger
232e555cd3
bump to v24 incl. toolchain, jdk8 etc. 2016-11-02 23:34:25 +01:00
AndyScherzinger
a737c09f10
fixes for preferences after merge 2016-11-02 22:06:51 +01:00
AndyScherzinger
fee252176e
Merge branch 'master' of https://github.com/nextcloud/android into syncedFolders 
# Conflicts:
#	src/com/owncloud/android/MainApp.java
#	src/com/owncloud/android/ui/activity/Preferences.java
 2016-11-02 21:48:52 +01:00
Andy Scherzinger
9f8fdaeac0 Merge pull request #92 from nextcloud/externalSD2 
External SD support
 2016-11-02 21:18:34 +01:00
Andy Scherzinger
b09126cb81
fixed imports after rebase 2016-11-02 12:09:52 +01:00
Andy Scherzinger
20a0a747d7
extract/pre-compile the pattern 2016-11-02 12:09:52 +01:00
Andy Scherzinger
612199a9b7
further CR fixes, fixed comment in layout/migration_layout.xml 2016-11-02 12:09:52 +01:00
Andy Scherzinger
6e73da2809
CR, GPLv3 2016-11-02 12:09:52 +01:00
Andy Scherzinger
d7d2845117
lib version 1.0.2, organizes imports in FileStorageUtils 2016-11-02 12:09:51 +01:00
Andy Scherzinger
d1ebcdda0d
fixed strings (oC->Nc and ... --> …) 2016-11-02 12:09:51 +01:00
Bartosz Przybylski
e47ebda6cc
rebase fixes 2016-11-02 12:09:51 +01:00
tobiasKaminsky
afbe508dd1
use lollipop external storage system 2016-11-02 12:09:51 +01:00
Bartosz Przybylski
5cf019d9de
Because of multiple underlying implementation of storage mount points introduce a mechanism which is querying multiple solutions and lists them to the user 2016-11-02 12:09:51 +01:00
Bartosz Przybylski
a9f55d5d96
Handle case of migration of empty src directory 2016-11-02 12:09:50 +01:00
Bartosz Przybylski
4265c60b92
Change the way of fetching mounted resources, use system tools and parse results 2016-11-02 12:09:50 +01:00
Bartosz Przybylski
70c690ca7c
Use progress dialog instead of alert dialog, for better UX 2016-11-02 12:09:50 +01:00
Bartosz Przybylski
8b587cead2
Tabs to spaces 2016-11-02 12:09:50 +01:00
Bartosz Przybylski
47f522d34e
Small code cleanups 2016-11-02 12:09:50 +01:00
Bartosz Przybylski
9dc51a4880
Simplify storage selection process 2016-11-02 12:09:49 +01:00
Bartosz Przybylski
2af111b8cb
Add DataStorageUtils to detect connected SD cards 2016-11-02 12:09:49 +01:00
Bartosz Przybylski
cec707b582
For more reliability delete old files recursively in migration cleanup 2016-11-02 12:09:49 +01:00
Bartosz Przybylski
0ea54fa91c
Fix after rebase 2016-11-02 12:09:49 +01:00
Bartosz Przybylski
8ad388f951
Soften requirement on cleanup step failures 2016-11-02 12:09:49 +01:00
Bartosz Przybylski
6722f71be8
Stop and start logging on migration 2016-11-02 12:09:48 +01:00
Bartosz Przybylski
ebbab224b2
Code cleanups 2016-11-02 12:09:48 +01:00
Bartosz Przybylski
67bc271265
Add cleanup and rollback step when migrating. Correctly set progress during migration. 2016-11-02 12:09:48 +01:00
Bartosz Przybylski
b38b3276e2
Add more migration stuff. cleanup step is still missing 2016-11-02 12:09:48 +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
Nextcloud bot
226abe2469
[tx-robot] updated from transifex 2016-11-02 01:32:46 +00:00
AndyScherzinger
d713294cf0
further merge fixes 2016-11-02 00:34:54 +01:00
AndyScherzinger
d912bd2dce
Fixes after rebase 2016-11-02 00:30:50 +01:00
AndyScherzinger
fc6e3fc458
Merge branch 'master' of https://github.com/nextcloud/android into syncedFolders 
# Conflicts:
#	res/layout/drawer.xml
#	res/layout/drawer_header.xml
#	src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
 2016-11-02 00:18:24 +01:00
Andy Scherzinger
4e3d51799d Merge pull request #326 from nextcloud/accountSwitcherOptimizations 
Account switcher optimizations
 2016-11-01 23:48:43 +01:00
AndyScherzinger
b3ffb02736
use proper alert 2016-11-01 23:35:19 +01:00
AndyScherzinger
074edbdbf4
removed deprecated eu language file (es is available) 2016-11-01 23:35:19 +01:00
AndyScherzinger
ae8440b038
removed deprecated eu language file (es is available) 2016-11-01 23:35:19 +01:00
AndyScherzinger
f5d76101e0
removed deprecated ru-ru language file (ru is available) 2016-11-01 23:35:19 +01:00
AndyScherzinger
d15f244d77
removed deprecated ch language file 2016-11-01 23:35:18 +01:00
AndyScherzinger
7ef153563b
removed deprecated fi language file 2016-11-01 23:35:18 +01:00
AndyScherzinger
9352886c5a
upgrade legacy calls 2016-11-01 23:35:18 +01:00
AndyScherzinger
50cbf61872
code review changes 2016-11-01 23:35:18 +01:00
AndyScherzinger
928a1b8630
fixes after cherry pick 2016-11-01 23:35:18 +01:00
AndyScherzinger
3a8d29d79b
use latest 2.2.1 gradle/Android plugin 2016-11-01 23:35:17 +01:00
David A. Velasco
5a97d31392
Finish action mode when drawer starts to open, recover it when drawer is closed 
# Conflicts:
#	build.gradle
#	src/com/owncloud/android/ui/activity/DrawerActivity.java
#	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
 2016-11-01 23:35:17 +01:00