2442 commits

Author	SHA1	Message	Date
Nextcloud bot	7cab979a65	[tx-robot] updated from transifex	2016-11-17 01:32:45 +00:00
Tobias Kaminsky	088ea9f5aa	Merge pull request #358 from nextcloud/syncedFolders ... Auto Upload (Android 7+)	2016-11-16 19:44:06 +01:00
Nextcloud bot	7260f5b510	[tx-robot] updated from transifex	2016-11-15 01:32:46 +00:00
Nextcloud bot	9de66a1807	[tx-robot] updated from transifex	2016-11-14 01:32:49 +00:00
Nextcloud bot	a883a0fbde	[tx-robot] updated from transifex	2016-11-13 01:32:47 +00:00
Nextcloud bot	3416b77f13	[tx-robot] updated from transifex	2016-11-12 01:32:48 +00:00
Nextcloud bot	8dc52325fe	[tx-robot] updated from transifex	2016-11-11 01:32:50 +00:00
AndyScherzinger	6c8bbd6c2c	Merge branch 'master' of https://github.com/nextcloud/android into syncedFolders ... # Conflicts: # src/com/owncloud/android/MainApp.java # src/com/owncloud/android/db/ProviderMeta.java # src/com/owncloud/android/providers/FileContentProvider.java # src/com/owncloud/android/services/observer/FolderObserver.java # src/com/owncloud/android/ui/activity/Preferences.java	2016-11-10 22:18:15 +01:00
Nextcloud bot	10c1f0ff3b	[tx-robot] updated from transifex	2016-11-10 01:32:56 +00:00
Nextcloud bot	208915481e	[tx-robot] updated from transifex	2016-11-09 01:32:53 +00:00
Nextcloud bot	4af848d06b	[tx-robot] updated from transifex	2016-11-07 01:32:43 +00:00
tobiasKaminsky	af859dfbda	fix wrong upload behaviour	2016-11-06 09:19:10 +01:00
Nextcloud bot	f152b93b98	[tx-robot] updated from transifex	2016-11-06 01:32:49 +00:00
Nextcloud bot	eeb97c791b	[tx-robot] updated from transifex	2016-11-05 01:32:52 +00:00
Nextcloud bot	55d05dbbf3	[tx-robot] updated from transifex	2016-11-03 01:32:52 +00:00
AndyScherzinger	9d7c9530b9	Merge branch 'master' of https://github.com/nextcloud/android into syncedFolders	2016-11-03 00:20:29 +01:00
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
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	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	d1ebcdda0d	fixed strings (oC->Nc and ... --> …)	2016-11-02 12:09:51 +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	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	0ea54fa91c	Fix after rebase	2016-11-02 12:09:49 +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	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
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	50cbf61872	code review changes	2016-11-01 23:35:18 +01:00
AndyScherzinger	175816b70e	spacing fix (dp perfect)	2016-11-01 23:35:17 +01:00
AndyScherzinger	2e4fbe0268	fixed file headers	2016-11-01 23:35:17 +01:00
AndyScherzinger	ae0db114fb	housekeeping (file_actions and AccountActionsDialog aren't in use anymore due to multi select / account manager capabilities)	2016-11-01 23:35:17 +01:00
AndyScherzinger	4b60d13d65	layout fixes II	2016-11-01 23:35:17 +01:00
AndyScherzinger	2ab59c3c95	layoutfix	2016-11-01 23:35:16 +01:00
AndyScherzinger	e89531fc1a	optimized layout adding username + account-url	2016-11-01 23:35:16 +01:00
AndyScherzinger	8c9e2206cb	name and avatr clickable (switching accounts)	2016-11-01 23:35:16 +01:00
AndyScherzinger	42c61c9ed4	highlight currently active user	2016-11-01 23:35:16 +01:00
David A. Velasco	c098aca057	Show a check mark on the current account in the account manager ... # Conflicts: # res/layout/account_item.xml # src/com/owncloud/android/ui/activity/ManageAccountsActivity.java # src/com/owncloud/android/ui/adapter/AccountListAdapter.java	2016-11-01 23:35:15 +01:00
AndyScherzinger	9a6bf6e2e4	Instant upload --> Auto upload	2016-11-01 18:51:03 +01:00
Nextcloud bot	2aa8b52a7a	[tx-robot] updated from transifex	2016-11-01 01:32:49 +00:00
AndyScherzinger	d49d248b06	Merge branch 'master' of https://github.com/nextcloud/android into syncedFolders	2016-10-31 18:54:15 +01:00
AndyScherzinger	0b26154f6d	Instant Upload --> Instant upload	2016-10-31 18:53:51 +01:00
Nextcloud bot	633399f964	[tx-robot] updated from transifex	2016-10-31 01:32:56 +00:00