Roberto Rosario 080d68c169 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

2012-06-30 04:00:01 -04:00

..

locale

Update translation files

2012-06-17 19:14:23 -04:00

static/images/icons

Added new app 'project_setup' to display a setup dashboard style view instead of a secondary action list

2011-08-18 02:37:32 -04:00

__init__.py

Start top menu refactor, added elementtree to requirements

2012-03-16 21:07:53 -04:00

api.py

Converted project_setup and project_tools apps to use new elementtree based menus

2012-03-16 21:42:03 -04:00

models.py

Added new app 'project_setup' to display a setup dashboard style view instead of a secondary action list

2011-08-18 02:37:32 -04:00

urls.py

Added new app 'project_setup' to display a setup dashboard style view instead of a secondary action list

2011-08-18 02:37:32 -04:00

views.py

Clean up (unused imports, PEP8, etc)

2012-06-08 16:43:54 -04:00