mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-18 06:51:55 +03:00
Code Issues Projects Releases Packages Wiki Activity
6247 commits 221 branches 1585 tags 636 MiB
Commit graph

2498 commits

Author SHA1 Message Date
Nextcloud bot
186694de57
[tx-robot] updated from transifex 2016-11-23 01:32:41 +00:00
Nextcloud bot
ed85847b06
[tx-robot] updated from transifex 2016-11-22 01:32:46 +00:00
Nextcloud bot
cee3c8f47d
[tx-robot] updated from transifex 2016-11-21 01:32:47 +00:00
Nextcloud bot
36455fa829
[tx-robot] updated from transifex 2016-11-20 01:32:50 +00:00
Nextcloud bot
125197ea04
[tx-robot] updated from transifex 2016-11-19 01:32:42 +00:00
Nextcloud bot
12dcf609dd
[tx-robot] updated from transifex 2016-11-18 01:32:43 +00:00
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
Andy Scherzinger
405f228234 Merge pull request #365 from nextcloud/strugee-patch-1 
Improve wordings in strings.xml
 2016-10-30 20:09:45 +01:00
Nextcloud bot
0d9a11881c
[tx-robot] updated from transifex 2016-10-30 00:32:53 +00:00
Alex Jordan
033cc7154f Improve wordings in strings.xml 
This makes the wording of some strings less awkward along with fixing some minor grammar issues.
 2016-10-28 18:03:05 -07:00
AndyScherzinger
a72056161c
only show folder path on topo with synced folder made bold 2016-10-27 15:32:49 +02:00
AndyScherzinger
34003e922f
moved to switch instead of icon 2016-10-27 12:04:36 +02:00
Nextcloud bot
b7f36b2e54
[tx-robot] updated from transifex 2016-10-27 00:33:01 +00:00
AndyScherzinger
235b01b4bf
fixed review comments 2016-10-26 18:08:25 +02:00
AndyScherzinger
29d5e1e8cb
tweaked layout for preferences 2016-10-26 14:02:40 +02:00
AndyScherzinger
e3bd1cecb1
Merge branch 'master' of https://github.com/nextcloud/android into syncedFolders 2016-10-26 12:15:14 +02:00
AndyScherzinger
cc45b0f1e9
added possibility to enable/disable sync folder in the settings screen 2016-10-26 12:14:56 +02:00
Nextcloud bot
2829550e0a
[tx-robot] updated from transifex 2016-10-26 00:33:02 +00:00
Nextcloud bot
21fa873d5a
[tx-robot] updated from transifex 2016-10-25 09:40:11 +00:00
AndyScherzinger
fbca8cd215
Merge branch 'master' of https://github.com/nextcloud/android into syncedFolders 2016-10-24 18:30:25 +02:00
AndyScherzinger
a3cf129281
initially show instant upload feature revamp message if instant upload has been used/active with the legacy preferences 2016-10-24 16:43:10 +02:00
AndyScherzinger
9efa7de760
fix synced folder settings dialog theming + code cleanup 2016-10-24 15:52:16 +02:00
AndyScherzinger
85b2223d09
fix copyright note 2016-10-24 15:24:00 +02:00
AndyScherzinger
faea2f01fb
dynamic media grid width sizing and revampedd instant upload icon 2016-10-24 15:21:00 +02:00
tobiasKaminsky
95fb6c451a enlarged icon 2016-10-20 22:01:33 +02:00
AndyScherzinger
e053caf4ff
Merge branch 'master' of https://github.com/nextcloud/android into syncedFolders 2016-10-19 18:23:57 +02:00
Andy Scherzinger
8ace0d0d11 Merge pull request #328 from apicellaj/master 
add preference to show hidden files
 2016-10-19 17:17:06 +02:00
Nextcloud bot
28299dfd4c
[tx-robot] updated from transifex 2016-10-18 00:32:50 +00:00
Nextcloud bot
41934d6e6c
[tx-robot] updated from transifex 2016-10-17 00:32:49 +00:00
Nextcloud bot
feacbaf69b
[tx-robot] updated from transifex 2016-10-15 00:32:52 +00:00
Nextcloud bot
e3a3f26e6b
[tx-robot] updated from transifex 2016-10-14 00:32:49 +00:00
Joe Apicella
41d1aff589 add preference to show hidden files 2016-10-12 17:35:47 -07:00
AndyScherzinger
0889f8a69e
grid spacing added + negative/shortened margins for containers for nice image grids 2016-10-13 02:00:49 +02:00
Nextcloud bot
ae397fd94d
[tx-robot] updated from transifex 2016-10-12 00:32:53 +00:00
AndyScherzinger
52fdc316d6
better empty message 2016-10-10 22:02:54 +02:00
Nextcloud bot
a26b46bb45
[tx-robot] updated from transifex 2016-10-10 00:32:52 +00:00
AndyScherzinger
e1273ee86d
ellipsizing 2016-10-09 23:30:23 +02:00
AndyScherzinger
b557b0762c
remote folder can now be changed, all config changes for a synced folder are now saved 2016-10-09 23:27:30 +02:00
AndyScherzinger
5214659b05
Merge branch 'master' of https://github.com/nextcloud/android into syncedFolders 2016-10-09 18:42:15 +02:00
Andy Scherzinger
d1e1884366 Merge pull request #319 from divayprakash/divayprakash/fix 
Move magic numbers in layout files to @dims
 2016-10-09 17:49:53 +02:00
Nextcloud bot
03ce54d757
[tx-robot] updated from transifex 2016-10-09 00:32:46 +00:00
Nextcloud bot
8a88801848
[tx-robot] updated from transifex 2016-10-08 00:32:46 +00:00
Divay Prakash
2135b13b97
Fix error in share_file_layout_text_size value #12 2016-10-07 22:01:28 +05:30
Divay Prakash
cbbea085cb
Fix errors with float values #12 2016-10-07 21:57:08 +05:30
Divay Prakash
344980a1f0
Clean up dims.xml 2016-10-07 07:33:20 +05:30
Divay Prakash
f48b0b074d
Fix magic numbers in uploader_list_item_layout.xml #12 2016-10-07 07:32:11 +05:30
Divay Prakash
db3f069d1e
Fix magic numbers in upload_list_layout.xml #12 2016-10-07 07:29:48 +05:30
Divay Prakash
d736536547
Fix magic numbers in upload_list_item.xml #12 2016-10-07 07:29:16 +05:30
Divay Prakash
a3ddb28692
Fix magic numbers in upload_list_group.xml #12 2016-10-07 07:23:32 +05:30
Divay Prakash
918bdd53e7
Fix magic numbers in upload_files_layout.xml #12 2016-10-07 07:22:48 +05:30
Divay Prakash
c02383bfed
Fix magic numbers in toolbar_standard.xml #12 2016-10-07 07:21:54 +05:30