forked from philippWassibauer/django-threaded-messages
-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of github.com:Gidsy/django-threaded-messages
Conflicts: .gitignore
- Loading branch information
Showing
9 changed files
with
225 additions
and
53 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| *.pyc | ||
| dist/ | ||
| *.egg-info | ||
| *.egg-info |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| # file GENERATED by distutils, do NOT edit | ||
| LICENSE.txt | ||
| README.rst | ||
| setup.py | ||
| threaded_messages/__init__.py | ||
| threaded_messages/admin.py | ||
| threaded_messages/context_processors.py | ||
| threaded_messages/fields.py | ||
| threaded_messages/forms.py | ||
| threaded_messages/listeners.py | ||
| threaded_messages/management.py | ||
| threaded_messages/models.py | ||
| threaded_messages/search_indexes.py | ||
| threaded_messages/settings.py | ||
| threaded_messages/tests.py | ||
| threaded_messages/urls.py | ||
| threaded_messages/utils.py | ||
| threaded_messages/views.py | ||
| threaded_messages/locale/de/LC_MESSAGES/django.mo | ||
| threaded_messages/locale/de/LC_MESSAGES/django.po | ||
| threaded_messages/locale/en/LC_MESSAGES/django.po | ||
| threaded_messages/locale/es/LC_MESSAGES/django.po | ||
| threaded_messages/locale/fr/LC_MESSAGES/django.po | ||
| threaded_messages/locale/it/LC_MESSAGES/django.po | ||
| threaded_messages/migrations/0001_initial.py | ||
| threaded_messages/migrations/0002_auto__add_field_thread_sender.py | ||
| threaded_messages/migrations/0003_auto__add_field_thread_replied.py | ||
| threaded_messages/migrations/0004_auto.py | ||
| threaded_messages/migrations/__init__.py | ||
| threaded_messages/static/css/token-input.css | ||
| threaded_messages/static/js/jquery-1.5.2.min.js | ||
| threaded_messages/static/js/jquery.form.js | ||
| threaded_messages/static/js/jquery.tokeninput.js | ||
| threaded_messages/templates/django_messages/base.html | ||
| threaded_messages/templates/django_messages/compose.html | ||
| threaded_messages/templates/django_messages/inbox.html | ||
| threaded_messages/templates/django_messages/message_list_view.html | ||
| threaded_messages/templates/django_messages/message_reply.html | ||
| threaded_messages/templates/django_messages/modal_compose.html | ||
| threaded_messages/templates/django_messages/new_message.html | ||
| threaded_messages/templates/django_messages/outbox.html | ||
| threaded_messages/templates/django_messages/search.html | ||
| threaded_messages/templates/django_messages/trash.html | ||
| threaded_messages/templates/django_messages/view.html | ||
| threaded_messages/templatetags/__init__.py | ||
| threaded_messages/templatetags/inbox.py | ||
| threaded_messages/templatetags/truncchar_tag.py |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,2 @@ | ||
| VERSION = (0, 1, 30) | ||
| VERSION = (0, 1, 35) | ||
| __version__ = '.'.join(map(str, VERSION)) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,11 @@ | ||
| from django.conf import settings | ||
| from django.utils.translation import ugettext_noop as _ | ||
| from django.db.models import signals | ||
|
|
||
| if "notification" in settings.INSTALLED_APPS: | ||
| from notification import models as notification | ||
|
|
||
| def create_notice_types(app, created_models, verbosity, **kwargs): | ||
| notification.create_notice_type("received_email", _("Received a Message"), _("Someone has sent you a message")) | ||
| notification.create_notice_type("received_email", "Private messages", "(this is highly recommended)") | ||
| signals.post_syncdb.connect(create_notice_types, sender=notification) | ||
| else: | ||
| print "Skipping creation of NoticeTypes (Threaded Messages) as notification app not found" | ||
| print "Skipping creation of NoticeTypes (Threaded Messages) as notification app not found" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,117 @@ | ||
| # -*- coding: utf-8 -*- | ||
| import datetime | ||
| from south.db import db | ||
| from south.v2 import SchemaMigration | ||
| from django.db import models | ||
|
|
||
|
|
||
| class Migration(SchemaMigration): | ||
|
|
||
| def forwards(self, orm): | ||
| # Adding index on 'Participant', fields ['replied_at'] | ||
| db.create_index('threaded_messages_participant', ['replied_at']) | ||
|
|
||
| # Adding index on 'Participant', fields ['read_at'] | ||
| db.create_index('threaded_messages_participant', ['read_at']) | ||
|
|
||
| # Adding index on 'Participant', fields ['deleted_at'] | ||
| db.create_index('threaded_messages_participant', ['deleted_at']) | ||
|
|
||
| # Adding index on 'Message', fields ['sent_at'] | ||
| db.create_index('threaded_messages_message', ['sent_at']) | ||
|
|
||
|
|
||
| def backwards(self, orm): | ||
| # Removing index on 'Message', fields ['sent_at'] | ||
| db.delete_index('threaded_messages_message', ['sent_at']) | ||
|
|
||
| # Removing index on 'Participant', fields ['deleted_at'] | ||
| db.delete_index('threaded_messages_participant', ['deleted_at']) | ||
|
|
||
| # Removing index on 'Participant', fields ['read_at'] | ||
| db.delete_index('threaded_messages_participant', ['read_at']) | ||
|
|
||
| # Removing index on 'Participant', fields ['replied_at'] | ||
| db.delete_index('threaded_messages_participant', ['replied_at']) | ||
|
|
||
|
|
||
| models = { | ||
| 'actstream.action': { | ||
| 'Meta': {'ordering': "('-timestamp',)", 'object_name': 'Action'}, | ||
| 'action_object_content_type': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'action_object'", 'null': 'True', 'to': "orm['contenttypes.ContentType']"}), | ||
| 'action_object_object_id': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), | ||
| 'actor_content_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'actor'", 'to': "orm['contenttypes.ContentType']"}), | ||
| 'actor_object_id': ('django.db.models.fields.CharField', [], {'max_length': '255'}), | ||
| 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), | ||
| 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'public': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), | ||
| 'target_content_type': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'target'", 'null': 'True', 'to': "orm['contenttypes.ContentType']"}), | ||
| 'target_object_id': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), | ||
| 'timestamp': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), | ||
| 'verb': ('django.db.models.fields.CharField', [], {'max_length': '255'}) | ||
| }, | ||
| 'auth.group': { | ||
| 'Meta': {'object_name': 'Group'}, | ||
| 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), | ||
| 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) | ||
| }, | ||
| 'auth.permission': { | ||
| 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, | ||
| 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
| 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), | ||
| 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) | ||
| }, | ||
| 'auth.user': { | ||
| 'Meta': {'object_name': 'User'}, | ||
| 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), | ||
| 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), | ||
| 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), | ||
| 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), | ||
| 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), | ||
| 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
| 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
| 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), | ||
| 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), | ||
| 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), | ||
| 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), | ||
| 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) | ||
| }, | ||
| 'contenttypes.contenttype': { | ||
| 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, | ||
| 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
| 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
| 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) | ||
| }, | ||
| 'threaded_messages.message': { | ||
| 'Meta': {'ordering': "['-sent_at']", 'object_name': 'Message'}, | ||
| 'body': ('django.db.models.fields.TextField', [], {}), | ||
| 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'parent_msg': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'next_messages'", 'null': 'True', 'to': "orm['threaded_messages.Message']"}), | ||
| 'sender': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'sent_messages'", 'null': 'True', 'to': "orm['auth.User']"}), | ||
| 'sent_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}) | ||
| }, | ||
| 'threaded_messages.participant': { | ||
| 'Meta': {'ordering': "['thread']", 'object_name': 'Participant'}, | ||
| 'deleted_at': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), | ||
| 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'read_at': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), | ||
| 'replied_at': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), | ||
| 'thread': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'participants'", 'to': "orm['threaded_messages.Thread']"}), | ||
| 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'threads'", 'to': "orm['auth.User']"}) | ||
| }, | ||
| 'threaded_messages.thread': { | ||
| 'Meta': {'ordering': "['latest_msg']", 'object_name': 'Thread'}, | ||
| 'all_msgs': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'thread'", 'symmetrical': 'False', 'to': "orm['threaded_messages.Message']"}), | ||
| 'creator': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'created_threads'", 'to': "orm['auth.User']"}), | ||
| 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'latest_msg': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'thread_latest'", 'to': "orm['threaded_messages.Message']"}), | ||
| 'replied': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
| 'subject': ('django.db.models.fields.CharField', [], {'max_length': '120'}) | ||
| } | ||
| } | ||
|
|
||
| complete_apps = ['threaded_messages'] |
Oops, something went wrong.