Merge branch 'feature_uploadsubfolders' of https://github.com/nextcloud/android into feature_uploadsubfolders

AndroidManifest.xml

@@ -19,8 +19,8 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.owncloud.android"
-    android:versionCode="10000000"
-    android:versionName="1.0.0" >
+    android:versionCode="10000100"
+    android:versionName="1.0.1" >
 
     <uses-sdk
         android:minSdkVersion="14"

src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java

@@ -285,6 +285,8 @@ public class ThumbnailsCacheManager {
                                         px + "/" + px + Uri.encode(file.getRemotePath(), "/");
                                 Log_OC.d("Thumbnail", "URI: " + uri);
                                 get = new GetMethod(uri);
+                                get.setRequestHeader("Cookie",
+                                        "nc_sameSiteCookielax=true;nc_sameSiteCookiestrict=true");
                                 int status = mClient.executeMethod(get);
                                 if (status == HttpStatus.SC_OK) {
                                     InputStream inputStream = get.getResponseBodyAsStream();

user_manual/conf.py

@@ -186,8 +186,8 @@ latex_elements = {
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-  ('index', 'ownCloudAndroidAppManual.tex', u'ownCloud Android App Manual',
-   u'The ownCloud developers', 'manual'),
+  ('index', 'NextcloudAndroidAppManual.tex', u'Nextcloud Android App Manual',
+   u'The Nextcloud developers', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -216,10 +216,10 @@ latex_documents = [
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ('owncloud.1', 'owncloud', u'Android synchronisation and file management utility.',
-     [u'The ownCloud developers'], 1),
-    ('owncloudcmd.1', 'owncloudcmd', u'ownCloud Android app.',
-     [u'The ownCloud developers'], 1),
+    ('nextcloud.1', 'nextcloud', u'Android synchronisation and file management utility.',
+     [u'The Nextcloud developers'], 1),
+    ('nextcloudcmd.1', 'nextcloudcmd', u'Nextcloud Android app.',
+     [u'The Nextcloud developers'], 1),
 ]
 
 # If true, show URL addresses after external links.
@@ -232,8 +232,8 @@ man_show_urls = True
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-  ('index', 'ownCloudClientManual', u'ownCloud Android App Manual',
-   u'The ownCloud developers', 'ownCloud', 'The ownCloud Android App Manual.',
+  ('index', 'NextcloudClientManual', u'ownCloud Android App Manual',
+   u'The Nextcloud developers', 'ownCloud', 'The ownCloud Android App Manual.',
    'Miscellaneous'),
 ]
 
@@ -250,10 +250,10 @@ texinfo_documents = [
 # -- Options for Epub output ---------------------------------------------------
 
 # Bibliographic Dublin Core info.
-epub_title = u'ownCloud Android App Manual'
-epub_author = u'The ownCloud developers'
-epub_publisher = u'The ownCloud developers'
-epub_copyright = u'2013-2015, The ownCloud developers'
+epub_title = u'Nextcloud Android App Manual'
+epub_author = u'The Nextcloud developers'
+epub_publisher = u'The Nextcloud developers'
+epub_copyright = u'2016, The Nextcloud developers'
 
 # The language of the text. It defaults to the language option
 # or en if the language is not set.

user_manual/index.rst

@@ -1,7 +1,7 @@
 .. _contents:
 
-ownCloud Android App Manual
-==============================
+Nextcloud Android App Manual
+============================
 
 .. toctree::
    :maxdepth: 2