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

..

conf

Add IMAP document souce support, merge with existing POP3 email support, make POP3MailLog generic

2012-03-14 01:25:49 -04:00

locale

Update translation files

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

management

PEP8 and general cleanups

2012-02-22 11:57:00 -04:00

migrations

Add IMAP document souce support, merge with existing POP3 email support, make POP3MailLog generic

2012-03-14 01:25:49 -04:00

static/images/icons

Add POP3 email creation, edit, delete views and links

2012-03-08 16:36:35 -04:00

__init__.py

Move sources app links to a separate file

2012-06-08 18:41:51 -04:00

admin.py

Cleanups, permissions separation into explicit module, absolute import update

2012-01-02 03:48:26 -04:00

compressed_file.py

Removed unused import, PEP8 cleanups

2011-08-12 02:13:23 -04:00

forms.py

Add IMAP document souce support, merge with existing POP3 email support, make POP3MailLog generic

2012-03-14 01:25:49 -04:00

links.py

Move sources app links to a separate file

2012-06-08 18:41:51 -04:00

literals.py

Add IMAP document souce support, merge with existing POP3 email support, make POP3MailLog generic

2012-03-14 01:25:49 -04:00

managers.py

Add IMAP document souce support, merge with existing POP3 email support, make POP3MailLog generic

2012-03-14 01:25:49 -04:00

models.py

Merge branch 'hotfix/v0.12.2' into development

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

permissions.py

Move the 'PERMISSION_DOCUMENT_NEW_VERSION' permission from the sources to the documents app

2012-01-03 04:26:31 -04:00

staging.py

Fix staging file filename hashing not working with unicode filenames

2012-03-04 20:31:09 -04:00

tasks.py

Add IMAP document souce support, merge with existing POP3 email support, make POP3MailLog generic

2012-03-14 01:25:49 -04:00

urls.py

Add IMAP document souce support, merge with existing POP3 email support, make POP3MailLog generic

2012-03-14 01:25:49 -04:00

utils.py

PEP8 cleanups, style cleanups, unused imports

2012-01-18 13:52:19 -04:00

views.py

Merge branch 'hotfix/v0.12.2' into development

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

widgets.py

Display staging file filename as a title when during preview, treat all staging files as a gallery

2012-02-14 23:46:42 -04:00