Commit graph

7690 commits

Author SHA1 Message Date
Andy Scherzinger
ce3a8bf3d7 Merge pull request #1012 from nextcloud/activitiesImprovement
Activities improvement
2017-05-31 21:25:19 +02:00
Mario Đanić
1f351198e3 Merge pull request #1023 from nextcloud/SearchFeatureNC12only
disable search related navigation entries in sidebar/bottombar
2017-05-31 19:05:48 +02:00
tobiasKaminsky
b2094cdc8d disable search related navigation entries in sidebar/bottombar if server version is <12 2017-05-31 18:59:52 +02:00
Mario Danic
9631859548 Fix time
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-05-31 18:52:12 +02:00
AndyScherzinger
29bd72141d
corrected left icon size to file_icon_size 2017-05-31 12:52:13 +02:00
Mario Danic
0f53e5043f
Hopefully add support for pre-12
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-05-31 11:02:25 +02:00
Mario Danic
7ebc48b2bb
Fix UI
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-05-31 11:02:25 +02:00
AndyScherzinger
73b0af94f4
use new icon util method for custom color aware tinted icon 2017-05-31 11:02:25 +02:00
alejandro
1d92fe8df6
Removing RecyclerView 2017-05-31 11:02:24 +02:00
alejandro
1cf2ef4395
Fixing comments 2017-05-31 11:02:24 +02:00
alejandro
28b8993f88
Fixing Codacy 2017-05-31 11:02:23 +02:00
alejandro
13f1b56e78
Fixing OCClient 2017-05-31 11:02:23 +02:00
alejandro
0f36ce9485
Adding RichObject to Activity View 2017-05-31 11:02:23 +02:00
alejandro
2e6953064a
Custom Fetcher with OCClient for Glide 2017-05-31 11:02:23 +02:00
alejandro
40b4d3de55
Improvement RichObject 2017-05-31 11:02:22 +02:00
alejandro
e62b4eae04
Rich Text and clickable text was added 2017-05-31 11:02:22 +02:00
alejandro
fba1d38100
Header was added in ActivitiesView
RichSubject was Added
2017-05-31 11:02:19 +02:00
Nextcloud bot
a9a72106ee
[tx-robot] updated from transifex 2017-05-31 00:26:39 +00:00
Mario Đanić
76f7f5c1ee Merge pull request #1039 from nextcloud/autoUploadLight
Auto upload light
2017-05-30 19:27:24 +02:00
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