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
This commit is contained in:
Roberto Rosario
2012-06-30 04:00:01 -04:00
438 changed files with 12762 additions and 4473 deletions

View File

@@ -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::