mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-22 16:54:33 +03:00
Code Issues Projects Releases Packages Wiki Activity
7729 commits 221 branches 1589 tags 640 MiB
Commit graph

798 commits

Author SHA1 Message Date
AndyScherzinger
bb7c065b1e
Merge branch 'master' of https://github.com/nextcloud/android into pinchZoom 2017-06-06 17:32:00 +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
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
Andy Scherzinger
ce3a8bf3d7 Merge pull request #1012 from nextcloud/activitiesImprovement 
Activities improvement
 2017-05-31 21:25:19 +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
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
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
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