Merge branch 'hotfix/v0.12.2' into development

Conflicts:
	apps/common/__init__.py
	apps/documents/forms.py
	apps/feedback/__init__.py
	apps/history/__init__.py
	apps/main/__init__.py
	apps/scheduler/api.py
	apps/sources/models.py
	docs/releases/index.rst
	requirements/production.txt
	settings.py
	urls.py

docs/conf.py

@@ -52,10 +52,10 @@ copyright = u'2011, Roberto Rosario'
 # built documents.
 #
 # The short X.Y version.
-version = '0.12.1'
+version = '0.12.2'
 
 # The full version, including alpha/beta/rc tags.
-release = '0.12.1'
+release = '0.12.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

docs/credits/contributors.rst

@@ -69,6 +69,11 @@ Translations
 
   - mic (https://www.transifex.net/accounts/profile/mic/)
 
+* German
+
+  - Tetja Rediske
+  - Tilmann Sittig
+  
 
 Remote access for debugging
 ---------------------------

docs/index.rst

@@ -6,7 +6,7 @@ Mayan EDMS documentation
 ========================
 
 .. rubric:: `Open source`_, Django_ based document manager with custom
-            metadata_ indexing_, file serving integration, OCR_ capabilities,
+            metadata_ indexing_, file serving integration, `checking out and in`_, OCR_ capabilities,
             document versioning_ and `digital signature verification`_.
 
 .. _Django: http://www.djangoproject.com/
@@ -16,6 +16,7 @@ Mayan EDMS documentation
 .. _metadata: http://en.wikipedia.org/wiki/Metadata
 .. _indexing: http://en.wikipedia.org/wiki/Index_card
 .. _Open source: http://en.wikipedia.org/wiki/Open_source
+.. _checking out and in: http://en.wikipedia.org/wiki/Revision_control
 
 On the Web
 =====================
@@ -54,7 +55,7 @@ Understanding Mayan EDMS
 Between versions
 ================
 .. toctree::
-    :maxdepth: 2
+    :maxdepth: 1
     
     releases/index 
     

docs/intro/installation.rst

@@ -120,7 +120,7 @@ If using ``PostgreSQL``, enter the following::
 
 Populate the database with the project's schema doing::
 
-    $ ./manage.py syncdb --migrate
+    $ ./manage.py syncdb --migrate --noinput
     
 To test your installation, create a file called settings_local.py with the following content::
 
@@ -193,7 +193,7 @@ If using ``PostgreSQL``, enter the following::
 
 Populate the database with the project's schema doing::
 
-    $ ./manage.py syncdb --migrate
+    $ ./manage.py syncdb --migrate --noinput
     
 To test your installation, create a file called settings_local.py with the following content::
 
@@ -283,7 +283,7 @@ To install **Mayan EDMS** on Webfaction_, follow these steps:
 
 6. Create the database schema::
 
-    $ ./manage.py syncdb --migrate
+    $ ./manage.py syncdb --migrate --noinput
 
 7. Collect the static files of the apps::
 

docs/releases/0.12.2.rst

@@ -0,0 +1,114 @@
+================================
+Mayan EDMS v0.12.2 release notes
+================================
+
+*June 2012*
+
+This is the second maintenance release of the 0.12 series.
+
+Overview
+========
+
+
+As with the previous release bug fixes and minor feature were the focus
+for this release too.  `issue #24`_ has been fixed and document
+check outs have been added too as per the feature request posted as `issue #26`_.
+The way the history events for a document are presented has been improved and
+it is now more useful as it provides filtering by event type.  To improve
+the diagnosis of installation of runtime error a simple view showing the
+number of internal interval jobs being used by Mayan EDMS as well as a 
+new app which shows a detail of the current installation enviroment were added.
+
+What's new in Mayan EDMS v0.12.2
+================================
+
+Smarter auto admin creation
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+**Mayan EDMS** creates a administrator user during the
+database creation phase to reduce the amount of steps required for a
+functional install.  The creation of this account is controlled by the configuration
+option :setting:`COMMON_AUTO_CREATE_ADMIN`, the username of the account is
+specified with the configuration option :setting:`COMMON_AUTO_ADMIN_USERNAME`
+and the password of this account by the option :setting:`COMMON_AUTO_ADMIN_PASSWORD`.
+Previously the :setting:`COMMON_AUTO_ADMIN_PASSWORD` defaulted to 'admin' which
+created an administrator account of username 'admin' with a password of
+'admin'.  The new default is to randomize an initial password and show this password
+at the login screen until the administrator password is changed.
+
+.. image:: mayan_first_login.png
+ :alt: First login dialog
+
+Document check outs
+~~~~~~~~~~~~~~~~~~~
+As per the feature request filed under `issue #26`_, a new document
+check out and check in functionality has been added.  Users can now
+check out a document and lock new version of it from being uploaded to avoid
+editing conflicts.  Document check outs have an expiration period after which
+**Mayan EDMS** will automatically check them back in to avoid a permanent
+document lockout.  Only the user who has checked out a document can upload
+new versions of it or check the document back in before the expiration period,
+unless being granted the ``Allow overriding check out restrictions`` or 
+``Forcefully check in documents`` permission respectively.
+
+Installation environment app
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Diagnosting remote installations of web based applications without access to the
+command line can be a bit hard, to alleviate this situation a new installation
+environment details app has been added.  The purpose of this app is to provide
+support staff information about the physical environment where **Mayan EDMS** has
+been installed.  To avoid possible security compromises only administrators
+can access this app.
+
+Editable compressed documents filename
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Previously when downloading more than one document in a compressed manner,
+**Mayan EDMS** would produce a file with the name ``document_bundle.zip`` for
+download.  A different filename can now be specified at the same download dialog.
+
+German translation
+~~~~~~~~~~~~~~~~~~
+A German language translation has been added thanks to Tetja Rediske
+and Tilmann Sittig.
+
+Statistics gathering
+~~~~~~~~~~~~~~~~~~~~
+Previous attempts at gathering usage statistics have been met with deficient results.
+User participation in surveys as well as the quality of the data entered by users
+was disappointing.  That is why this version of **Mayan EDMS** features an
+anonymous statistics gathering functionality.
+
+
+Upgrading from a previous version
+=================================
+
+Start off by adding the new requirements::
+
+    $ pip install -r requirements/production.txt
+
+Migrate existing database schema with::
+
+    $ ./manage.py migrate common 0001 --fake
+    $ ./manage.py migrate common
+    $ ./manage.py migrate checkouts
+    $ ./manage.py migrate installation
+
+The upgrade procedure is now complete.
+
+
+Backward incompatible changes
+=============================
+* None
+
+Bugs fixed
+==========
+* `issue #24`_ "Duplicated filename extension when uploading a new version of a document"
+* `issue #26`_ "checkout feature request"
+
+Stuff removed
+=============  
+* Feedback app
+
+
+
+.. _issue #24: https://github.com/rosarior/mayan/issues/24
+.. _issue #26: https://github.com/rosarior/mayan/issues/26

docs/releases/index.rst

@@ -17,6 +17,7 @@ Latest version (0.13)
    :maxdepth: 1
 
    0.13
+   0.12.2
    0.12.1
    0.12
 

docs/topics/document_visualization.rst

@@ -21,7 +21,6 @@ previews are then created on demand for the different sizes requested
 (thumbnail, page preview, full preview) and rotated interactively
 in the details view.
 
-
 Office document conversion however won't always work as expected because
 LibreOffice_ do not provide proper API's, so subprocess calling,
 temporary files and other black magic needs to be invoked to get it
@@ -30,6 +29,13 @@ or frames, and text extraction and OCR is done per page not per document,
 thats why even text documents need to be rendered by LibreOffice_
 before they can be previewed and text can be extracted.
 
+Version 0.12.1 introduced a new method of converting office documents, this
+new method doesn't require the use of the command line utility ``UNOCONV``.
+If this new method proves to continue working better than previous solutions the use
+of ``UNOCONV`` may be deprecated in the future.  The new conversion method
+adds just one new configuration option: :setting:`CONVERTER_LIBREOFFICE_PATH`
+which defaults to '/usr/bin/libreoffice'.
+
 
 .. _PDF: http://en.wikipedia.org/wiki/Portable_Document_Format
 .. _LibreOffice: http://www.libreoffice.org/

docs/topics/ocr.rst

@@ -10,9 +10,12 @@ processing by settings this options to 0, with other machines or cloud
 instances then connected to the same database doing the OCR processing.
 The document is checked to see if there are text parsers available, is
 no parser is available for that file type then the document is passed
-to tesseract page by page and the results stored per page, this is to
+to Tesseract_ page by page and the results stored per page, this is to
 keep the page image in sync with the transcribed text.  However when
 viewing the document in the details tab all the pages text are
-concatenated and shown to the user. Setting the :setting:`OCR_AUTOMATIC_OCR`
-option to ``True`` would cause all newly uploaded documents to be
-queued automatically for OCR.
+concatenated and shown to the user.  All newly uploaded documents will be
+queued automatically for OCR, if this is not desired setting the :setting:`OCR_AUTOMATIC_OCR`
+option to ``False`` would stop this behavior.
+
+
+.. _Tesseract: http://code.google.com/p/tesseract-ocr/

docs/topics/settings.rst

@@ -454,9 +454,9 @@ Username of the automatically created superuser
 
 **COMMON_AUTO_ADMIN_PASSWORD**
 
-Default: ``admin`` 
+Default: Random generated password
 
-Default password of the automatically created superuser
+The password of the automatically created superuser
     
 
 .. setting:: COMMON_LOGIN_METHOD

docs/topics/signatures.rst

@@ -22,3 +22,11 @@ functionality in the ``Setup menu``
 From this menu, key servers can be queried 
 and the results imported.  Public keys no longer needed can also be deleted 
 from this menu.
+
+Only `GNU Privacy Guard`_ signatures are support at the moment.  In case 
+your installation of GnuPG is non-standard, you can use the :setting:`SIGNATURES_GPG_HOME`
+configuration option to let **Mayan EDMS** find your GPG instance's home directory, used to
+store keyrings and other GPG configuration files.
+
+
+.. _`GNU Privacy Guard`: www.gnupg.org/