s/1.3/2.0/

VERSION

@@ -1 +1 @@
-1.3
+2.0

docs/en/admin/applications/richpage/index.rst

@@ -4,7 +4,7 @@
 richpage - Page document (wiki page)
 ===============================================
 
-.. versionadded:: 1.3
+.. versionadded:: 2.0
 
 This application adds a new type of document, **Page** which
 does not contain files but has an editable "content" field.

docs/en/admin/ht_1_install_server.rst

@@ -1,5 +1,5 @@
 ===================================================
-How to install openPLM server 1.3
+How to install openPLM server 2.0
 ===================================================
 
 This document describes how to install an openPLM server using the 1.2 version
@@ -60,7 +60,7 @@ Get the tarball containing the code
 
 Extract the code in /var and rename the directory to django
 
-    * ``tar xzf openplm-1.3.tar.gz -C /var/``
+    * ``tar xzf openplm-2.0.tar.gz -C /var/``
 
     * ``mv /var/openplm /var/django``
 
@@ -271,7 +271,7 @@ Configure Apache server
 Create a new apache's site (:file:`/etc/apache2/sites-available/openplm`)
 and add the following lines (replace the server name):
 
-.. literalinclude:: apache/simple_1.3b.conf
+.. literalinclude:: apache/simple_2.0b.conf
     :language: apache
 
 Restart Apache server
@@ -375,7 +375,7 @@ Each HTTP connection will be redirected to an HTTPS connection.
 A possible apache configuration would be (the rewrite and ssl modules must
 be enabled)
 
-.. literalinclude:: apache/ssl_1.3b.conf
+.. literalinclude:: apache/ssl_2.0b.conf
     :language: apache
 
 Configuring E-mails

docs/en/admin/ht_2_install_server.rst

@@ -7,7 +7,7 @@ This document describes how to install an openPLM server.
 
 .. warning::
 
-    OpenPLM 1.3 (current development version) will no longer be
+    OpenPLM 2.0 (current development version) will no longer be
     compatible with django 1.2 and the portage is in in progress.
     It is recommended to wait until the migration is done before
     installing this version. (2013/02/25)
@@ -244,7 +244,7 @@ Configure Apache server
 Create a new apache's site (:file:`/etc/apache2/sites-available/openplm`)
 and add the following lines (replace the server name):
 
-.. literalinclude:: apache/simple_1.3.conf
+.. literalinclude:: apache/simple_2.0.conf
     :language: apache
 
 Restart Apache server
@@ -349,7 +349,7 @@ Each HTTP connection will be redirected to an HTTPS connection.
 A possible apache configuration would be (the rewrite and ssl modules must
 be enabled)
 
-.. literalinclude:: apache/ssl_1.3.conf
+.. literalinclude:: apache/ssl_2.0.conf
     :language: apache
 
 Configuring E-mails

docs/en/admin/ht_3_upgrade.rst

@@ -179,7 +179,7 @@ Version 1.2:
 Collecting static files
 =========================
 
-.. versionadded:: 1.3
+.. versionadded:: 2.0
 
 Not required if you update using the tarball:
 

docs/en/admin/references.rst

@@ -4,7 +4,7 @@
 References -- how to customize generated references
 ====================================================
 
-.. versionadded:: 1.3
+.. versionadded:: 2.0
 
 
 Reference numbers

docs/en/admin/richtext.rst

@@ -4,10 +4,10 @@
 Rich text | wiki syntax
 ==================================
 
-.. versionadded:: 1.3
+.. versionadded:: 2.0
 
 
-OpenPLM 1.3 introduces a rich syntax (wiki). It can be enabled
+OpenPLM 2.0 introduces a rich syntax (wiki). It can be enabled
 at any time by editing the :file:`settings.py` file.
 This syntax is used to render comments, long description fields
 and by the :ref:`richpage application <richpage-admin>`.

docs/en/admin/upgrade/upgrade-1.3.rst → docs/en/admin/upgrade/upgrade-2.0.rst

@@ -1,5 +1,5 @@
 ===========================================
-Upgrading from OpenPLM 1.2 to OpenPLM 1.3
+Upgrading from OpenPLM 1.2 to OpenPLM 2.0
 ===========================================
 
 :Date: 2013-08-07
@@ -21,7 +21,7 @@ Django 1.5
 +++++++++++++++++
 
 OpenPLM 1.2 depends on Django 1.2 or Django 1.3,
-OpenPLM 1.3 requires Django 1.5.
+OpenPLM 2.0 requires Django 1.5.
 
     * ``pip install -U 'django==1.5'``
 
@@ -30,7 +30,7 @@ Celery 3.0 and Django-Celery 3.0
 
 
 OpenPLM 1.2 depends on Celery 2.3 or Celery 2.5,
-OpenPLM 1.3 is now compatible with Celery 3.0 which is the only version
+OpenPLM 2.0 is now compatible with Celery 3.0 which is the only version
 supported by OpenPLM.
 
     * ``pip install -U celery django-celery kombu``
@@ -284,12 +284,12 @@ Apache must serve the ``static/`` folder. It must also be able to write in the `
 
 Apache files look like:
 
-.. literalinclude:: ../apache/simple_1.3.conf
+.. literalinclude:: ../apache/simple_2.0.conf
     :language: apache
 
 SSL:
 
-.. literalinclude:: ../apache/ssl_1.3.conf
+.. literalinclude:: ../apache/ssl_2.0.conf
     :language: apache
 
 Ad the following lines if document3D application is installed (befor the ``<Location /media>`` line):

docs/en/devel/richtext.rst

@@ -4,13 +4,13 @@
 Rich text | Wiki syntax
 ==========================================================
 
-.. versionadded:: 1.3
+.. versionadded:: 2.0
 
 
 Introduction
 ================
 
-OpenPLM 1.3 introduces a wiki syntax to comments and some text fields.
+OpenPLM 2.0 introduces a wiki syntax to comments and some text fields.
 
 The code and this documentation speak about rich text instead of a
 wiki content as it is not really a wiki engine (no WikiLink automatically

docs/en/index.rst

@@ -42,7 +42,7 @@ Table of contents:
 
     resources
     glossary
-    whatsnew-1.3
+    whatsnew-2.0
     user/index
     admin/index
     devel/index

docs/en/whatsnew-1.3.rst → docs/en/whatsnew-2.0.rst

@@ -1,14 +1,14 @@
-.. _whatsnew-1.3:
+.. _whatsnew-2.0:
 
 .. Images come later, once you are sure you would not have to update them ;)
 
 =========================
-What's new in OpenPLM 1.3
+What's new in OpenPLM 2.0
 =========================
 
 .. warning::
 
-    OpenPLM 1.3 is still in development, you can read the 
+    OpenPLM 2.0 is still in development, you can read the 
     :ref:`previous release notes <whatsnew-1.2>`.
 
 
@@ -27,7 +27,7 @@ Notable changes:
 
     * Wiki syntax and Page document
     * Avatars
-    * 
+    * Interface enhancements 
 
 What's new for users
 =====================
@@ -50,23 +50,47 @@ The syntax is documented :ref:`on this page <user-richtext>`.
 
 A visual editor is available:
 
-.. figure:: /whatsnew/1.3/editor_compose.png
+.. figure:: /whatsnew/2.0/editor_compose.png
     :align: center
 
     The compose mode of the markdown editor.
 
 
-.. figure:: /whatsnew/1.3/editor_preview.png
+.. figure:: /whatsnew/2.0/editor_preview.png
     :align: center
 
     The preview mode of the markdown editor.
 
 
-.. figure:: /whatsnew/1.3/editor_result.png
+.. figure:: /whatsnew/2.0/editor_result.png
     :align: center
 
     The rendered content.
 
+Interface enhancements
++++++++++++++++++++++++
+
+All buttons have been redesigned.
+Their background colors depend on the consequences of their actions.
+For example, delete buttons have a red background and promote buttons
+have a green background.
+
+.. figure:: /whatsnew/2.0/attributes.png
+    :align: center
+
+    Icons and styles are based on Twitter Bootstrap.
+
+.. figure:: /whatsnew/2.0/toolbar.png
+    :align: center
+
+    The main toolbar
+
+.. figure:: /whatsnew/2.0/cards.png
+    :align: center
+
+    New cards
+
+
 Parts and documents: new *description* field
 ++++++++++++++++++++++++++++++++++++++++++++++
 
@@ -97,20 +121,20 @@ Avatars are visible on:
 
     * each user's page
 
-      .. image:: /whatsnew/1.3/avatar_profile.png
+      .. image:: /whatsnew/2.0/avatar_profile.png
 
     * each comment
 
-      .. image:: /whatsnew/1.3/avatar_comment.png
+      .. image:: /whatsnew/2.0/avatar_comment.png
 
     * each action of the timeline
 
 
-      .. image:: /whatsnew/1.3/avatar_timeline.png
+      .. image:: /whatsnew/2.0/avatar_timeline.png
 
     * each card (browse and navigate)
 
-      .. image:: /whatsnew/1.3/avatar_card.png
+      .. image:: /whatsnew/2.0/avatar_card.png
 
 
 To upload your avatar, simply edit your personal data on your user's page.
@@ -151,6 +175,11 @@ Moreover, it is possible to filter events based on their type (part, document an
 and by their author.
 
 
+.. figure:: /whatsnew/2.0/history.png
+    :align: center
+
+    History of a part
+
 Navigate: full screen display
 ++++++++++++++++++++++++++++++
 
@@ -165,7 +194,7 @@ The assembly tree of a STEP file is now displayed as a treeview.
 You can now display the 3D view in full screen mode.
 
 
-.. figure:: /whatsnew/1.3/3D_mendelmax.png
+.. figure:: /whatsnew/2.0/3D_mendelmax.png
     :align: center
 
     The model is done by `Brojt <http://www.thingiverse.com/thing:19782>`_.
@@ -191,7 +220,7 @@ What's new for administrators
 
 OpenPLM now requires Django 1.5. 
 Some dependencies and the settings file must be upgraded.
-Read the :doc:`instructions </admin/upgrade/upgrade-1.3>` before upgrading
+Read the :doc:`instructions </admin/upgrade/upgrade-2.0>` before upgrading
 your installation.
 
 

openPLM/__init__.py

@@ -1,7 +1,7 @@
 import os.path
 import re
 
-VERSION = (1, 3, 0, 'dev', 0)
+VERSION = (2, 0, 0, 'dev', 0)
 
 def get_svn_revision(path):
     """

openPLM/plmapp/models/document.py

@@ -291,7 +291,7 @@ def is_document(self):
     @classmethod
     def get_creation_score(cls, files):
         """
-        .. versionadded:: 1.3
+        .. versionadded:: 2.0
 
         Returns a score (an integer) computed from *files*.
         *files* is a list of :class:`PrivateFile` uploaded by a user
@@ -347,7 +347,7 @@ def get_all_documents_with_level(only_accept_files=False):
 
 def get_best_document_type(files):
     """
-    .. versionadded:: 1.3
+    .. versionadded:: 2.0
 
     Returns the document type (str) which returns the highest
     creation score for the uploaded files (list of :class:`PrivateFile`).

openPLM/plmapp/models/plmobject.py

@@ -152,7 +152,7 @@ class PLMObject(AbstractPLMObject):
 
         .. attribute:: description
 
-            .. versionadded:: 1.3
+            .. versionadded:: 2.0
 
             a short description of the object. This field is optional
             and is a richtext field.

openPLM/plmapp/views/api.py

@@ -484,7 +484,7 @@ def add_thumbnail(request, doc_id, df_id):
 @login_json
 def get_object(request, obj_id):
     """
-    .. versionadded:: 1.3
+    .. versionadded:: 2.0
 
     Returns basic fields of the :class:`.PLMObject` identified by *obj_id*.
 
@@ -502,7 +502,7 @@ def get_object(request, obj_id):
 @login_json
 def get_attached_parts(request, doc_id):
     """
-    .. versionadded:: 1.3
+    .. versionadded:: 2.0
 
     Returns parts attached to the :class:`.Document` identified by *doc_id*.
 
@@ -524,7 +524,7 @@ def get_attached_parts(request, doc_id):
 @login_json
 def get_attached_documents(request, part_id):
     """
-    .. versionadded:: 1.3
+    .. versionadded:: 2.0
 
     Returns documents attached to the :class:`.Part` identified by *part_id*.
 
@@ -545,7 +545,7 @@ def get_attached_documents(request, part_id):
 @login_json
 def lock_files(request):
     """
-    .. versionadded:: 1.3
+    .. versionadded:: 2.0
 
     Locks several files in one transactional block.