Commit graph

4477 commits

Author SHA1 Message Date
JARP
f7ce3e9ab5 Removing uploads from account 2017-06-07 15:27:03 -05: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
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
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
tobiasKaminsky
9dc3229f31
add possibility to move quota to navigation header 2017-05-26 17:35:55 +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
AndyScherzinger
6291113f12
fix comment and shorten calls 2017-05-24 15:07:13 +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
tobiaskaminsky
315ac57a32 fix license comment 2017-05-24 00:53:58 +02:00
tobiaskaminsky
523c5c5a41 fix license comment 2017-05-24 00:53:58 +02:00
tobiaskaminsky
4460c2135c npe if expiring backups after fresh install 2017-05-24 00:53:58 +02:00
Mario Đanić
febd1435de Merge pull request #995 from nextcloud/crashDueToEmptyString
Crash due to non-existing empty string
2017-05-24 00:15:14 +02:00
Mario Đanić
474314b2dc Merge pull request #985 from nextcloud/audioRotationBug
Re-use second fragment if available
2017-05-24 00:14:15 +02:00
AndyScherzinger
766a691a19
A switch statement does not contain a break (codacy) 2017-05-24 00:01:54 +02:00
AndyScherzinger
0fa8df201d
A switch statement does not contain a break (codacy) 2017-05-24 00:01:54 +02:00
AndyScherzinger
a14401a2e4
extract ContentValue object creation to private methods 2017-05-24 00:01:53 +02:00
AndyScherzinger
03a81d902d
An instanceof check is being performed on the caught exception. Create a separate catch clause for this exception type. (codacy) 2017-05-24 00:01:53 +02:00
AndyScherzinger
b44320076b
Fields should be declared at the top of the class, before any method declarations, constructors, initializers or inner classes (codacy) 2017-05-24 00:01:53 +02:00
AndyScherzinger
e29ca8091d
Use one line for each declaration, it enhances code readability (codacy) 2017-05-24 00:01:52 +02:00
AndyScherzinger
2f6793f878
remove unnecessary return statement (codacy) 2017-05-24 00:01:52 +02:00
tobiasKaminsky
1cede628f9
bump version 2017-05-23 23:47:51 +02:00
AndyScherzinger
15339b665a
align app version code/name throughout builds (1.4.3) 2017-05-23 23:47:51 +02:00
Nextcloud bot
0ae25b0c2c
[tx-robot] updated from transifex 2017-05-23 06:55:56 +00:00
Nextcloud bot
00f4e595fa
[tx-robot] updated from transifex 2017-05-23 00:26:22 +00:00
tobiasKaminsky
0627dd2a84
bump version 2017-05-22 17:21:37 +02:00
tobiasKaminsky
d17af1d37e
ignore oauth for now and use always basic auth 2017-05-22 17:09:05 +02:00
tobiaskaminsky
ce57d257b1
Merge remote-tracking branch 'remotes/origin/master' into brandingDrawer2 2017-05-22 10:03:15 +02:00
tobiaskaminsky
1f8ee72aa5
set to 757575ff and no transparence as in othere files 2017-05-22 10:02:08 +02:00
tobiaskaminsky
16cfaa5525
change/add nav_videos res 2017-05-22 09:49:58 +02:00
Nextcloud bot
9bc5d1bde7
[tx-robot] updated from transifex 2017-05-22 00:25:50 +00:00
Nextcloud bot
ae373a0693
[tx-robot] updated from transifex 2017-05-21 00:25:37 +00:00
Nextcloud bot
50889f726b
[tx-robot] updated from transifex 2017-05-20 00:24:46 +00:00