mitri4
/
zuykov
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge commit 'afefcfc5c0d7c60eb406640e7b6a53852a4bed49' into dev

Browse Source
remotes/origin/dev
Dmitriy Shesterkin 9 years ago
parent 701de1f5d0 afefcfc5c0
commit 14362ddf3c
18 changed files with 324 additions and 303 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 45
      packages/aldryn_people/migrations/0004_auto_20150622_1606.py
  2. 28
      packages/aldryn_people/migrations/0005_auto_20170401_2345.py
  3. 6
      packages/aldryn_people/models.py
  4. 206
      packages/aldryn_segmentation/migrations/0001_initial.py
  5. 2
      packages/blog/migrations/0001_initial.py
  6. 20
      packages/blog/migrations/0010_auto_20170401_1032.py
  7. 20
      packages/blog/migrations/0011_auto_20170401_2345.py
  8. 1
      packages/blog/models.py
  9. 8
      packages/blog/templates/blog/post_detail.html
  10. 113
      packages/cmsplugin_tabs/migrations/0001_initial.py
  11. 78
      packages/country_segment/migrations/0001_initial.py
  12. 9
      packages/djangocms_forms/templates/djangocms_forms/form_template/default.html
  13. 1
      promo/fixtures/data.json
  14. 16
      promo/migrations/0001_initial.py
  15. 29
      requirements/common.txt
  16. 1
      trademark/fixtures/nice.json
  17. 24
      trademark/migrations/0001_initial.py
  18. 20
      trademark/migrations/0002_nice_glyph.py

45
packages/aldryn_people/migrations/0004_auto_20150622_1606.py
Unescape View File

@ -2,12 +2,13 @@
from __future__ import unicode_literals from __future__ import unicode_literals
from django.db import models, migrations from django.db import models, migrations
import filer
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('aldryn_people', '0003_auto_20150425_2103'), ('aldryn_people', '0003_auto_20150425_2103'),
('filer', '0002_auto_20150606_2003'),
] ]
operations = [ operations = [
@ -31,4 +32,46 @@ class Migration(migrations.Migration):
field=models.CharField(max_length=15, verbose_name='Language', db_index=True), field=models.CharField(max_length=15, verbose_name='Language', db_index=True),
preserve_default=True, preserve_default=True,
), ),
migrations.RemoveField(
model_name='group',
name='address',
),
migrations.RemoveField(
model_name='group',
name='city',
),
migrations.RemoveField(
model_name='person',
name='name',
),
migrations.AddField(
model_name='grouptranslation',
name='address',
field=models.TextField(verbose_name='address', blank=True),
preserve_default=True,
),
migrations.AddField(
model_name='grouptranslation',
name='city',
field=models.CharField(max_length=255, verbose_name='city', blank=True),
preserve_default=True,
),
migrations.AddField(
model_name='person',
name='visual_portrait',
field=filer.fields.image.FilerImageField(related_name='visual_portrait', on_delete=models.deletion.SET_NULL, default=None, blank=True, to='filer.Image', null=True),
preserve_default=True,
),
migrations.AddField(
model_name='persontranslation',
name='name',
field=models.CharField(default='', max_length=255, verbose_name='name'),
preserve_default=False,
),
migrations.AlterField(
model_name='person',
name='visual',
field=filer.fields.image.FilerImageField(related_name='visual', on_delete=models.deletion.SET_NULL, default=None, blank=True, to='filer.Image', null=True),
preserve_default=True,
)
] ]

28
packages/aldryn_people/migrations/0005_auto_20170401_2345.py
Unescape View File

@ -0,0 +1,28 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
from django.conf import settings
import aldryn_common.admin_fields.sortedm2m
class Migration(migrations.Migration):
dependencies = [
('aldryn_people', '0004_auto_20150622_1606'),
]
operations = [
migrations.AlterField(
model_name='peopleplugin',
name='people',
field=aldryn_common.admin_fields.sortedm2m.SortedM2MModelField(help_text=None, to='aldryn_people.Person', blank=True),
preserve_default=True,
),
migrations.AlterField(
model_name='person',
name='user',
field=models.OneToOneField(null=True, blank=True, to=settings.AUTH_USER_MODEL),
preserve_default=True,
),
]

6
packages/aldryn_people/models.py
Unescape View File

@ -104,9 +104,9 @@ class Person(TranslatableModel):
unique=True) unique=True)
vcard_enabled = models.BooleanField( vcard_enabled = models.BooleanField(
verbose_name=_('enable vCard download'), default=True) verbose_name=_('enable vCard download'), default=True)
user = models.ForeignKey( user = models.OneToOneField(
getattr(settings, 'AUTH_USER_MODEL', 'auth.User'), getattr(settings, 'AUTH_USER_MODEL', 'auth.User'),
null=True, blank=True, unique=True) null=True, blank=True)
class Meta: class Meta:
verbose_name = _('Person') verbose_name = _('Person')
@ -218,7 +218,7 @@ class BasePeoplePlugin(CMSPlugin):
_('Style'), choices=STYLE_CHOICES, _('Style'), choices=STYLE_CHOICES,
default=STYLE_CHOICES[0][0], max_length=50) default=STYLE_CHOICES[0][0], max_length=50)
people = aldryn_common.admin_fields.sortedm2m.SortedM2MModelField( people = aldryn_common.admin_fields.sortedm2m.SortedM2MModelField(
Person, blank=True, null=True) Person, blank=True)
group_by_group = models.BooleanField( group_by_group = models.BooleanField(
verbose_name=_('group by group'), verbose_name=_('group by group'),
default=True, default=True,

206
packages/aldryn_segmentation/migrations/0001_initial.py
Unescape View File

@ -1,125 +1,83 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from south.utils import datetime_utils as datetime from __future__ import unicode_literals
from south.db import db
from south.v2 import SchemaMigration from django.db import models, migrations
from django.db import models
class Migration(migrations.Migration):
class Migration(SchemaMigration):
dependencies = [
def forwards(self, orm): ('cms', '0012_auto_20150607_2207'),
# Adding model 'SegmentLimitPluginModel' ]
db.create_table(u'aldryn_segmentation_segmentlimitpluginmodel', (
(u'cmsplugin_ptr', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['cms.CMSPlugin'], unique=True, primary_key=True)), operations = [
('label', self.gf('django.db.models.fields.CharField')(default=u'', max_length=128, blank=True)), migrations.CreateModel(
('max_children', self.gf('django.db.models.fields.PositiveIntegerField')(default=1)), name='Segment',
)) fields=[
db.send_create_signal(u'aldryn_segmentation', ['SegmentLimitPluginModel']) ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
],
# Adding model 'FallbackSegmentPluginModel' options={
db.create_table(u'aldryn_segmentation_fallbacksegmentpluginmodel', ( 'managed': False,
(u'cmsplugin_ptr', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['cms.CMSPlugin'], unique=True, primary_key=True)), },
('label', self.gf('django.db.models.fields.CharField')(default=u'', max_length=128, blank=True)), bases=(models.Model,),
)) ),
db.send_create_signal(u'aldryn_segmentation', ['FallbackSegmentPluginModel']) migrations.CreateModel(
name='AuthenticatedSegmentPluginModel',
# Adding model 'SwitchSegmentPluginModel' fields=[
db.create_table(u'aldryn_segmentation_switchsegmentpluginmodel', ( ('cmsplugin_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='cms.CMSPlugin')),
(u'cmsplugin_ptr', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['cms.CMSPlugin'], unique=True, primary_key=True)), ('label', models.CharField(default='', max_length=128, verbose_name='label', blank=True)),
('label', self.gf('django.db.models.fields.CharField')(default=u'', max_length=128, blank=True)), ],
('on_off', self.gf('django.db.models.fields.BooleanField')(default=True)), options={
)) 'abstract': False,
db.send_create_signal(u'aldryn_segmentation', ['SwitchSegmentPluginModel']) },
bases=('cms.cmsplugin',),
# Adding model 'CookieSegmentPluginModel' ),
db.create_table(u'aldryn_segmentation_cookiesegmentpluginmodel', ( migrations.CreateModel(
(u'cmsplugin_ptr', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['cms.CMSPlugin'], unique=True, primary_key=True)), name='CookieSegmentPluginModel',
('label', self.gf('django.db.models.fields.CharField')(default=u'', max_length=128, blank=True)), fields=[
('cookie_key', self.gf('django.db.models.fields.CharField')(default=u'', max_length=4096)), ('cmsplugin_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='cms.CMSPlugin')),
('cookie_value', self.gf('django.db.models.fields.CharField')(default=u'', max_length=4096)), ('label', models.CharField(default='', max_length=128, verbose_name='label', blank=True)),
)) ('cookie_key', models.CharField(default='', help_text='Name of cookie to consider.', max_length=4096, verbose_name='name of cookie')),
db.send_create_signal(u'aldryn_segmentation', ['CookieSegmentPluginModel']) ('cookie_value', models.CharField(default='', help_text='Value to consider.', max_length=4096, verbose_name='value to compare')),
],
# Adding model 'AuthenticatedSegmentPluginModel' options={
db.create_table(u'aldryn_segmentation_authenticatedsegmentpluginmodel', ( 'abstract': False,
(u'cmsplugin_ptr', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['cms.CMSPlugin'], unique=True, primary_key=True)), },
('label', self.gf('django.db.models.fields.CharField')(default=u'', max_length=128, blank=True)), bases=('cms.cmsplugin',),
)) ),
db.send_create_signal(u'aldryn_segmentation', ['AuthenticatedSegmentPluginModel']) migrations.CreateModel(
name='FallbackSegmentPluginModel',
fields=[
def backwards(self, orm): ('cmsplugin_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='cms.CMSPlugin')),
# Deleting model 'SegmentLimitPluginModel' ('label', models.CharField(default='', max_length=128, verbose_name='label', blank=True)),
db.delete_table(u'aldryn_segmentation_segmentlimitpluginmodel') ],
options={
# Deleting model 'FallbackSegmentPluginModel' 'abstract': False,
db.delete_table(u'aldryn_segmentation_fallbacksegmentpluginmodel') },
bases=('cms.cmsplugin',),
# Deleting model 'SwitchSegmentPluginModel' ),
db.delete_table(u'aldryn_segmentation_switchsegmentpluginmodel') migrations.CreateModel(
name='SegmentLimitPluginModel',
# Deleting model 'CookieSegmentPluginModel' fields=[
db.delete_table(u'aldryn_segmentation_cookiesegmentpluginmodel') ('cmsplugin_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='cms.CMSPlugin')),
('label', models.CharField(default='', help_text='Optionally set a label for this limit block.', max_length=128, verbose_name='label', blank=True)),
# Deleting model 'AuthenticatedSegmentPluginModel' ('max_children', models.PositiveIntegerField(default=1, help_text='Display up to how many matching segments?', verbose_name='# of matches to display')),
db.delete_table(u'aldryn_segmentation_authenticatedsegmentpluginmodel') ],
options={
'abstract': False,
models = { },
u'aldryn_segmentation.authenticatedsegmentpluginmodel': { bases=('cms.cmsplugin',),
'Meta': {'object_name': 'AuthenticatedSegmentPluginModel'}, ),
u'cmsplugin_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['cms.CMSPlugin']", 'unique': 'True', 'primary_key': 'True'}), migrations.CreateModel(
'label': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '128', 'blank': 'True'}) name='SwitchSegmentPluginModel',
}, fields=[
u'aldryn_segmentation.cookiesegmentpluginmodel': { ('cmsplugin_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='cms.CMSPlugin')),
'Meta': {'object_name': 'CookieSegmentPluginModel'}, ('label', models.CharField(default='', max_length=128, verbose_name='label', blank=True)),
u'cmsplugin_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['cms.CMSPlugin']", 'unique': 'True', 'primary_key': 'True'}), ('on_off', models.BooleanField(default=True, help_text='Uncheck to always hide child plugins.', verbose_name='Always on?')),
'cookie_key': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '4096'}), ],
'cookie_value': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '4096'}), options={
'label': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '128', 'blank': 'True'}) 'abstract': False,
}, },
u'aldryn_segmentation.fallbacksegmentpluginmodel': { bases=('cms.cmsplugin',),
'Meta': {'object_name': 'FallbackSegmentPluginModel'}, ),
u'cmsplugin_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['cms.CMSPlugin']", 'unique': 'True', 'primary_key': 'True'}), ]
'label': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '128', 'blank': 'True'})
},
u'aldryn_segmentation.segment': {
'Meta': {'object_name': 'Segment', 'managed': 'False'},
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
},
u'aldryn_segmentation.segmentlimitpluginmodel': {
'Meta': {'object_name': 'SegmentLimitPluginModel', '_ormbases': ['cms.CMSPlugin']},
u'cmsplugin_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['cms.CMSPlugin']", 'unique': 'True', 'primary_key': 'True'}),
'label': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '128', 'blank': 'True'}),
'max_children': ('django.db.models.fields.PositiveIntegerField', [], {'default': '1'})
},
u'aldryn_segmentation.switchsegmentpluginmodel': {
'Meta': {'object_name': 'SwitchSegmentPluginModel'},
u'cmsplugin_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['cms.CMSPlugin']", 'unique': 'True', 'primary_key': 'True'}),
'label': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '128', 'blank': 'True'}),
'on_off': ('django.db.models.fields.BooleanField', [], {'default': 'True'})
},
'cms.cmsplugin': {
'Meta': {'object_name': 'CMSPlugin'},
'changed_date': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
'creation_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'language': ('django.db.models.fields.CharField', [], {'max_length': '15', 'db_index': 'True'}),
'level': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
'lft': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['cms.CMSPlugin']", 'null': 'True', 'blank': 'True'}),
'placeholder': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['cms.Placeholder']", 'null': 'True'}),
'plugin_type': ('django.db.models.fields.CharField', [], {'max_length': '50', 'db_index': 'True'}),
'position': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True', 'blank': 'True'}),
'rght': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
'tree_id': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'})
},
'cms.placeholder': {
'Meta': {'object_name': 'Placeholder'},
'default_width': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True'}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'slot': ('django.db.models.fields.CharField', [], {'max_length': '50', 'db_index': 'True'})
}
}
complete_apps = ['aldryn_segmentation']

2
packages/blog/migrations/0001_initial.py
Unescape View File

@ -19,7 +19,7 @@ class Migration(migrations.Migration):
('cms', '0003_auto_20140926_2347'), ('cms', '0003_auto_20140926_2347'),
('taggit', '__first__'), ('taggit', '__first__'),
('filer', '0001_initial'), ('filer', '0001_initial'),
('cmsplugin_filer_image', '0001_initial'), # ('cmsplugin_filer_image', '0001_initial'),
] ]
operations = [ operations = [

20
packages/blog/migrations/0010_auto_20170401_1032.py
Unescape View File

@ -0,0 +1,20 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
class Migration(migrations.Migration):
dependencies = [
('blog', '0009_auto_20150726_2021'),
]
operations = [
migrations.AlterField(
model_name='post',
name='author',
field=models.ForeignKey(related_name='blog_post_author', verbose_name='Author', blank=True, to='aldryn_people.Person', null=True),
preserve_default=True,
),
]

20
packages/blog/migrations/0011_auto_20170401_2345.py
Unescape View File

@ -0,0 +1,20 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
class Migration(migrations.Migration):
dependencies = [
('blog', '0010_auto_20170401_1032'),
]
operations = [
migrations.AlterField(
model_name='post',
name='sites',
field=models.ManyToManyField(help_text='Select sites in which to show the post. If none is set it will be visible in all the configured sites.', to='sites.Site', verbose_name='Site(s)', blank=True),
preserve_default=True,
),
]

1
packages/blog/models.py
Unescape View File

@ -107,7 +107,6 @@ class Post(ModelMeta, TranslatableModel):
default=get_setting('ENABLE_COMMENTS') default=get_setting('ENABLE_COMMENTS')
) )
sites = models.ManyToManyField(Site, verbose_name=_(u'Site(s)'), blank=True, sites = models.ManyToManyField(Site, verbose_name=_(u'Site(s)'), blank=True,
null=True,
help_text=_(u'Select sites in which to show the post. ' help_text=_(u'Select sites in which to show the post. '
u'If none is set it will be ' u'If none is set it will be '
u'visible in all the configured sites.') u'visible in all the configured sites.')

8
packages/blog/templates/blog/post_detail.html
Unescape View File

@ -13,11 +13,11 @@
</ul> </ul>
{% endblock breadcrumb %} {% endblock breadcrumb %}
{% block content_blog %}{% spaceless %} {% block content_blog %}
<article id="post-{{ post.slug }}" class="post-item post-detail"> <article id="post-{{ post.slug }}" class="post-item post-detail">
<content> <content>
<header> <header>
<h1>{% render_model post "title" %}</h1> <h1>{{ post.title }}</h1>
<p class="date">{{ post.date_published|date:"DATE_FORMAT" }}</p> <p class="date">{{ post.date_published|date:"DATE_FORMAT" }}</p>
</header> </header>
{% if post.main_image_id %} {% if post.main_image_id %}
@ -26,9 +26,9 @@
<img src="{{ thumb.url }}" alt="{{ post.main_image.default_alt_text }}" width="{{ thumb.width }}" height="{{ thumb.height }}" /> <img src="{{ thumb.url }}" alt="{{ post.main_image.default_alt_text }}" width="{{ thumb.width }}" height="{{ thumb.height }}" />
</div> </div>
{% endif %} {% endif %}
{% endspaceless %}
<div class="blog-content">{% render_model post "abstract" %}</div>
<div class="blog-content">{{ post.abstract|safe }}</div>
</content> </content>
<side> <side>
<author> <author>

113
packages/cmsplugin_tabs/migrations/0001_initial.py
Unescape View File

@ -1,71 +1,44 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import datetime from __future__ import unicode_literals
from south.db import db
from south.v2 import SchemaMigration from django.db import models, migrations
from django.db import models import tinymce.models
class Migration(SchemaMigration): class Migration(migrations.Migration):
def forwards(self, orm): dependencies = [
# Adding model 'CMSTabsList' ('cms', '0003_auto_20140926_2347'),
db.create_table('cmsplugin_cmstabslist', ( ]
('cmsplugin_ptr', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['cms.CMSPlugin'], unique=True, primary_key=True)),
)) operations = [
db.send_create_signal('cmsplugin_tabs', ['CMSTabsList']) migrations.CreateModel(
name='CMSTabsList',
# Adding model 'SingleTab' fields=[
db.create_table('cmsplugin_tabs_singletab', ( ('cmsplugin_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='cms.CMSPlugin')),
('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), ('template', models.CharField(default=b'cmsplugin_tabs/tabs.html', max_length=255, verbose_name='Template', choices=[(b'cmsplugin_tabs/tabs.html', 'Tabs'), (b'cmsplugin_tabs/accordion.html', 'Accordion')])),
('plugin', self.gf('django.db.models.fields.related.ForeignKey')(related_name='tabs', to=orm['cmsplugin_tabs.CMSTabsList'])), ],
('title', self.gf('django.db.models.fields.CharField')(max_length=32)), options={
('content', self.gf('django.db.models.fields.TextField')()), 'abstract': False,
('order', self.gf('django.db.models.fields.PositiveIntegerField')(default=1, db_index=True)), },
)) bases=('cms.cmsplugin',),
db.send_create_signal('cmsplugin_tabs', ['SingleTab']) ),
migrations.CreateModel(
name='SingleTab',
def backwards(self, orm): fields=[
# Deleting model 'CMSTabsList' ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
db.delete_table('cmsplugin_cmstabslist') ('title', models.CharField(max_length=255, verbose_name='Title')),
('content', tinymce.models.HTMLField(verbose_name='Content')),
# Deleting model 'SingleTab' ('slug', models.SlugField(default=b'', max_length=32, verbose_name='Slug', blank=True)),
db.delete_table('cmsplugin_tabs_singletab') ('order', models.PositiveIntegerField(default=1, verbose_name='Order', db_index=True)),
('is_strong', models.BooleanField(default=False, help_text='When True then label of the tab will be bold', verbose_name='Strong')),
('plugin', models.ForeignKey(related_name='tabs', to='cmsplugin_tabs.CMSTabsList')),
models = { ],
'cms.cmsplugin': { options={
'Meta': {'object_name': 'CMSPlugin'}, 'ordering': ['order'],
'creation_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), 'verbose_name': 'Tab',
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'verbose_name_plural': 'Tabs',
'language': ('django.db.models.fields.CharField', [], {'max_length': '15', 'db_index': 'True'}), },
'level': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}), bases=(models.Model,),
'lft': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}), ),
'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['cms.CMSPlugin']", 'null': 'True', 'blank': 'True'}), ]
'placeholder': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['cms.Placeholder']", 'null': 'True'}),
'plugin_type': ('django.db.models.fields.CharField', [], {'max_length': '50', 'db_index': 'True'}),
'position': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True', 'blank': 'True'}),
'rght': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
'tree_id': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'})
},
'cms.placeholder': {
'Meta': {'object_name': 'Placeholder'},
'default_width': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True'}),
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'slot': ('django.db.models.fields.CharField', [], {'max_length': '50', 'db_index': 'True'})
},
'cmsplugin_tabs.cmstabslist': {
'Meta': {'object_name': 'CMSTabsList', 'db_table': "'cmsplugin_cmstabslist'", '_ormbases': ['cms.CMSPlugin']},
'cmsplugin_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['cms.CMSPlugin']", 'unique': 'True', 'primary_key': 'True'})
},
'cmsplugin_tabs.singletab': {
'Meta': {'ordering': "['order']", 'object_name': 'SingleTab'},
'content': ('django.db.models.fields.TextField', [], {}),
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'order': ('django.db.models.fields.PositiveIntegerField', [], {'default': '1', 'db_index': 'True'}),
'plugin': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'tabs'", 'to': "orm['cmsplugin_tabs.CMSTabsList']"}),
'title': ('django.db.models.fields.CharField', [], {'max_length': '32'})
}
}
complete_apps = ['cmsplugin_tabs']

78
packages/country_segment/migrations/0001_initial.py
View File

File diff suppressed because one or more lines are too long

9
packages/djangocms_forms/templates/djangocms_forms/form_template/default.html
Unescape View File

@ -93,13 +93,4 @@ var form = {
</div> </div>
</div> </div>
{% addtoblock "js" %}
<script src="{% static 'js/djangocms_forms/libs/jquery.form.min.js' %}"></script>
<script src="{% static 'js/djangocms_forms/djangocms_forms.js' %}"></script>
<script type="application/javascript">
$(function() {
$('.forms').djangocms_forms();
});
</script>
{% endaddtoblock %}

1
promo/fixtures/data.json
View File

File diff suppressed because one or more lines are too long

16
promo/migrations/0001_initial.py
Unescape View File

@ -5,7 +5,7 @@ from django.db import models, migrations
import django.db.models.deletion import django.db.models.deletion
import parler.models import parler.models
import djangocms_text_ckeditor.fields import djangocms_text_ckeditor.fields
import cms
class Migration(migrations.Migration): class Migration(migrations.Migration):
operations = [ operations = [
@ -43,4 +43,18 @@ class Migration(migrations.Migration):
name='promotranslation', name='promotranslation',
unique_together=set([('language_code', 'master')]), unique_together=set([('language_code', 'master')]),
), ),
migrations.AlterModelOptions(
name='promo',
options={'verbose_name': 'promo', 'verbose_name_plural': 'promos'},
),
migrations.RemoveField(
model_name='promotranslation',
name='title',
),
migrations.AlterField(
model_name='promo',
name='page_link',
field=cms.models.fields.PageField(on_delete=models.deletion.SET_NULL, blank=True, to='cms.Page', help_text='A link to a page has priority over a text link.', null=True, verbose_name='page'),
preserve_default=True,
),
] ]

29
requirements/common.txt
Unescape View File

@ -1,24 +1,24 @@
aldryn-apphooks-config==0.2.6 aldryn-apphooks-config==0.2.6
aldryn-boilerplates==0.7.3 aldryn-boilerplates==0.7.4
aldryn-bootstrap3==0.5.2 aldryn-bootstrap3==1.1.2 # Up: 1.04.2017
aldryn-common==0.1.4 aldryn-common==1.0.4 # Up: 1.04.2017
aldryn-translation-tools==0.2.1 aldryn-translation-tools==0.2.1
cmsplugin-filer==0.10.2 cmsplugin-filer==1.0.1
dj-database-url==0.3.0 dj-database-url==0.3.0
Django==1.7.8 Django==1.7.11
django-admin-enhancer==1.0.0 django-admin-enhancer==1.0.0
django-admin-extend==0.0.3 django-admin-extend==0.0.3
django-appconf==1.0.1 django-appconf==1.0.2
django-appdata==0.1.4 django-appdata==0.1.5
django-classy-tags==0.6.2 django-classy-tags==0.6.2
django-cms==3.1.3 django-cms==3.2.5
django-durationfield==0.5.2 django-durationfield==0.5.2
django-easy-select2==1.3.3 django-easy-select2==1.3.3
django-filer==0.9.12 django-filer==1.1.1
django-formtools==1.0 django-formtools==1.0
django-ipware==1.1.1 django-ipware==1.1.1
django-meta==0.3.1 django-meta==1.3.2
django-meta-mixin==0.2.1 django-meta-mixin==0.3.0
django-mptt==0.7.4 django-mptt==0.7.4
django-multipleformwizard==0.2.16 django-multipleformwizard==0.2.16
django-parler==1.5.1 django-parler==1.5.1
@ -26,7 +26,7 @@ django-phonenumber-field==0.7.2
django-pipeline==1.6.12 django-pipeline==1.6.12
django-polymorphic==0.7.2 django-polymorphic==0.7.2
django-reversion==1.9.3 django-reversion==1.9.3
django-sekizai==0.8.2 django-sekizai==0.10.0
Django-Select2==4.3.2 Django-Select2==4.3.2
django-sortedm2m==1.0.2 django-sortedm2m==1.0.2
django-taggit==0.17.3 django-taggit==0.17.3
@ -38,13 +38,13 @@ djangocms-column==1.5
djangocms-file==0.1 djangocms-file==0.1
djangocms-flash==0.2.0 djangocms-flash==0.2.0
djangocms-googlemap==0.3 djangocms-googlemap==0.3
djangocms-inherit==0.1 djangocms-inherit==0.1.1
djangocms-installer==0.8.1 djangocms-installer==0.8.1
djangocms-link==1.7.1 djangocms-link==1.7.1
djangocms-picture==0.1 djangocms-picture==0.1
djangocms-style==1.5 djangocms-style==1.5
djangocms-teaser==0.1 djangocms-teaser==0.1
djangocms-text-ckeditor==2.6.0 djangocms-text-ckeditor==2.8.1
djangocms-video==0.1 djangocms-video==0.1
easy-thumbnails==2.2 easy-thumbnails==2.2
futures==3.0.3 futures==3.0.3
@ -63,7 +63,6 @@ pytz==2015.7
pyuca==1.1 pyuca==1.1
requests==2.8.1 requests==2.8.1
six==1.10.0 six==1.10.0
South==1.0.2
sqlparse==0.1.18 sqlparse==0.1.18
tablib==0.10.0 tablib==0.10.0
tzlocal==1.2 tzlocal==1.2

1
trademark/fixtures/nice.json
View File

File diff suppressed because one or more lines are too long

24
trademark/migrations/0001_initial.py
Unescape View File

@ -137,4 +137,28 @@ class Migration(migrations.Migration):
field=models.ManyToManyField(to='trademark.Trademark', through='trademark.SearchResult'), field=models.ManyToManyField(to='trademark.Trademark', through='trademark.SearchResult'),
preserve_default=True, preserve_default=True,
), ),
migrations.AddField(
model_name='nice',
name='glyph',
field=models.CharField(default='', max_length=255),
preserve_default=False,
),
migrations.AlterField(
model_name='trademark',
name='application_id',
field=models.CharField(max_length=50, null=True),
preserve_default=True,
),
migrations.AlterField(
model_name='trademark',
name='cert_id',
field=models.CharField(max_length=50, null=True),
preserve_default=True,
),
migrations.AlterField(
model_name='trademark',
name='ext_id',
field=models.CharField(unique=True, max_length=50),
preserve_default=True,
),
] ]

20
trademark/migrations/0002_nice_glyph.py
Unescape View File

@ -1,20 +0,0 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
class Migration(migrations.Migration):
dependencies = [
('trademark', '0001_initial'),
]
operations = [
migrations.AddField(
model_name='nice',
name='glyph',
field=models.CharField(default='', max_length=255),
preserve_default=False,
),
]
Write Preview
Loading…
Cancel
Save