Skip to content

Commit 5fd45fe

Browse files
authored
Merge pull request #1763 from owncloud/release_2.1.0
Release 2.1.0
2 parents d6c0c9e + 2f5d9de commit 5fd45fe

File tree

347 files changed

+852
-713
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

347 files changed

+852
-713
lines changed

AndroidManifest.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
ownCloud Android client application
44
55
Copyright (C) 2012 Bartek Przybylski
6-
Copyright (C) 2012-2015 ownCloud Inc.
6+
Copyright (C) 2016 ownCloud GmbH.
77
88
This program is free software: you can redistribute it and/or modify
99
it under the terms of the GNU General Public License version 2,
@@ -19,8 +19,8 @@
1919
-->
2020
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2121
package="com.owncloud.android"
22-
android:versionCode="20000001"
23-
android:versionName="2.0.1" >
22+
android:versionCode="20100000"
23+
android:versionName="2.1.0" >
2424

2525
<uses-sdk
2626
android:minSdkVersion="14"
@@ -57,7 +57,7 @@
5757

5858
<application
5959
android:name=".MainApp"
60-
android:icon="@drawable/icon"
60+
android:icon="@mipmap/icon"
6161
android:label="@string/app_name"
6262
android:theme="@style/Theme.ownCloud"
6363
android:manageSpaceActivity=".ui.activity.ManageSpaceActivity">

CHANGELOG.md

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
## 2.1.0 (August 2016)
2+
- Select and handle multiple files
3+
- Sync files on tap
4+
- Access files through Documents Provider
5+
- "Can share" option for federated shares (server 9.1+)
6+
- Full name shown instead of user name
7+
- New icon
8+
- Style and sorting fixes
9+
- Bugs fixed, including:
10+
+ Icon "available offline" shown when set
11+
+ Trim blanks of username in login view
12+
+ Protect password field from suggestions
13+
114
## 2.0.1 (June 2016)
215
- Favorite files are now called AVAILABLE OFFLINE
316
- New overlay icons
@@ -6,7 +19,7 @@
619
+ Passwords with non-alphanumeric characters work fine
720
+ Sending files from other apps does not duplicate them
821
+ Favorite setting is not lost after uploading
9-
+ Instant uploads waiting for Wi-Fi are not shown as failed
22+
+ Instant uploads waiting for Wi-Fi are not shown as failed
1023

1124
## 2.0.0 (April 2016)
1225
- Uploads view: track the progress of your uploads and handle failures

THIRD_PARTY.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
###################################################################
22
ownCloud Android client
33

4-
Copyright (C) 2012-2013 ownCloud Inc.
4+
Copyright (C) 2016 ownCloud GmbH.
55
Copyright (C) 2012 Bartek Przybylski
66
###################################################################
77

@@ -55,12 +55,12 @@ The third party software included and used by this project is:
5555
* TouchImageView, commit 6dbeac4f11936185ba374c73144ac431c23c9aab
5656
Copyright (c) 2012 Michael Ortiz
5757
Licensed under MIT License
58-
JAR file libs/touch-image-view.jar has been generated by ownCloud Inc., including without
58+
JAR file libs/touch-image-view.jar has been generated by ownCloud GmbH., including without
5959
modifications com.ortiz.touch.ExtendedViewPager and com.ortiz.touch.TouchImageView classes.
6060
See https://github.com/MikeOrtiz/TouchImageView
6161

6262
* floatingactionbutton 1.10.1.
6363
Copyright (c) 2014 Jerzy Chalupski
6464
Licensed under Apache License, Version 2.0.
65-
placed at libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar has been exploded by ownCloud Inc.
65+
placed at libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar has been exploded by ownCloud GmbH.
6666
See https://github.com/futuresimple/android-floating-action-button

androidTest/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<!--
33
ownCloud Android client application
44
5-
Copyright (C) 2012-2016 ownCloud Inc.
5+
Copyright (C) 2016 ownCloud GmbH.
66
77
This program is free software: you can redistribute it and/or modify
88
it under the terms of the GNU General Public License version 2,

androidTest/java/com/owncloud/android/authentication/AuthenticatorActivityTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* ownCloud Android client application
33
*
4-
* Copyright (C) 2015 ownCloud Inc.
4+
* Copyright (C) 2016 ownCloud GmbH.
55
*
66
* This program is free software: you can redistribute it and/or modify
77
* it under the terms of the GNU General Public License version 2,

androidTest/java/com/owncloud/android/datamodel/OCFileUnitTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* ownCloud Android client application
33
*
44
* @author David A. Velasco
5-
* Copyright (C) 2016 ownCloud Inc.
5+
* Copyright (C) 2016 ownCloud GmbH.
66
*
77
* This program is free software: you can redistribute it and/or modify
88
* it under the terms of the GNU General Public License version 2,

androidTest/java/com/owncloud/android/uiautomator/InitialTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* ownCloud Android client application
33
* <p/>
4-
* Copyright (C) 2015 ownCloud Inc.
4+
* Copyright (C) 2016 ownCloud GmbH.
55
* <p/>
66
* This program is free software: you can redistribute it and/or modify
77
* it under the terms of the GNU General Public License version 2,

automationTest/src/test/java/com/owncloud/android/test/ui/actions/Actions.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* ownCloud Android client application
33
*
44
* @author purigarcia
5-
* Copyright (C) 2015 ownCloud Inc.
5+
* Copyright (C) 2016 ownCloud GmbH.
66
*
77
* This program is free software: you can redistribute it and/or modify
88
* it under the terms of the GNU General Public License version 2,

automationTest/src/test/java/com/owncloud/android/test/ui/groups/FailingTestCategory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* ownCloud Android client application
33
*
44
* @author purigarcia
5-
* Copyright (C) 2015 ownCloud Inc.
5+
* Copyright (C) 2016 ownCloud GmbH.
66
*
77
* This program is free software: you can redistribute it and/or modify
88
* it under the terms of the GNU General Public License version 2,

automationTest/src/test/java/com/owncloud/android/test/ui/groups/IgnoreTestCategory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* ownCloud Android client application
33
*
44
* @author purigarcia
5-
* Copyright (C) 2015 ownCloud Inc.
5+
* Copyright (C) 2016 ownCloud GmbH.
66
*
77
* This program is free software: you can redistribute it and/or modify
88
* it under the terms of the GNU General Public License version 2,

0 commit comments

Comments
 (0)