Commit graph

7734 commits

Author SHA1 Message Date
tobiasKaminsky
73b1a73ffa
satisfy codacy 2017-06-16 15:44:13 +02:00
AndyScherzinger
a9fa536fb3
Merge branch 'master' of https://github.com/nextcloud/android into pinchZoom 2017-06-07 22:33:59 +02:00
Mario Đanić
24464951dc Merge pull request #1072 from nextcloud/fixTitleBar
Fixing title bar
2017-06-07 08:49:09 +02:00
alejandro
9043685c18 Fixing title bar 2017-06-07 08:39:08 +02:00
Nextcloud bot
a25f953b6e
[tx-robot] updated from transifex 2017-06-07 00:29:26 +00:00
AndyScherzinger
bb7c065b1e
Merge branch 'master' of https://github.com/nextcloud/android into pinchZoom 2017-06-06 17:32:00 +02:00
Andy Scherzinger
35403deda8 Merge pull request #1071 from nextcloud/customizations
Add various customization options
2017-06-06 16:48:05 +02:00
Mario Danic
ee2d09be97 Fix a typo
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-06-06 13:27:16 +02:00
Mario Danic
d0692f72f4 Fix ui when not using account choose
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-06-06 13:24:05 +02:00
Mario Danic
b530d38b07 Add various customization options
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-06-06 11:32:29 +02:00
Nextcloud bot
962c5bee7e
[tx-robot] updated from transifex 2017-06-06 00:27:03 +00:00
Nextcloud bot
9ec47db602
[tx-robot] updated from transifex 2017-06-05 00:26:28 +00:00
AndyScherzinger
de8bb6a691
Merge branch 'master' of https://github.com/nextcloud/android into pinchZoom
# Conflicts:
#	src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.java
2017-06-05 00:38:52 +02:00
Nextcloud bot
3ac9c40469
[tx-robot] updated from transifex 2017-06-04 00:27:38 +00:00
Nextcloud bot
3de6aa9b51
[tx-robot] updated from transifex 2017-06-03 00:25:35 +00:00
Nextcloud bot
1e66a8235a
[tx-robot] updated from transifex 2017-06-02 00:27:31 +00:00
Nextcloud bot
22044ec663
[tx-robot] updated from transifex 2017-06-01 00:25:29 +00:00
Mario Đanić
037236f095 Merge pull request #1043 from nextcloud/fixingContactBackup
Fixing contact backup
2017-05-31 22:16:28 +02:00
AndyScherzinger
265d6ced52
scope members 2017-05-31 22:09:26 +02:00
AndyScherzinger
dd54aa7207
Merge branch 'master' of https://github.com/nextcloud/android into fixingContactBackup 2017-05-31 21:55:31 +02:00
Mario Đanić
de28b9fb70 Merge pull request #1058 from nextcloud/lib_1_0_21
Fix chunked uploads
2017-05-31 21:46:24 +02:00
Andy Scherzinger
def4f5821c update lib to 1.0.21 2017-05-31 21:45:15 +02:00
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
alejandro
6275d00851 Merge branch 'fixingContactBackup' of https://github.com/nextcloud/android into fixingContactBackup 2017-05-30 16:30:46 -05:00
alejandro
f0b76ede44 Add Load Contact in Background and ProgressBar
Fixing Comparator

Format code
2017-05-30 16:18:16 -05:00
alejandro
d1f7e2aa5f Fix Sort Contact
Avoid duplicate contacts
2017-05-30 16:15:05 -05: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