Merge pull request #39 from ONLYOFFICE/develop

Release/3.0.0

.gitmodules

@@ -1,4 +1,4 @@
-[submodule "src/onlyoffice/connector/browser/app_data"]
-	path = src/onlyoffice/connector/browser/app_data
+[submodule "src/onlyoffice/plone/browser/app_data"]
+	path = src/onlyoffice/plone/browser/app_data
 	url = https://github.com/ONLYOFFICE/document-templates
 	branch = main/new

CHANGELOG.md

@@ -1,5 +1,20 @@
 # Change Log
 
+## 3.0.0
+## Added
+- download as
+- documents conversion
+- connection to a demo document server
+- settings validation
+- mail merge from storage
+- compare file from storage
+- insert image from storage
+- advanced server settings for specifying internal addresses
+
+## Changed
+- parameter document.title for editor from file object title
+- document server v6.0 and earlier is no longer supported
+
 ## 2.1.1
 ## Fixed
 - issue with packaging

MANIFEST.in

@@ -15,6 +15,12 @@ recursive-include src *.sh
 recursive-include src *.txt
 recursive-include src *.xml
 recursive-include src *.zcml
+recursive-include src *.eot
+recursive-include src *.svg
+recursive-include src *.ttf
+recursive-include src *.woff
+recursive-include src *.woff2
+recursive-include src *.json
 
 recursive-include src *.docx
 recursive-include src *.docxf

README.md

@@ -21,9 +21,9 @@ You will need an instance of ONLYOFFICE Docs (Document Server) that is resolvabl
 
 You can install free Community version of ONLYOFFICE Docs or scalable Enterprise Edition with pro features.
 
-To install free Community version, use [Docker](https://github.com/onlyoffice/Docker-DocumentServer) (recommended) or follow [these instructions](https://helpcenter.onlyoffice.com/server/linux/document/linux-installation.aspx) for Debian, Ubuntu, or derivatives.  
+To install free Community version, use [Docker](https://github.com/onlyoffice/Docker-DocumentServer) (recommended) or follow [these instructions](https://helpcenter.onlyoffice.com/installation/docs-community-install-ubuntu.aspx) for Debian, Ubuntu, or derivatives.  
 
-To install Enterprise Edition, follow instructions [here](https://helpcenter.onlyoffice.com/server/integration-edition/index.aspx).
+To install Enterprise Edition, follow instructions [here](https://helpcenter.onlyoffice.com/installation/docs-enterprise-index.aspx).
 
 Community Edition vs Enterprise Edition comparison can be found [here](#onlyoffice-docs-editions).
 
@@ -36,16 +36,18 @@ Community Edition vs Enterprise Edition comparison can be found [here](#onlyoffi
     ...
 
     eggs =
-        onlyoffice.connector
+        onlyoffice.plone
     ```
 2. Run `bin/buildout`.
 3. Go to `Site Setup` -> `Add-ons`and press the `Install` button to enable plugin.
 
 You could also install plugin via Docker
 ```
-docker run --rm -p 8080:8080 -e ADDONS="onlyoffice.connector" plone
+docker run --rm -p 8080:8080 -e ADDONS="onlyoffice.plone" plone
 ```
-Both options will automatically install plugin from [PyPi](https://pypi.org/project/onlyoffice.connector/).
+Both options will automatically install plugin from [PyPi](https://pypi.org/project/onlyoffice.plone/).
+
+**Please note:** if you have the previous plugin version installed (earlier plugin versions with the previous name onlyoffice.connector), please remove it before installing the new version. 
 
 ## Configuring Plone ONLYOFFICE integration plugin
 
@@ -71,19 +73,19 @@ To configure plugin go to `Site Setup`. Scroll down to `Add-ons Configuration` s
     ./bin/instance fg
     ```
 If you have a working Plone instance, you can install plugin by adding the project files to the src directory:
-1. In the src directory create the onlyoffice.connector directory.
-2. Put your project files received by git into the onlyoffice.connector directory.
+1. In the src directory create the onlyoffice.plone directory.
+2. Put your project files received by git into the onlyoffice.plone directory.
 3. Edit the buildout.cfg file:
      ```
      [buildout]
 
      ...
 
      eggs =
-         onlyoffice.connector
+         onlyoffice.plone
 
     develop =
-        src/onlyoffice.connector
+        src/onlyoffice.plone
      ```
 4. Rerun buildout for the changes to take effect:
     ```
@@ -95,18 +97,18 @@ Note that Plone is based on Zope server and will not run as `root` user. If you
 
 ## Upgrade Plone ONLYOFFICE integration plugin
 1. If you specified a concrete plugin version in your buildout.cfg file (so-called “pinning”, and a recommended practice), 
- like onlyoffice.connector = 1.0.0, update this reference to point to the newer version. If the plugin version is not 
+ like onlyoffice.plone = 1.0.0, update this reference to point to the newer version. If the plugin version is not 
  specified, then the latest version will be automatically loaded:
     ```
     [versions]
 
      ...
 
-    onlyoffice.connector = 1.0.1
+    onlyoffice.plone = 1.0.1
     ```
 2. Run bin/buildout. Wait until the new version is downloaded and installed.
 3. Restart Plone - your site may look weird, or even be inaccessible until you have performed the next step.
-4. Navigate to the Add-on screen (add /prefs_install_products_form to your site URL) and in the Upgrades list select onlyoffice.connector and click "Upgrade onlyoffice.connector".
+4. Navigate to the Add-on screen (add /prefs_install_products_form to your site URL) and in the Upgrades list select onlyoffice.plone and click "Upgrade onlyoffice.plone".
 
 ## How it works
 

base.cfg

@@ -30,7 +30,7 @@ eggs =
     Plone
     Pillow
 	plone.app.debugtoolbar
-    onlyoffice.connector [test]
+    onlyoffice.plone [test]
 
 
 [code-analysis]
@@ -49,7 +49,7 @@ recipe = zc.recipe.testrunner
 eggs = ${instance:eggs}
 initialization =
     os.environ['TZ'] = 'UTC'
-defaults = ['-s', 'onlyoffice.connector', '--auto-color', '--auto-progress']
+defaults = ['-s', 'onlyoffice.plone', '--auto-color', '--auto-progress']
 
 
 [coverage]
@@ -103,5 +103,5 @@ scripts =
    plone-compile-resources
 
 [versions]
-# Don't use a released version of onlyoffice.connector
-onlyoffice.connector =
+# Don't use a released version of onlyoffice.plone
+onlyoffice.plone =

setup.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-"""Installer for the onlyoffice.connector package."""
+"""Installer for the onlyoffice.plone package."""
 
 from setuptools import find_packages
 from setuptools import setup
@@ -13,8 +13,8 @@
 
 
 setup(
-    name='onlyoffice.connector',
-    version='2.1.1',
+    name='onlyoffice.plone',
+    version='3.0.0',
     description="Plone ONLYOFFICE integration plugin",
     long_description=long_description,
     long_description_content_type="text/markdown",
@@ -31,19 +31,19 @@
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Operating System :: OS Independent",
-        "License :: OSI Approved :: GNU Affero General Public License v3",
+        "License :: OSI Approved :: Apache Software License",
     ],
     keywords='Python Plone',
     author='Ascensio System SIA',
     author_email='[email protected]',
     url='https://github.com/ONLYOFFICE/onlyoffice-plone',
     project_urls={
-        'PyPI': 'https://pypi.python.org/pypi/onlyoffice.connector',
+        'PyPI': 'https://pypi.python.org/pypi/onlyoffice.plone',
         'Source': 'https://github.com/ONLYOFFICE/onlyoffice-plone',
         'Tracker': 'https://github.com/ONLYOFFICE/onlyoffice-plone/issues',
-        # 'Documentation': 'https://onlyoffice.connector.readthedocs.io/en/latest/',
+        # 'Documentation': 'https://onlyoffice.plone.readthedocs.io/en/latest/',
     },
-    license='AGPL version 3',
+    license='Apache-2.0 License',
     packages=find_packages('src', exclude=['ez_setup']),
     namespace_packages=['onlyoffice'],
     package_dir={'': 'src'},
@@ -73,6 +73,6 @@
     [z3c.autoinclude.plugin]
     target = plone
     [console_scripts]
-    update_locale = onlyoffice.connector.locales.update:update_locale
+    update_locale = onlyoffice.plone.locales.update:update_locale
     """,
 )