Commit graph

7671 commits

Author SHA1 Message Date
AndyScherzinger
bdcbbb13c5
slightly enlarge autoUpload on/off button hitbox 2017-05-30 08:41:16 +02:00
tobiasKaminsky
400912e961
fixed cick on wifi 2017-05-30 08:41:16 +02:00
tobiasKaminsky
328b6625ab
change auto upload path to "/Auto Upload" 2017-05-30 08:41:15 +02:00
tobiasKaminsky
7103fea76d
changed to default
only "on wifi" is in settings
2017-05-30 08:41:15 +02:00
tobiasKaminsky
ab096dd0f7
background logic implemented 2017-05-30 08:40:55 +02:00
Andy Scherzinger
0112219dd3 Merge pull request #1050 from nextcloud/comradekingu-patch-1
Spelling: "Login" is not a verb. + ": Uppercase"
2017-05-30 07:46:05 +02:00
Nextcloud bot
04d7b6895c
[tx-robot] updated from transifex 2017-05-30 00:27:06 +00:00
Mario Đanić
343b65645c Merge pull request #1041 from nextcloud/authInNC12
Multiple auth headers in NC12
2017-05-29 23:50:23 +02:00
Mario Danic
afb610fc03 Update lib version
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-05-29 23:28:36 +02:00
Mario Danic
c305d2e2e1 Updating to newest release
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-05-29 23:03:13 +02:00
Mario Đanić
cb33a35ee9 Merge pull request #896 from nextcloud/searchViewWrongFiles
Search view wrong files
2017-05-29 22:19:49 +02:00
AndyScherzinger
1b6dc03872
Merge branch 'master' of https://github.com/nextcloud/android into searchViewWrongFiles 2017-05-29 21:42:51 +02:00
Mario Đanić
e2f07eb2d4 Merge pull request #1011 from nextcloud/contactListImprovement
Contact list improvement
2017-05-29 21:15:28 +02:00
Mario Danic
fd790ecbf1 Clean imports
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-05-29 20:04:53 +02:00
Mario Danic
0b0a9e9c60 Fix majority of bugs
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-05-29 19:42:04 +02:00
Mario Danic
df69e842c6 Fix empty view on rotation
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-05-29 19:31:23 +02:00
Mario Danic
2769d51d0f Fix a few things
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-05-29 19:26:21 +02:00
comradekingu
7a7091d135 Update strings.xml
Spelling: "Login" is not a verb. + ": Uppercase"
2017-05-29 18:35:06 +02:00
Mario Danic
d1847a25d3 Fix a few things
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-05-29 13:34:56 +02:00
Mario Danic
c774aa3040 Partially fix stuff
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-05-29 12:57:19 +02:00
Mario Danic
b35b1f9c90 Merge branch 'master' into searchViewWrongFiles
Signed-off-by: Mario Danic <mario@lovelyhq.com>

# Conflicts:
#	src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java
#	src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.java
2017-05-29 10:37:01 +02:00
Nextcloud bot
7d2b37e3ec
[tx-robot] updated from transifex 2017-05-28 00:26:08 +00:00
Nextcloud bot
b6c592a067
[tx-robot] updated from transifex 2017-05-27 00:26:51 +00:00
Mario Đanić
991b11050c Merge pull request #1015 from nextcloud/quotaInSideBar
Add possibility to move quota to navigation header
2017-05-27 00:42:51 +02:00
tobiasKaminsky
9dc3229f31
add possibility to move quota to navigation header 2017-05-26 17:35:55 +02:00
Mario Đanić
32c3cb5968 Merge pull request #1030 from nextcloud/colorFolderNew
[Branding] Use color for folders, ...
2017-05-26 17:05:41 +02:00
AndyScherzinger
de58c864bb
fix folder/upload icons for empty list view (Nc blue + 50% opacity) 2017-05-26 11:36:54 +02:00
AndyScherzinger
dc21800299
fix material design color definitions 2017-05-26 11:19:13 +02:00
AndyScherzinger
49453742c9
cleanup actionbar style definition 2017-05-26 11:19:13 +02:00
tobiasKaminsky
5edd32b753
removed nc_blue_accent and nc_blue and use colors from setup.xml 2017-05-26 11:19:13 +02:00
tobiasKaminsky
b3eb13c2df
removed navigation bar color and set to primary 2017-05-26 11:19:12 +02:00
tobiaskaminsky
bf4191e251
checkbox in off state: grey
auto upload cloud icon in on state: tint it
2017-05-26 11:19:12 +02:00
tobiasKaminsky
71a9b683fa
change auto upload cloud icon 2017-05-26 11:19:11 +02:00
tobiasKaminsky
a08a69faeb
unify tintDrawable methods 2017-05-26 11:19:11 +02:00
tobiasKaminsky
8ba192f38a
tint checkboxes 2017-05-26 11:19:11 +02:00
tobiasKaminsky
e671cecc45
WIP use colors from setup.xml for folder icons 2017-05-26 11:19:10 +02:00
Nextcloud bot
8d510e5244
[tx-robot] updated from transifex 2017-05-26 00:25:54 +00:00
Nextcloud bot
e2254cceac
[tx-robot] updated from transifex 2017-05-25 00:25:34 +00:00
Mario Đanić
3fdf5e283d Merge pull request #1042 from nextcloud/lintConfig
Remove non existing reference to lint config
2017-05-24 15:21:32 +02:00
AndyScherzinger
6291113f12
fix comment and shorten calls 2017-05-24 15:07:13 +02:00
tobiasKaminsky
7dc5cc7a94
remove non existing reference to lint config 2017-05-24 11:36:24 +02:00
tobiasKaminsky
b11ca04f8a
Merge remote-tracking branch 'remotes/origin/master' into contactListImprovement 2017-05-24 11:13:44 +02:00
tobiasKaminsky
599256d9c9
parse multiple auth headers and pick "basic" if exists 2017-05-24 10:32:18 +02:00
Nextcloud bot
7995544f6c
[tx-robot] updated from transifex 2017-05-24 00:26:32 +00:00
Mario Đanić
c2edec6815 Merge pull request #1021 from nextcloud/brandingDrawer
Drawer branding
2017-05-24 00:56:44 +02:00
Mario Đanić
f5e1660769 Merge pull request #1020 from nextcloud/showContactBackup
Contacts backup folder after new install
2017-05-24 00:56:02 +02:00
tobiaskaminsky
977e2fb691 logging via LOG_OC
removed unnedded try catch
2017-05-24 00:55:48 +02:00
tobiaskaminsky
778829d69c - always update contacts backup folder
- if file is not downloaded, download it then show content
2017-05-24 00:55:48 +02:00
Mario Đanić
a5329a6aa7 Merge pull request #1019 from nextcloud/npeInContactBackups
NPE in contact backups
2017-05-24 00:54:28 +02:00
tobiaskaminsky
315ac57a32 fix license comment 2017-05-24 00:53:58 +02:00