Merge lp:~diddledani/loco-team-portal/django-1.8 into lp:loco-team-portal

Proposed by Dani Llewellyn
Status: Needs review
Proposed branch: lp:~diddledani/loco-team-portal/django-1.8
Merge into: lp:loco-team-portal
Diff against target: 9903 lines (+1780/-5831)
163 files modified
Makefile (+5/-3)
loco_directory/app/feeds.py (+12/-0)
loco_directory/app/local_settings.py.sample (+1/-1)
loco_directory/app/settings.py (+7/-3)
loco_directory/app/urls.py (+2/-13)
loco_directory/articles/migrations/0001_initial.py (+55/-164)
loco_directory/articles/migrations/0002_auto_20160816_0016.py (+24/-0)
loco_directory/articles/migrations/0002_auto__del_field_article_snippet__add_field_article_content.py (+0/-153)
loco_directory/articles/models.py (+1/-1)
loco_directory/articles/urls.py (+1/-1)
loco_directory/common/management/commands/init.py (+1/-1)
loco_directory/common/mixins.py (+6/-5)
loco_directory/common/widgets.py (+1/-2)
loco_directory/django.wsgi (+1/-1)
loco_directory/events/feeds.py (+4/-2)
loco_directory/events/forms.py (+12/-8)
loco_directory/events/migrations/0001_initial.py (+91/-205)
loco_directory/events/migrations/0002_add_profile_fields.py (+0/-170)
loco_directory/events/migrations/0002_auto_20160815_2321.py (+24/-0)
loco_directory/events/migrations/0003_auto_20160815_2328.py (+44/-0)
loco_directory/events/migrations/0003_migrate_profile_data.py (+0/-173)
loco_directory/events/migrations/0004_auto_20160815_2334.py (+29/-0)
loco_directory/events/migrations/0004_remove_user.py (+0/-181)
loco_directory/events/migrations/0005_allow_external_registration.py (+0/-166)
loco_directory/events/migrations/0005_teamevent_registration.py (+20/-0)
loco_directory/events/migrations/0006_auto_20160815_2352.py (+40/-0)
loco_directory/events/migrations/0006_event_channel.py (+0/-169)
loco_directory/events/migrations/0007_auto_20160815_2359.py (+47/-0)
loco_directory/events/migrations/0007_event_contact.py (+0/-171)
loco_directory/events/migrations/0008_add_global_event_channel.py (+0/-183)
loco_directory/events/migrations/0008_auto_20160816_0011.py (+36/-0)
loco_directory/events/migrations/0009_auto_20160816_0019.py (+28/-0)
loco_directory/events/migrations/0009_global_event_activities.py (+0/-184)
loco_directory/events/migrations/0010_auto__chg_field_attendee_guests.py (+0/-184)
loco_directory/events/migrations/0011_auto__add_field_teamevent_created_by.py (+0/-185)
loco_directory/events/models.py (+15/-8)
loco_directory/events/urls.py (+1/-1)
loco_directory/events/views.py (+30/-28)
loco_directory/manage.py (+6/-8)
loco_directory/meetings/feeds.py (+4/-2)
loco_directory/meetings/forms.py (+11/-7)
loco_directory/meetings/migrations/0001_add_meetings.py (+0/-153)
loco_directory/meetings/migrations/0001_initial.py (+40/-0)
loco_directory/meetings/migrations/0002_auto_20160815_2342.py (+45/-0)
loco_directory/meetings/migrations/0002_channel_logs.py (+0/-135)
loco_directory/meetings/migrations/0003_add_chair.py (+0/-130)
loco_directory/meetings/migrations/0003_auto_20160815_2344.py (+19/-0)
loco_directory/meetings/migrations/0004_add_agenda.py (+0/-152)
loco_directory/meetings/migrations/0004_basemeeting_minutes.py (+20/-0)
loco_directory/meetings/migrations/0005_add_meeting_minutes.py (+0/-142)
loco_directory/meetings/migrations/0005_auto_20160815_2352.py (+33/-0)
loco_directory/meetings/migrations/0006_add_timezone.py (+0/-154)
loco_directory/meetings/migrations/0006_teammeeting_meeting_tz.py (+20/-0)
loco_directory/meetings/migrations/0007_auto_20160815_2359.py (+69/-0)
loco_directory/meetings/models.py (+14/-6)
loco_directory/meetings/urls.py (+1/-1)
loco_directory/meetings/views.py (+15/-14)
loco_directory/services/__init__.py (+4/-4)
loco_directory/services/urls.py (+1/-1)
loco_directory/teams/feeds.py (+3/-2)
loco_directory/teams/migrations/0001_initial.py (+57/-89)
loco_directory/teams/migrations/0002_add_mugshot_field.py (+0/-52)
loco_directory/teams/migrations/0002_auto_20160815_2321.py (+45/-0)
loco_directory/teams/migrations/0003_add_countries.py (+0/-94)
loco_directory/teams/migrations/0003_auto_20160815_2324.py (+32/-0)
loco_directory/teams/migrations/0004_add_languages.py (+0/-81)
loco_directory/teams/migrations/0004_auto_20160815_2328.py (+44/-0)
loco_directory/teams/migrations/0005_add_profile_fields.py (+0/-142)
loco_directory/teams/migrations/0005_team_flickr_id.py (+20/-0)
loco_directory/teams/migrations/0006_auto_20160815_2330.py (+19/-0)
loco_directory/teams/migrations/0006_migrate_profile_fields.py (+0/-142)
loco_directory/teams/migrations/0007_auto_20160815_2334.py (+31/-0)
loco_directory/teams/migrations/0007_remove_old_person_fields.py (+0/-136)
loco_directory/teams/migrations/0008_add_flickr_field.py (+0/-111)
loco_directory/teams/migrations/0008_team_active.py (+20/-0)
loco_directory/teams/migrations/0009_auto_20160815_2339.py (+22/-0)
loco_directory/teams/migrations/0009_change_slug_field.py (+0/-115)
loco_directory/teams/migrations/0010_add_photos_feed_fields.py (+0/-121)
loco_directory/teams/migrations/0010_team_microbloghashtag.py (+20/-0)
loco_directory/teams/migrations/0011_add_team_active.py (+0/-116)
loco_directory/teams/migrations/0011_auto_20160815_2347.py (+19/-0)
loco_directory/teams/migrations/0012_add_team_microbloghashtag.py (+0/-117)
loco_directory/teams/migrations/0012_auto_20160815_2352.py (+24/-0)
loco_directory/teams/migrations/0013_add_timezone.py (+0/-119)
loco_directory/teams/migrations/0013_team_tz.py (+20/-0)
loco_directory/teams/migrations/0014_add_display_name.py (+0/-125)
loco_directory/teams/migrations/0014_team_override_name.py (+20/-0)
loco_directory/teams/migrations/0015_auto_20160816_0011.py (+19/-0)
loco_directory/teams/migrations/0015_auto__chg_field_team_name.py (+0/-125)
loco_directory/teams/migrations/0016_auto_20160816_0022.py (+19/-0)
loco_directory/teams/migrations/0016_auto__chg_field_team_picasa_id.py (+0/-125)
loco_directory/teams/models.py (+5/-5)
loco_directory/teams/urls.py (+1/-1)
loco_directory/teams/views.py (+13/-12)
loco_directory/templates/404.html (+3/-3)
loco_directory/templates/about_loco.html (+3/-3)
loco_directory/templates/articles/article_detail.html (+2/-2)
loco_directory/templates/base.html (+9/-9)
loco_directory/templates/events/event_history_list.html (+1/-1)
loco_directory/templates/events/event_list.html (+7/-7)
loco_directory/templates/events/global_event_detail.html (+5/-5)
loco_directory/templates/events/global_event_detail.inc.html (+1/-1)
loco_directory/templates/events/global_event_detail_attending_teamevents.inc.html (+2/-2)
loco_directory/templates/events/global_jam_dashboard.html (+5/-5)
loco_directory/templates/events/team_event_comment_new.inc.html (+1/-1)
loco_directory/templates/events/team_event_detail.html (+4/-4)
loco_directory/templates/events/team_event_detail.inc.html (+14/-12)
loco_directory/templates/events/team_event_detail_attendee.inc.html (+2/-2)
loco_directory/templates/events/team_event_detail_comments.inc.html (+10/-8)
loco_directory/templates/events/team_event_li.inc.html (+4/-2)
loco_directory/templates/events/team_event_list.inc.html (+5/-3)
loco_directory/templates/events/team_event_register.html (+1/-1)
loco_directory/templates/events/team_event_update.html (+1/-1)
loco_directory/templates/index.html (+11/-11)
loco_directory/templates/lc_edit.html (+2/-2)
loco_directory/templates/loco_council.html (+10/-8)
loco_directory/templates/loco_setup.html (+1/-1)
loco_directory/templates/meetings/agenda_item_delete_confirm.html (+2/-2)
loco_directory/templates/meetings/agenda_item_new.html (+1/-1)
loco_directory/templates/meetings/agenda_item_update.html (+4/-4)
loco_directory/templates/meetings/meeting_history_list.html (+1/-1)
loco_directory/templates/meetings/meeting_list.html (+3/-3)
loco_directory/templates/meetings/team_meeting_detail.html (+5/-5)
loco_directory/templates/meetings/team_meeting_detail_agenda.inc.html (+3/-3)
loco_directory/templates/meetings/team_meeting_detail_basic.inc.html (+9/-7)
loco_directory/templates/meetings/team_meeting_li.inc.html (+4/-2)
loco_directory/templates/meetings/team_meeting_list.inc.html (+5/-3)
loco_directory/templates/meetings/team_meeting_update.html (+1/-1)
loco_directory/templates/profiles/details.html (+13/-7)
loco_directory/templates/teams/merge_teams.html (+1/-1)
loco_directory/templates/teams/select_other_team.html (+1/-1)
loco_directory/templates/teams/team_detail.html (+24/-22)
loco_directory/templates/teams/team_event_history.html (+23/-21)
loco_directory/templates/teams/team_event_list.html (+4/-4)
loco_directory/templates/teams/team_meeting_history.html (+23/-21)
loco_directory/templates/teams/team_meeting_list.html (+3/-3)
loco_directory/templates/teams/team_reapprovals.html (+2/-2)
loco_directory/templates/venues/venue_detail.html (+7/-5)
loco_directory/userprofiles/migrations/0001_initial.py (+36/-89)
loco_directory/userprofiles/migrations/0002_add_mugshot.py (+0/-75)
loco_directory/userprofiles/migrations/0002_auto_20160815_2339.py (+18/-0)
loco_directory/userprofiles/migrations/0003_userprofile_mugshot.py (+20/-0)
loco_directory/userprofiles/models.py (+3/-3)
loco_directory/userprofiles/urls.py (+1/-1)
loco_directory/userprofiles/views.py (+1/-1)
loco_directory/venues/migrations/0001_initial.py (+31/-49)
loco_directory/venues/migrations/0002_add_unique_together.py (+0/-44)
loco_directory/venues/migrations/0002_auto_20160815_2320.py (+18/-0)
loco_directory/venues/migrations/0003_add_country.py (+0/-47)
loco_directory/venues/migrations/0003_auto_20160815_2321.py (+20/-0)
loco_directory/venues/migrations/0004_remove_venue_map_field.py (+0/-46)
loco_directory/venues/migrations/0004_remove_venue_map_url.py (+18/-0)
loco_directory/venues/migrations/0005_add_spr.py (+0/-47)
loco_directory/venues/migrations/0005_venue_spr.py (+20/-0)
loco_directory/venues/migrations/0006_add_venue_timezone.py (+0/-48)
loco_directory/venues/migrations/0006_venue_tz.py (+20/-0)
loco_directory/venues/migrations/0007_auto_20160816_0001.py (+26/-0)
loco_directory/venues/migrations/0007_auto__add_field_venue_continent.py (+0/-50)
loco_directory/venues/models.py (+1/-1)
loco_directory/venues/urls.py (+1/-1)
loco_directory/venues/views.py (+2/-1)
requirements/dev.txt (+4/-5)
requirements/prod.txt (+4/-5)
To merge this branch: bzr merge lp:~diddledani/loco-team-portal/django-1.8
Reviewer Review Type Date Requested Status
LoCo Team Portal Developers Pending
Review via email: mp+302983@code.launchpad.net

Description of the change

update to django 1.8

1.8 is a long-term support branch of dhango so we're now good until 2018
excepting any security-vulnerability patching

To post a comment you must log in.

Unmerged revisions

86. By Dani Llewellyn

update django to 1.8 and fix the nuclear fallout

85. By Dani Llewellyn

movidy Makefile to fake initial migrations

84. By Dani Llewellyn

merge my django-1.5 branch

83. By Dani Llewellyn

merge remainder of trunk

82. By Dani Llewellyn

convert migrations from revision 615

81. By Dani Llewellyn

convert migrations from revision 611

80. By Dani Llewellyn

convert migrations from revision 578

79. By Dani Llewellyn

convert migrations from revision 517

78. By Dani Llewellyn

convert migrations from revision 476

77. By Dani Llewellyn

convert migrations from revision 475

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2016-02-12 00:54:37 +0000
3+++ Makefile 2016-08-16 07:31:30 +0000
4@@ -24,8 +24,10 @@
5
6 loco_directory/loco_directory.db: env apps
7 wget http://people.ubuntu.com/~daker/ltp/ltp.db -O loco_directory/ltp.db
8- $(django_manage) syncdb
9- $(django_manage) migrate
10+ $(django_manage) migrate --fake teams 0004_auto_20160815_2328
11+ $(django_manage) migrate --fake events 0003_auto_20160815_2328
12+ $(django_manage) migrate --fake meetings 0002_auto_20160815_2342
13+ $(django_manage) migrate --fake-initial
14
15 db: loco_directory/loco_directory.db
16
17@@ -46,7 +48,7 @@
18 rm -rf lp_data/
19 rm -rf data/
20 rm -rf loco_directory/bzr_apps/
21- rm loco_directory/loco_directory.db
22+ rm loco_directory/ltp.db
23
24 depends:
25 apt-get install python2.7 python2.7-dev python-virtualenv libjs-jquery libjs-jquery-ui iso-codes gettext
26
27=== removed file 'loco_directory/__init__.py'
28=== added directory 'loco_directory/app'
29=== added file 'loco_directory/app/__init__.py'
30=== added file 'loco_directory/app/feeds.py'
31--- loco_directory/app/feeds.py 1970-01-01 00:00:00 +0000
32+++ loco_directory/app/feeds.py 2016-08-16 07:31:30 +0000
33@@ -0,0 +1,12 @@
34+from django.conf.urls import *
35+
36+from events.feeds import TeamEventFeed, GlobalEventFeed
37+from meetings.feeds import TeamMeetingFeed
38+from teams.feeds import TeamFeed
39+
40+urlpatterns = patterns('',
41+ url(r'^teams/(?P<bits>.*)$', TeamFeed()),
42+ url(r'^events/(?P<bits>.*)$', TeamEventFeed()),
43+ url(r'^globalevents/(?P<bits>.*)$', GlobalEventFeed()),
44+ url(r'^meetings/(?P<bits>.*)$', TeamMeetingFeed()),
45+)
46
47=== renamed file 'loco_directory/local_settings.py.sample' => 'loco_directory/app/local_settings.py.sample'
48--- loco_directory/local_settings.py.sample 2012-12-26 16:16:17 +0000
49+++ loco_directory/app/local_settings.py.sample 2016-08-16 07:31:30 +0000
50@@ -9,7 +9,7 @@
51 },
52 }
53
54-SECRET_KEY = ''
55+SECRET_KEY = 'abc123'
56
57 DEBUG_USERS = ('')
58
59
60=== renamed file 'loco_directory/settings.py' => 'loco_directory/app/settings.py'
61--- loco_directory/settings.py 2013-03-31 01:10:52 +0000
62+++ loco_directory/app/settings.py 2016-08-16 07:31:30 +0000
63@@ -39,7 +39,7 @@
64 log.error('Missing library: %s, Install package: %s\n' % (module, package))
65 sys.exit(1)
66
67-PROJECT_PATH = os.path.dirname(os.path.abspath(__file__))
68+PROJECT_PATH = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
69
70 DEBUG = True
71 TEMPLATE_DEBUG = DEBUG
72@@ -70,6 +70,7 @@
73 # If running in a Windows environment this must be set to the same as your
74 # system time zone.
75 TIME_ZONE = 'UTC'
76+USE_TZ = True
77
78 # Language code for this installation. All choices can be found here:
79 # http://www.i18nguy.com/unicode/language-identifiers.html
80@@ -109,11 +110,13 @@
81 'django.middleware.locale.LocaleMiddleware',
82 'django.middleware.common.CommonMiddleware',
83 'django.contrib.auth.middleware.AuthenticationMiddleware',
84+ 'django.contrib.messages.middleware.MessageMiddleware',
85 )
86
87 # list with template context processors. see http://docs.djangoproject.com/en/dev/ref/settings/#template-context-processors
88 TEMPLATE_CONTEXT_PROCESSORS = (
89 "django.contrib.auth.context_processors.auth",
90+ "django.contrib.messages.context_processors.messages",
91 "django.core.context_processors.debug",
92 "django.core.context_processors.i18n",
93 "django.core.context_processors.media",
94@@ -128,7 +131,7 @@
95 "common.context_processors.languages_menu",
96 )
97
98-ROOT_URLCONF = 'loco_directory.urls'
99+ROOT_URLCONF = 'app.urls'
100
101 TEMPLATE_DIRS = (
102 # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
103@@ -151,6 +154,7 @@
104 'django.contrib.contenttypes',
105 'django.contrib.sessions',
106 'django.contrib.admin',
107+ 'django.contrib.messages',
108 'common',
109 'teams',
110 'venues',
111@@ -159,7 +163,6 @@
112 'articles',
113 'userprofiles',
114 'django_openid_auth',
115- 'south',
116 ]
117
118 AUTHENTICATION_BACKENDS = (
119@@ -169,6 +172,7 @@
120
121 AUTH_PROFILE_MODULE = 'userprofiles.UserProfile'
122
123+SESSION_SERIALIZER = 'django.contrib.sessions.serializers.PickleSerializer'
124
125 OPENID_STRICT_USERNAMES = True
126 OPENID_FOLLOW_RENAMES = True
127
128=== renamed file 'loco_directory/urls.py' => 'loco_directory/app/urls.py'
129--- loco_directory/urls.py 2013-10-30 00:31:14 +0000
130+++ loco_directory/app/urls.py 2016-08-16 07:31:30 +0000
131@@ -1,4 +1,4 @@
132-from django.conf.urls.defaults import *
133+from django.conf.urls import *
134 from django.conf import settings
135 from django.contrib import admin
136 import ubuntu_website
137@@ -7,17 +7,6 @@
138
139 admin.autodiscover()
140
141-from events.feeds import TeamEventFeed, GlobalEventFeed
142-from meetings.feeds import TeamMeetingFeed
143-from teams.feeds import TeamFeed
144-
145-feeds = {
146- 'teams': TeamFeed,
147- 'events': TeamEventFeed,
148- 'globalevents': GlobalEventFeed,
149- 'meetings': TeamMeetingFeed,
150-}
151-
152 urlpatterns = patterns('',
153 url(r'^$', 'common.views.index', name='home'),
154 url(r'^language/', 'common.views.set_language', name='set_language'),
155@@ -42,7 +31,7 @@
156 url(r'^jsi18n', 'django.views.i18n.javascript_catalog', name='jsi18n'),
157 url(r'^services/', include('services.urls')),
158 url(r'^search/', 'common.views.site_search', name='site_search'),
159- url(r'^feeds/(?P<url>.*)/$', 'django.contrib.syndication.views.feed', {'feed_dict': feeds}, name='feed_view'),
160+ url(r'^feeds/', include('app.feeds')),
161 url(r'^', include('userprofiles.urls')),
162 )
163
164
165=== renamed file 'loco_directory/version.py' => 'loco_directory/app/version.py'
166=== modified file 'loco_directory/articles/migrations/0001_initial.py'
167--- loco_directory/articles/migrations/0001_initial.py 2011-06-01 22:19:20 +0000
168+++ loco_directory/articles/migrations/0001_initial.py 2016-08-16 07:31:30 +0000
169@@ -1,164 +1,55 @@
170-
171-from south.db import db
172-from django.db import models
173-from articles.models import *
174-
175-class Migration:
176-
177- def forwards(self, orm):
178-
179- # Adding model 'Feed'
180- db.create_table('articles_feed', (
181- ('id', orm['articles.Feed:id']),
182- ('user', orm['articles.Feed:user']),
183- ('team', orm['articles.Feed:team']),
184- ('url', orm['articles.Feed:url']),
185- ('title', orm['articles.Feed:title']),
186- ('last_updated', orm['articles.Feed:last_updated']),
187- ('active', orm['articles.Feed:active']),
188- ))
189- db.send_create_signal('articles', ['Feed'])
190-
191- # Adding model 'Article'
192- db.create_table('articles_article', (
193- ('id', orm['articles.Article:id']),
194- ('source', orm['articles.Article:source']),
195- ('uid', orm['articles.Article:uid']),
196- ('author', orm['articles.Article:author']),
197- ('published', orm['articles.Article:published']),
198- ('imported', orm['articles.Article:imported']),
199- ('link', orm['articles.Article:link']),
200- ('title', orm['articles.Article:title']),
201- ('snippet', orm['articles.Article:snippet']),
202- ))
203- db.send_create_signal('articles', ['Article'])
204-
205-
206-
207- def backwards(self, orm):
208-
209- # Deleting model 'Feed'
210- db.delete_table('articles_feed')
211-
212- # Deleting model 'Article'
213- db.delete_table('articles_article')
214-
215-
216-
217- models = {
218- 'articles.article': {
219- 'author': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
220- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
221- 'imported': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
222- 'link': ('django.db.models.fields.URLField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
223- 'published': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
224- 'snippet': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
225- 'source': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['articles.Feed']", 'null': 'True', 'blank': 'True'}),
226- 'title': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
227- 'uid': ('django.db.models.fields.CharField', [], {'max_length': '256'})
228- },
229- 'articles.feed': {
230- 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}),
231- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
232- 'last_updated': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(1970, 1, 1, 0, 0)'}),
233- 'team': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['teams.Team']", 'null': 'True', 'blank': 'True'}),
234- 'title': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
235- 'url': ('django.db.models.fields.URLField', [], {'max_length': '200'}),
236- 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True', 'blank': 'True'})
237- },
238- 'auth.group': {
239- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
240- 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
241- 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'blank': 'True'})
242- },
243- 'auth.permission': {
244- 'Meta': {'unique_together': "(('content_type', 'codename'),)"},
245- 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
246- 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
247- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
248- 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
249- },
250- 'auth.user': {
251- 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
252- 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
253- 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
254- 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'blank': 'True'}),
255- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
256- 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}),
257- 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
258- 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
259- 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
260- 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
261- 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
262- 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'blank': 'True'}),
263- 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
264- },
265- 'contenttypes.contenttype': {
266- 'Meta': {'unique_together': "(('app_label', 'model'),)", 'db_table': "'django_content_type'"},
267- 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
268- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
269- 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
270- 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
271- },
272- 'teams.continent': {
273- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
274- 'name': ('django.db.models.fields.TextField', [], {'max_length': '50'})
275- },
276- 'teams.country': {
277- 'continents': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Continent']"}),
278- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
279- 'name': ('django.db.models.fields.TextField', [], {'max_length': '100'})
280- },
281- 'teams.language': {
282- 'code': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True'}),
283- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
284- 'name': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True'})
285- },
286- 'teams.team': {
287- 'Meta': {'db_table': "'teams'"},
288- 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}),
289- 'admin_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['userprofiles.UserProfile']"}),
290- 'approved': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
291- 'approved_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
292- 'city': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
293- 'contact_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['userprofiles.UserProfile']"}),
294- 'countries': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Country']"}),
295- 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
296- 'expires_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
297- 'flickr_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
298- 'forum_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
299- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
300- 'irc_chan': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}),
301- 'languages': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Language']"}),
302- 'lp_name': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True'}),
303- 'microbloghashtag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
304- 'ml_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
305- 'mugshot_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
306- 'name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'null': 'True'}),
307- 'owner_profile': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'owner'", 'null': 'True', 'to': "orm['userprofiles.UserProfile']"}),
308- 'picasa_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
309- 'pixie_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
310- 'provides_support': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}),
311- 'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
312- 'web_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
313- 'wiki_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
314- },
315- 'userprofiles.userprofile': {
316- 'aim': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
317- 'blog': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
318- 'facebook': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
319- 'flickr': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
320- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
321- 'identica': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
322- 'irc': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
323- 'mugshot': ('django.db.models.fields.URLField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}),
324- 'picasa': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
325- 'realname': ('django.db.models.fields.CharField', [], {'max_length': '150', 'blank': 'True'}),
326- 'twitter': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
327- 'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}),
328- 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}),
329- 'xmpp': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'})
330- }
331- }
332-
333- complete_apps = ['articles']
334+# -*- coding: utf-8 -*-
335+from __future__ import unicode_literals
336+
337+from django.db import models, migrations
338+import datetime
339+
340+
341+class Migration(migrations.Migration):
342+
343+ dependencies = [
344+ ('userprofiles', '0003_userprofile_mugshot'),
345+ ('teams', '0013_team_tz'),
346+ ]
347+
348+ operations = [
349+ migrations.CreateModel(
350+ name='Article',
351+ fields=[
352+ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
353+ ('uid', models.CharField(max_length=256)),
354+ ('author', models.CharField(max_length=128, null=True, blank=True)),
355+ ('published', models.DateTimeField(null=True, blank=True)),
356+ ('imported', models.DateTimeField(null=True, blank=True)),
357+ ('link', models.URLField(max_length=1024, null=True, blank=True)),
358+ ('title', models.CharField(max_length=128, null=True, blank=True)),
359+ ('snippet', models.CharField(max_length=512, null=True, blank=True)),
360+ ],
361+ options={
362+ 'ordering': ['-imported', '-published'],
363+ },
364+ bases=(models.Model,),
365+ ),
366+ migrations.CreateModel(
367+ name='Feed',
368+ fields=[
369+ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
370+ ('url', models.URLField()),
371+ ('title', models.CharField(max_length=128, null=True, blank=True)),
372+ ('last_updated', models.DateTimeField(default=datetime.datetime(1970, 1, 1, 0, 0))),
373+ ('active', models.BooleanField(default=True)),
374+ ('team', models.ForeignKey(blank=True, to='teams.Team', null=True)),
375+ ('user', models.ForeignKey(blank=True, to='userprofiles.UserProfile', null=True)),
376+ ],
377+ options={
378+ 'ordering': ('title',),
379+ },
380+ bases=(models.Model,),
381+ ),
382+ migrations.AddField(
383+ model_name='article',
384+ name='source',
385+ field=models.ForeignKey(blank=True, to='articles.Feed', null=True),
386+ preserve_default=True,
387+ ),
388+ ]
389
390=== added file 'loco_directory/articles/migrations/0002_auto_20160816_0016.py'
391--- loco_directory/articles/migrations/0002_auto_20160816_0016.py 1970-01-01 00:00:00 +0000
392+++ loco_directory/articles/migrations/0002_auto_20160816_0016.py 2016-08-16 07:31:30 +0000
393@@ -0,0 +1,24 @@
394+# -*- coding: utf-8 -*-
395+from __future__ import unicode_literals
396+
397+from django.db import models, migrations
398+
399+
400+class Migration(migrations.Migration):
401+
402+ dependencies = [
403+ ('articles', '0001_initial'),
404+ ]
405+
406+ operations = [
407+ migrations.RemoveField(
408+ model_name='article',
409+ name='snippet',
410+ ),
411+ migrations.AddField(
412+ model_name='article',
413+ name='content',
414+ field=models.TextField(null=True, blank=True),
415+ preserve_default=True,
416+ ),
417+ ]
418
419=== removed file 'loco_directory/articles/migrations/0002_auto__del_field_article_snippet__add_field_article_content.py'
420--- loco_directory/articles/migrations/0002_auto__del_field_article_snippet__add_field_article_content.py 2012-12-12 22:38:29 +0000
421+++ loco_directory/articles/migrations/0002_auto__del_field_article_snippet__add_field_article_content.py 1970-01-01 00:00:00 +0000
422@@ -1,153 +0,0 @@
423-# encoding: utf-8
424-import datetime
425-from south.db import db
426-from south.v2 import SchemaMigration
427-from django.db import models
428-
429-class Migration(SchemaMigration):
430-
431- def forwards(self, orm):
432-
433- # Deleting field 'article.snippet'
434- db.delete_column('articles_article', 'snippet')
435-
436- # Adding field 'Article.content'
437- db.add_column('articles_article', 'content', self.gf('django.db.models.fields.TextField')(null=True, blank=True), keep_default=False)
438-
439-
440- def backwards(self, orm):
441-
442- # Adding field 'article.snippet'
443- db.add_column('articles_article', 'snippet', self.gf('django.db.models.fields.CharField')(max_length=512, null=True, blank=True), keep_default=False)
444-
445- # Deleting field 'Article.content'
446- db.delete_column('articles_article', 'content')
447-
448-
449- models = {
450- 'articles.article': {
451- 'Meta': {'ordering': "['-imported', '-published']", 'object_name': 'Article'},
452- 'author': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
453- 'content': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
454- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
455- 'imported': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
456- 'link': ('django.db.models.fields.URLField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
457- 'published': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
458- 'source': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['articles.Feed']", 'null': 'True', 'blank': 'True'}),
459- 'title': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
460- 'uid': ('django.db.models.fields.CharField', [], {'max_length': '256'})
461- },
462- 'articles.feed': {
463- 'Meta': {'ordering': "('title',)", 'object_name': 'Feed'},
464- 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
465- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
466- 'last_updated': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(1970, 1, 1, 0, 0)'}),
467- 'team': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['teams.Team']", 'null': 'True', 'blank': 'True'}),
468- 'title': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
469- 'url': ('django.db.models.fields.URLField', [], {'max_length': '200'}),
470- 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True', 'blank': 'True'})
471- },
472- 'auth.group': {
473- 'Meta': {'object_name': 'Group'},
474- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
475- 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
476- 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
477- },
478- 'auth.permission': {
479- 'Meta': {'ordering': "('content_type__app_label', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
480- 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
481- 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
482- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
483- 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
484- },
485- 'auth.user': {
486- 'Meta': {'object_name': 'User'},
487- 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
488- 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
489- 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
490- 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
491- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
492- 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
493- 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
494- 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
495- 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
496- 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
497- 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
498- 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
499- 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
500- },
501- 'contenttypes.contenttype': {
502- 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
503- 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
504- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
505- 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
506- 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
507- },
508- 'teams.continent': {
509- 'Meta': {'ordering': "('name',)", 'object_name': 'Continent'},
510- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
511- 'name': ('django.db.models.fields.TextField', [], {'max_length': '50'})
512- },
513- 'teams.country': {
514- 'Meta': {'ordering': "('name',)", 'object_name': 'Country'},
515- 'continents': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Continent']", 'symmetrical': 'False'}),
516- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
517- 'name': ('django.db.models.fields.TextField', [], {'max_length': '100'})
518- },
519- 'teams.language': {
520- 'Meta': {'ordering': "('name',)", 'object_name': 'Language'},
521- 'code': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True'}),
522- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
523- 'name': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True'})
524- },
525- 'teams.team': {
526- 'Meta': {'ordering': "('approved', 'name')", 'object_name': 'Team', 'db_table': "'teams'"},
527- 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
528- 'admin_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'admins'", 'symmetrical': 'False', 'to': "orm['userprofiles.UserProfile']"}),
529- 'approved': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
530- 'approved_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
531- 'city': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
532- 'contact_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'contacts'", 'symmetrical': 'False', 'to': "orm['userprofiles.UserProfile']"}),
533- 'countries': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Country']", 'symmetrical': 'False'}),
534- 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
535- 'expires_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
536- 'flickr_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
537- 'forum_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
538- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
539- 'irc_chan': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}),
540- 'languages': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Language']", 'symmetrical': 'False'}),
541- 'lp_name': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True'}),
542- 'microbloghashtag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
543- 'ml_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
544- 'mugshot_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
545- 'name': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '80'}),
546- 'override_name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'null': 'True', 'blank': 'True'}),
547- 'owner_profile': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'owner'", 'null': 'True', 'to': "orm['userprofiles.UserProfile']"}),
548- 'picasa_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
549- 'pixie_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
550- 'provides_support': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
551- 'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
552- 'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}),
553- 'web_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
554- 'wiki_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
555- },
556- 'userprofiles.userprofile': {
557- 'Meta': {'ordering': "('user__username',)", 'object_name': 'UserProfile'},
558- 'aim': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
559- 'blog': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
560- 'facebook': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
561- 'flickr': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
562- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
563- 'identica': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
564- 'irc': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
565- 'mugshot': ('django.db.models.fields.URLField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}),
566- 'picasa': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
567- 'realname': ('django.db.models.fields.CharField', [], {'max_length': '150', 'blank': 'True'}),
568- 'twitter': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
569- 'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}),
570- 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}),
571- 'xmpp': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'})
572- }
573- }
574-
575- complete_apps = ['articles']
576
577=== modified file 'loco_directory/articles/models.py'
578--- loco_directory/articles/models.py 2012-12-25 22:00:46 +0000
579+++ loco_directory/articles/models.py 2016-08-16 07:31:30 +0000
580@@ -37,7 +37,7 @@
581 class Feed(models.Model):
582 user = models.ForeignKey(UserProfile, blank=True, null=True)
583 team = models.ForeignKey(Team, blank=True, null=True)
584- url = models.URLField(verify_exists=False)
585+ url = models.URLField()
586 title = models.CharField(max_length=128, null=True, blank=True)
587 last_updated = models.DateTimeField(null=False, blank=False, default=datetime.datetime(1970, 1, 1))
588 active = models.BooleanField(default=True)
589
590=== modified file 'loco_directory/articles/urls.py'
591--- loco_directory/articles/urls.py 2012-12-13 22:48:12 +0000
592+++ loco_directory/articles/urls.py 2016-08-16 07:31:30 +0000
593@@ -1,5 +1,5 @@
594 # -*- coding: utf-8 -*-
595-from django.conf.urls.defaults import *
596+from django.conf.urls import *
597
598 urlpatterns = patterns('',
599 url(r'^(?P<article_id>\d+)-(?P<article_slug>[a-zA-Z0-9\-\.\+?]+)/$',
600
601=== modified file 'loco_directory/common/management/commands/init.py'
602--- loco_directory/common/management/commands/init.py 2013-01-14 21:02:55 +0000
603+++ loco_directory/common/management/commands/init.py 2016-08-16 07:31:30 +0000
604@@ -4,7 +4,7 @@
605 from django.core.management.base import NoArgsCommand
606 from django.contrib.auth.models import Group
607
608-import settings
609+import app.settings
610 import subprocess
611 import sys
612 import os
613
614=== modified file 'loco_directory/common/mixins.py'
615--- loco_directory/common/mixins.py 2012-06-01 23:45:18 +0000
616+++ loco_directory/common/mixins.py 2016-08-16 07:31:30 +0000
617@@ -1,6 +1,5 @@
618 import pytz
619
620-
621 class LocalTimeMixin(object):
622 '''Provides methods for converting between UTC and localtime
623
624@@ -19,12 +18,14 @@
625 'Converts a datetime in UTC to a datetime in this object\'s timezone'
626 if dt is None:
627 return None
628- as_utc = pytz.utc.localize(dt)
629- return as_utc.astimezone(self.timezone)
630+ if dt.tzinfo is None:
631+ dt = pytz.utc.localize(dt)
632+ return dt.astimezone(self.timezone)
633
634 def fromlocaltime(self, dt):
635 'Converts a datetime in this object\'s timezone to a datetime in UTC'
636 if dt is None:
637 return None
638- local = self.timezone.localize(dt)
639- return local.astimezone(pytz.utc)
640+ if dt.tzinfo is None:
641+ dt = self.timezone.localize(dt)
642+ return dt.astimezone(pytz.utc)
643
644=== modified file 'loco_directory/common/widgets.py'
645--- loco_directory/common/widgets.py 2012-06-01 23:45:18 +0000
646+++ loco_directory/common/widgets.py 2016-08-16 07:31:30 +0000
647@@ -7,14 +7,13 @@
648 from django.utils.safestring import mark_safe
649 import copy
650
651-
652 class PopupRelatedFieldWidgetWrapper(forms.Widget):
653 """
654 This class is a wrapper to a given widget to add the add icon for the
655 admin interface.
656 """
657 def __init__(self, widget, popup_url):
658- self.is_hidden = widget.is_hidden
659+ # self.is_hidden = widget.is_hidden
660 self.needs_multipart_form = widget.needs_multipart_form
661 self.attrs = widget.attrs
662 self.choices = widget.choices
663
664=== modified file 'loco_directory/django.wsgi'
665--- loco_directory/django.wsgi 2011-11-11 23:17:48 +0000
666+++ loco_directory/django.wsgi 2016-08-16 07:31:30 +0000
667@@ -15,7 +15,7 @@
668 sys.path.append(parentdir)
669
670 # setup environment
671-os.environ['DJANGO_SETTINGS_MODULE'] = 'settings'
672+os.environ['DJANGO_SETTINGS_MODULE'] = 'app.settings'
673
674 # setup application
675 application = django.core.handlers.wsgi.WSGIHandler()
676
677=== modified file 'loco_directory/events/feeds.py'
678--- loco_directory/events/feeds.py 2013-03-31 01:15:06 +0000
679+++ loco_directory/events/feeds.py 2016-08-16 07:31:30 +0000
680@@ -1,6 +1,6 @@
681 # -*- coding: utf-8 -*-
682 from django.core.urlresolvers import reverse
683-from django.contrib.syndication.feeds import Feed, FeedDoesNotExist
684+from django.contrib.syndication.views import Feed, FeedDoesNotExist
685 from django.utils.translation import ugettext as _
686 from django.utils import translation
687 from django.template import loader, Context
688@@ -12,7 +12,9 @@
689
690
691 class TeamEventFeed(Feed):
692- def get_object(self, bits):
693+
694+ def get_object(self, request, bits):
695+ bits = bits.split('/')
696 if len(bits) >= 1:
697 try:
698 lang = bits[1]
699
700=== modified file 'loco_directory/events/forms.py'
701--- loco_directory/events/forms.py 2013-04-08 20:08:25 +0000
702+++ loco_directory/events/forms.py 2016-08-16 07:31:30 +0000
703@@ -38,9 +38,13 @@
704 """
705 a form to create/update a BaseEvent
706 """
707+
708+ date_begin = forms.SplitDateTimeField(widget=DateTimeWidget)
709+ date_end = forms.SplitDateTimeField(widget=DateTimeWidget)
710+
711 class Meta:
712 model = BaseEvent
713- exclude = ('date_created')
714+ exclude = ('date_created',)
715
716 class Media:
717 css = {'all': (
718@@ -51,10 +55,10 @@
719 settings.MEDIA_URL + 'js/events-ui.js',
720 )
721
722- def __init__(self, *args, **kargs):
723- super(BaseEventForm, self).__init__(*args, **kargs)
724- self.fields['date_begin'].widget = DateTimeWidget()
725- self.fields['date_end'].widget = DateTimeWidget()
726+ # def __init__(self, *args, **kargs):
727+ # super(BaseEventForm, self).__init__(*args, **kargs)
728+ # self.fields['date_begin'].widget = DateTimeWidget()
729+ # self.fields['date_end'].widget = DateTimeWidget()
730
731 def clean(self):
732 begin = self.cleaned_data.get('date_begin')
733@@ -70,7 +74,7 @@
734 """
735 class Meta(BaseEventForm.Meta):
736 model = TeamEvent
737- exclude = ('teams', 'date_created', 'created_by')
738+ exclude = ('teams', 'date_created', 'created_by',)
739
740 def __init__(self, teams=[], *args, **kargs):
741 super(TeamEventForm, self).__init__(*args, **kargs)
742@@ -167,7 +171,7 @@
743 """
744 class Meta:
745 model = Attendee
746- exclude = ('attendee_profile', 'team_event')
747+ exclude = ('attendee_profile', 'team_event',)
748
749
750 class TeamEventCommentForm(forms.ModelForm, RenderableMixin):
751@@ -176,4 +180,4 @@
752 """
753 class Meta:
754 model = TeamEventComment
755- exclude = ('team_event', 'date_created', 'commenter_profile')
756+ exclude = ('team_event', 'date_created', 'commenter_profile',)
757
758=== modified file 'loco_directory/events/migrations/0001_initial.py'
759--- loco_directory/events/migrations/0001_initial.py 2010-02-04 00:39:29 +0000
760+++ loco_directory/events/migrations/0001_initial.py 2016-08-16 07:31:30 +0000
761@@ -1,205 +1,91 @@
762-
763-from south.db import db
764-from django.db import models
765-from events.models import *
766-
767-class Migration:
768-
769- def forwards(self, orm):
770-
771- # Adding model 'BaseEvent'
772- db.create_table('events_baseevent', (
773- ('id', orm['events.BaseEvent:id']),
774- ('name', orm['events.BaseEvent:name']),
775- ('date_begin', orm['events.BaseEvent:date_begin']),
776- ('date_end', orm['events.BaseEvent:date_end']),
777- ('description', orm['events.BaseEvent:description']),
778- ('announce', orm['events.BaseEvent:announce']),
779- ('date_created', orm['events.BaseEvent:date_created']),
780- ))
781- db.send_create_signal('events', ['BaseEvent'])
782-
783- # Adding model 'TeamEvent'
784- db.create_table('events_teamevent', (
785- ('baseevent_ptr', orm['events.TeamEvent:baseevent_ptr']),
786- ('global_event', orm['events.TeamEvent:global_event']),
787- ('venue', orm['events.TeamEvent:venue']),
788- ))
789- db.send_create_signal('events', ['TeamEvent'])
790-
791- # Adding model 'GlobalEvent'
792- db.create_table('events_globalevent', (
793- ('baseevent_ptr', orm['events.GlobalEvent:baseevent_ptr']),
794- ('microbloghashtag', orm['events.GlobalEvent:microbloghashtag']),
795- ('pictag', orm['events.GlobalEvent:pictag']),
796- ))
797- db.send_create_signal('events', ['GlobalEvent'])
798-
799- # Adding model 'TeamEventComment'
800- db.create_table('events_teameventcomment', (
801- ('id', orm['events.TeamEventComment:id']),
802- ('team_event', orm['events.TeamEventComment:team_event']),
803- ('date_created', orm['events.TeamEventComment:date_created']),
804- ('comment_by', orm['events.TeamEventComment:comment_by']),
805- ('comment', orm['events.TeamEventComment:comment']),
806- ))
807- db.send_create_signal('events', ['TeamEventComment'])
808-
809- # Adding model 'Attendee'
810- db.create_table('events_attendee', (
811- ('id', orm['events.Attendee:id']),
812- ('team_event', orm['events.Attendee:team_event']),
813- ('attendee', orm['events.Attendee:attendee']),
814- ('promise', orm['events.Attendee:promise']),
815- ('guests', orm['events.Attendee:guests']),
816- ))
817- db.send_create_signal('events', ['Attendee'])
818-
819- # Adding ManyToManyField 'TeamEvent.teams'
820- db.create_table('events_teamevent_teams', (
821- ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)),
822- ('teamevent', models.ForeignKey(orm.TeamEvent, null=False)),
823- ('team', models.ForeignKey(orm['teams.Team'], null=False))
824- ))
825-
826- # Creating unique_together for [team_event, attendee] on Attendee.
827- db.create_unique('events_attendee', ['team_event_id', 'attendee_id'])
828-
829-
830-
831- def backwards(self, orm):
832-
833- # Deleting unique_together for [team_event, attendee] on Attendee.
834- db.delete_unique('events_attendee', ['team_event_id', 'attendee_id'])
835-
836- # Deleting model 'BaseEvent'
837- db.delete_table('events_baseevent')
838-
839- # Deleting model 'TeamEvent'
840- db.delete_table('events_teamevent')
841-
842- # Deleting model 'GlobalEvent'
843- db.delete_table('events_globalevent')
844-
845- # Deleting model 'TeamEventComment'
846- db.delete_table('events_teameventcomment')
847-
848- # Deleting model 'Attendee'
849- db.delete_table('events_attendee')
850-
851- # Dropping ManyToManyField 'TeamEvent.teams'
852- db.delete_table('events_teamevent_teams')
853-
854-
855-
856- models = {
857- 'auth.group': {
858- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
859- 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
860- 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'blank': 'True'})
861- },
862- 'auth.permission': {
863- 'Meta': {'unique_together': "(('content_type', 'codename'),)"},
864- 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
865- 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
866- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
867- 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
868- },
869- 'auth.user': {
870- 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
871- 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
872- 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
873- 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'blank': 'True'}),
874- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
875- 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}),
876- 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
877- 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
878- 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
879- 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
880- 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
881- 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'blank': 'True'}),
882- 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
883- },
884- 'contenttypes.contenttype': {
885- 'Meta': {'unique_together': "(('app_label', 'model'),)", 'db_table': "'django_content_type'"},
886- 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
887- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
888- 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
889- 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
890- },
891- 'events.attendee': {
892- 'Meta': {'unique_together': "(('team_event', 'attendee'),)"},
893- 'attendee': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
894- 'guests': ('django.db.models.fields.PositiveSmallIntegerField', [], {}),
895- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
896- 'promise': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
897- 'team_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.TeamEvent']"})
898- },
899- 'events.baseevent': {
900- 'announce': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
901- 'date_begin': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}),
902- 'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2010, 2, 4, 0, 38, 13, 583247)', 'db_index': 'True'}),
903- 'date_end': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}),
904- 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
905- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
906- 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'})
907- },
908- 'events.globalevent': {
909- 'baseevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['events.BaseEvent']", 'unique': 'True', 'primary_key': 'True'}),
910- 'microbloghashtag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
911- 'pictag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'})
912- },
913- 'events.teamevent': {
914- 'baseevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['events.BaseEvent']", 'unique': 'True', 'primary_key': 'True'}),
915- 'global_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.GlobalEvent']", 'null': 'True', 'blank': 'True'}),
916- 'teams': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Team']", 'db_index': 'True'}),
917- 'venue': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['venues.Venue']", 'null': 'True', 'blank': 'True'})
918- },
919- 'events.teameventcomment': {
920- 'comment': ('django.db.models.fields.TextField', [], {'db_index': 'True'}),
921- 'comment_by': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
922- 'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2010, 2, 4, 0, 38, 13, 587465)', 'db_index': 'True'}),
923- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
924- 'team_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.TeamEvent']"})
925- },
926- 'teams.team': {
927- 'Meta': {'db_table': "'teams'"},
928- 'admins': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.TeamAdministrator']"}),
929- 'approved': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
930- 'approved_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
931- 'city': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
932- 'country': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
933- 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
934- 'expires_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
935- 'forum_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
936- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
937- 'irc_chan': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}),
938- 'lp_name': ('django.db.models.fields.SlugField', [], {'max_length': '40', 'null': 'True', 'db_index': 'True'}),
939- 'ml_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
940- 'mugshot_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
941- 'name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'null': 'True'}),
942- 'owner': ('django.db.models.fields.SlugField', [], {'max_length': '50', 'null': 'True', 'db_index': 'True'}),
943- 'provides_support': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}),
944- 'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
945- 'web_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
946- 'wiki_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
947- },
948- 'teams.teamadministrator': {
949- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
950- 'lpid': ('django.db.models.fields.SlugField', [], {'max_length': '40', 'db_index': 'True'})
951- },
952- 'venues.venue': {
953- 'address': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}),
954- 'city': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}),
955- 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
956- 'country': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}),
957- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
958- 'latitude': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
959- 'longitude': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
960- 'map_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
961- 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}),
962- 'venue_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
963- }
964- }
965-
966- complete_apps = ['events']
967+# -*- coding: utf-8 -*-
968+from __future__ import unicode_literals
969+
970+from django.db import models, migrations
971+import datetime
972+from django.conf import settings
973+
974+
975+class Migration(migrations.Migration):
976+
977+ dependencies = [
978+ migrations.swappable_dependency(settings.AUTH_USER_MODEL),
979+ ('venues', '0001_initial'),
980+ ('teams', '0001_initial'),
981+ ]
982+
983+ operations = [
984+ migrations.CreateModel(
985+ name='Attendee',
986+ fields=[
987+ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
988+ ('promise', models.CharField(help_text='how safe do you come', max_length=50, choices=[(b'sure', 'come for sure'), (b'maybe', 'maybe coming'), (b'not', 'not coming')])),
989+ ('guests', models.PositiveSmallIntegerField(help_text='the number of guests coming with attendee')),
990+ ('attendee', models.ForeignKey(help_text='the name of the attendee', to=settings.AUTH_USER_MODEL)),
991+ ],
992+ options={
993+ },
994+ bases=(models.Model,),
995+ ),
996+ migrations.CreateModel(
997+ name='BaseEvent',
998+ fields=[
999+ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
1000+ ('name', models.CharField(max_length=150, verbose_name='Name of the Event')),
1001+ ('date_begin', models.DateTimeField(help_text='start date and local time of the event', verbose_name='Begins', db_index=True)),
1002+ ('date_end', models.DateTimeField(help_text='end date and local time of the event', verbose_name='Ends', db_index=True)),
1003+ ('description', models.TextField(help_text='Description of the Event', null=True, blank=True)),
1004+ ('announce', models.URLField(help_text='URL to the announcement', null=True, blank=True)),
1005+ ('date_created', models.DateTimeField(default=datetime.datetime.now, help_text='the date and time when the event was created', db_index=True)),
1006+ ],
1007+ options={
1008+ },
1009+ bases=(models.Model,),
1010+ ),
1011+ migrations.CreateModel(
1012+ name='GlobalEvent',
1013+ fields=[
1014+ ('baseevent_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='events.BaseEvent')),
1015+ ('microbloghashtag', models.CharField(help_text='Hash Tag used for microbloggers to mention this event', max_length=50, null=True, verbose_name='Microblogging Hash Tag', blank=True)),
1016+ ('pictag', models.CharField(help_text='tag used in welb albums like; picasa, flickr, and more', max_length=50, null=True, verbose_name='Picture Tag', blank=True)),
1017+ ],
1018+ options={
1019+ },
1020+ bases=('events.baseevent',),
1021+ ),
1022+ migrations.CreateModel(
1023+ name='TeamEvent',
1024+ fields=[
1025+ ('baseevent_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='events.BaseEvent')),
1026+ ('global_event', models.ForeignKey(blank=True, to='events.GlobalEvent', help_text='this team event is part of the selected global event', null=True, verbose_name='Related Global Event')),
1027+ ('teams', models.ManyToManyField(help_text='teams of this event.', to='teams.Team', verbose_name='Teams Participating', db_index=True)),
1028+ ('venue', models.ForeignKey(blank=True, to='venues.Venue', help_text='Venue of the Event', null=True, verbose_name='Venue of the Event')),
1029+ ],
1030+ options={
1031+ },
1032+ bases=('events.baseevent',),
1033+ ),
1034+ migrations.CreateModel(
1035+ name='TeamEventComment',
1036+ fields=[
1037+ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
1038+ ('date_created', models.DateTimeField(default=datetime.datetime.now, help_text='the date and time when the event comment was created', db_index=True)),
1039+ ('comment', models.TextField(help_text='Comment this Event', db_index=True)),
1040+ ('comment_by', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
1041+ ('team_event', models.ForeignKey(help_text='the Team Event', to='events.TeamEvent')),
1042+ ],
1043+ options={
1044+ },
1045+ bases=(models.Model,),
1046+ ),
1047+ migrations.AddField(
1048+ model_name='attendee',
1049+ name='team_event',
1050+ field=models.ForeignKey(help_text='the Team Event', to='events.TeamEvent'),
1051+ preserve_default=True,
1052+ ),
1053+ migrations.AlterUniqueTogether(
1054+ name='attendee',
1055+ unique_together=set([('team_event', 'attendee')]),
1056+ ),
1057+ ]
1058
1059=== removed file 'loco_directory/events/migrations/0002_add_profile_fields.py'
1060--- loco_directory/events/migrations/0002_add_profile_fields.py 2010-08-19 11:38:55 +0000
1061+++ loco_directory/events/migrations/0002_add_profile_fields.py 1970-01-01 00:00:00 +0000
1062@@ -1,170 +0,0 @@
1063-
1064-from south.db import db
1065-from django.db import models
1066-from events.models import *
1067-
1068-class Migration:
1069- depends_on = (
1070- ("userprofiles", "0001_initial"),
1071- )
1072-
1073- def forwards(self, orm):
1074-
1075- # Adding field 'TeamEventComment.commenter_profile'
1076- db.add_column('events_teameventcomment', 'commenter_profile', orm['events.TeamEventComment:commenter_profile'])
1077-
1078- # Adding field 'Attendee.attendee_profile'
1079- db.add_column('events_attendee', 'attendee_profile', orm['events.Attendee:attendee_profile'])
1080-
1081-
1082-
1083- def backwards(self, orm):
1084-
1085- # Deleting field 'TeamEventComment.commenter_profile'
1086- db.delete_column('events_teameventcomment', 'commenter_profile_id')
1087-
1088- # Deleting field 'Attendee.attendee_profile'
1089- db.delete_column('events_attendee', 'attendee_profile_id')
1090-
1091-
1092-
1093- models = {
1094- 'auth.group': {
1095- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
1096- 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
1097- 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'blank': 'True'})
1098- },
1099- 'auth.permission': {
1100- 'Meta': {'unique_together': "(('content_type', 'codename'),)"},
1101- 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
1102- 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
1103- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
1104- 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
1105- },
1106- 'auth.user': {
1107- 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
1108- 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
1109- 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
1110- 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'blank': 'True'}),
1111- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
1112- 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}),
1113- 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
1114- 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
1115- 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
1116- 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
1117- 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
1118- 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'blank': 'True'}),
1119- 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
1120- },
1121- 'contenttypes.contenttype': {
1122- 'Meta': {'unique_together': "(('app_label', 'model'),)", 'db_table': "'django_content_type'"},
1123- 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
1124- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
1125- 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
1126- 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
1127- },
1128- 'events.attendee': {
1129- 'Meta': {'unique_together': "(('team_event', 'attendee_profile'),)"},
1130- 'attendee': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
1131- 'attendee_profile': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True'}),
1132- 'guests': ('django.db.models.fields.PositiveSmallIntegerField', [], {}),
1133- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
1134- 'promise': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
1135- 'team_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.TeamEvent']"})
1136- },
1137- 'events.baseevent': {
1138- 'announce': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
1139- 'date_begin': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}),
1140- 'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2010, 8, 18, 10, 9, 53, 607179)', 'db_index': 'True'}),
1141- 'date_end': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}),
1142- 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
1143- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
1144- 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'})
1145- },
1146- 'events.globalevent': {
1147- 'baseevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['events.BaseEvent']", 'unique': 'True', 'primary_key': 'True'}),
1148- 'microbloghashtag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
1149- 'pictag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'})
1150- },
1151- 'events.teamevent': {
1152- 'baseevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['events.BaseEvent']", 'unique': 'True', 'primary_key': 'True'}),
1153- 'global_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.GlobalEvent']", 'null': 'True', 'blank': 'True'}),
1154- 'teams': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Team']", 'db_index': 'True'}),
1155- 'venue': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['venues.Venue']", 'null': 'True', 'blank': 'True'})
1156- },
1157- 'events.teameventcomment': {
1158- 'comment': ('django.db.models.fields.TextField', [], {'db_index': 'True'}),
1159- 'comment_by': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
1160- 'commenter_profile': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True'}),
1161- 'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2010, 8, 18, 10, 9, 53, 613146)', 'db_index': 'True'}),
1162- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
1163- 'team_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.TeamEvent']"})
1164- },
1165- 'teams.continent': {
1166- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
1167- 'name': ('django.db.models.fields.TextField', [], {'max_length': '50'})
1168- },
1169- 'teams.country': {
1170- 'continents': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Continent']"}),
1171- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
1172- 'name': ('django.db.models.fields.TextField', [], {'max_length': '100'})
1173- },
1174- 'teams.language': {
1175- 'code': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True'}),
1176- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
1177- 'name': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True'})
1178- },
1179- 'teams.team': {
1180- 'Meta': {'db_table': "'teams'"},
1181- 'admin_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['userprofiles.UserProfile']"}),
1182- 'approved': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
1183- 'approved_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
1184- 'city': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
1185- 'contact_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['userprofiles.UserProfile']"}),
1186- 'countries': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Country']"}),
1187- 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
1188- 'expires_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
1189- 'forum_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
1190- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
1191- 'irc_chan': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}),
1192- 'languages': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Language']"}),
1193- 'lp_name': ('django.db.models.fields.SlugField', [], {'max_length': '40', 'null': 'True', 'db_index': 'True'}),
1194- 'ml_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
1195- 'mugshot_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
1196- 'name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'null': 'True'}),
1197- 'owner_profile': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'owner'", 'null': 'True', 'to': "orm['userprofiles.UserProfile']"}),
1198- 'provides_support': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}),
1199- 'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
1200- 'web_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
1201- 'wiki_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
1202- },
1203- 'userprofiles.userprofile': {
1204- 'aim': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
1205- 'blog': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
1206- 'facebook': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
1207- 'flickr': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
1208- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
1209- 'identica': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
1210- 'irc': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
1211- 'picasa': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
1212- 'realname': ('django.db.models.fields.CharField', [], {'max_length': '150', 'blank': 'True'}),
1213- 'twitter': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
1214- 'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}),
1215- 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}),
1216- 'xmpp': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'})
1217- },
1218- 'venues.venue': {
1219- 'Meta': {'unique_together': "(('name', 'country', 'city'), ('longitude', 'latitude'))"},
1220- 'address': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}),
1221- 'city': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}),
1222- 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
1223- 'country': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['teams.Country']", 'null': 'True'}),
1224- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
1225- 'latitude': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
1226- 'longitude': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
1227- 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}),
1228- 'venue_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
1229- }
1230- }
1231-
1232- complete_apps = ['events']
1233
1234=== added file 'loco_directory/events/migrations/0002_auto_20160815_2321.py'
1235--- loco_directory/events/migrations/0002_auto_20160815_2321.py 1970-01-01 00:00:00 +0000
1236+++ loco_directory/events/migrations/0002_auto_20160815_2321.py 2016-08-16 07:31:30 +0000
1237@@ -0,0 +1,24 @@
1238+# -*- coding: utf-8 -*-
1239+from __future__ import unicode_literals
1240+
1241+from django.db import models, migrations
1242+
1243+
1244+class Migration(migrations.Migration):
1245+
1246+ dependencies = [
1247+ ('events', '0001_initial'),
1248+ ]
1249+
1250+ operations = [
1251+ migrations.AlterField(
1252+ model_name='attendee',
1253+ name='guests',
1254+ field=models.PositiveSmallIntegerField(verbose_name='Additional Guests'),
1255+ ),
1256+ migrations.AlterField(
1257+ model_name='attendee',
1258+ name='promise',
1259+ field=models.CharField(max_length=50, verbose_name='Attending Status', choices=[(b'sure', 'attending'), (b'maybe', 'might be attending'), (b'not', 'not attending')]),
1260+ ),
1261+ ]
1262
1263=== added file 'loco_directory/events/migrations/0003_auto_20160815_2328.py'
1264--- loco_directory/events/migrations/0003_auto_20160815_2328.py 1970-01-01 00:00:00 +0000
1265+++ loco_directory/events/migrations/0003_auto_20160815_2328.py 2016-08-16 07:31:30 +0000
1266@@ -0,0 +1,44 @@
1267+# -*- coding: utf-8 -*-
1268+from __future__ import unicode_literals
1269+
1270+from django.db import models, migrations
1271+
1272+
1273+class Migration(migrations.Migration):
1274+
1275+ dependencies = [
1276+ ('userprofiles', '0001_initial'),
1277+ ('events', '0002_auto_20160815_2321'),
1278+ ]
1279+
1280+ operations = [
1281+ migrations.RemoveField(
1282+ model_name='attendee',
1283+ name='attendee',
1284+ ),
1285+ migrations.RemoveField(
1286+ model_name='teameventcomment',
1287+ name='comment_by',
1288+ ),
1289+ migrations.AddField(
1290+ model_name='attendee',
1291+ name='attendee_profile',
1292+ field=models.ForeignKey(to='userprofiles.UserProfile', help_text='the name of the attendee', null=True),
1293+ preserve_default=True,
1294+ ),
1295+ migrations.AddField(
1296+ model_name='teameventcomment',
1297+ name='commenter_profile',
1298+ field=models.ForeignKey(to='userprofiles.UserProfile', null=True),
1299+ preserve_default=True,
1300+ ),
1301+ migrations.AlterField(
1302+ model_name='globalevent',
1303+ name='pictag',
1304+ field=models.CharField(help_text='tag used in web albums like; picasa, flickr, and more', max_length=50, null=True, verbose_name='Picture Tag', blank=True),
1305+ ),
1306+ migrations.AlterUniqueTogether(
1307+ name='attendee',
1308+ unique_together=set([('team_event', 'attendee_profile')]),
1309+ ),
1310+ ]
1311
1312=== removed file 'loco_directory/events/migrations/0003_migrate_profile_data.py'
1313--- loco_directory/events/migrations/0003_migrate_profile_data.py 2010-08-18 14:15:44 +0000
1314+++ loco_directory/events/migrations/0003_migrate_profile_data.py 1970-01-01 00:00:00 +0000
1315@@ -1,173 +0,0 @@
1316-
1317-from south.db import db
1318-from django.db import models
1319-from events.models import *
1320-
1321-class Migration:
1322-
1323- def forwards(self, orm):
1324- for comment in orm['events.TeamEventComment'].objects.all():
1325- if not comment.commenter_profile:
1326- commenter_profile, created = orm['userprofiles.UserProfile'].objects.get_or_create(user=comment.comment_by)
1327- if created:
1328- commenter_profile.save()
1329- comment.commenter_profile = commenter_profile
1330- comment.save()
1331- for attendee in orm['events.Attendee'].objects.all():
1332- if not attendee.attendee_profile:
1333- attendee_profile, created = orm['userprofiles.UserProfile'].objects.get_or_create(user=attendee.attendee)
1334- if created:
1335- attendee_profile.save()
1336- attendee.attendee_profile = attendee_profile
1337- attendee.save()
1338-
1339- def backwards(self, orm):
1340- for comment in orm['events.TeamEventComment'].objects.all():
1341- if not comment.comment_by:
1342- comment.comment_by = comment.commenter_profile.user
1343- comment.save()
1344- for attendee in orm['events.Attendee'].objects.all():
1345- if not attendee.attendee:
1346- attendee.attendee = attendee.attendee_profile.user
1347- attendee.save()
1348-
1349- models = {
1350- 'auth.group': {
1351- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
1352- 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
1353- 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'blank': 'True'})
1354- },
1355- 'auth.permission': {
1356- 'Meta': {'unique_together': "(('content_type', 'codename'),)"},
1357- 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
1358- 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
1359- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
1360- 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
1361- },
1362- 'auth.user': {
1363- 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
1364- 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
1365- 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
1366- 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'blank': 'True'}),
1367- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
1368- 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}),
1369- 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
1370- 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
1371- 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
1372- 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
1373- 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
1374- 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'blank': 'True'}),
1375- 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
1376- },
1377- 'contenttypes.contenttype': {
1378- 'Meta': {'unique_together': "(('app_label', 'model'),)", 'db_table': "'django_content_type'"},
1379- 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
1380- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
1381- 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
1382- 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
1383- },
1384- 'events.attendee': {
1385- 'Meta': {'unique_together': "(('team_event', 'attendee_profile'),)"},
1386- 'attendee': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'}),
1387- 'attendee_profile': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True'}),
1388- 'guests': ('django.db.models.fields.PositiveSmallIntegerField', [], {}),
1389- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
1390- 'promise': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
1391- 'team_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.TeamEvent']"})
1392- },
1393- 'events.baseevent': {
1394- 'announce': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
1395- 'date_begin': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}),
1396- 'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2010, 8, 18, 10, 10, 3, 333840)', 'db_index': 'True'}),
1397- 'date_end': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}),
1398- 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
1399- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
1400- 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'})
1401- },
1402- 'events.globalevent': {
1403- 'baseevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['events.BaseEvent']", 'unique': 'True', 'primary_key': 'True'}),
1404- 'microbloghashtag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
1405- 'pictag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'})
1406- },
1407- 'events.teamevent': {
1408- 'baseevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['events.BaseEvent']", 'unique': 'True', 'primary_key': 'True'}),
1409- 'global_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.GlobalEvent']", 'null': 'True', 'blank': 'True'}),
1410- 'teams': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Team']", 'db_index': 'True'}),
1411- 'venue': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['venues.Venue']", 'null': 'True', 'blank': 'True'})
1412- },
1413- 'events.teameventcomment': {
1414- 'comment': ('django.db.models.fields.TextField', [], {'db_index': 'True'}),
1415- 'comment_by': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'}),
1416- 'commenter_profile': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True'}),
1417- 'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2010, 8, 18, 10, 10, 3, 336191)', 'db_index': 'True'}),
1418- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
1419- 'team_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.TeamEvent']"})
1420- },
1421- 'teams.continent': {
1422- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
1423- 'name': ('django.db.models.fields.TextField', [], {'max_length': '50'})
1424- },
1425- 'teams.country': {
1426- 'continents': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Continent']"}),
1427- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
1428- 'name': ('django.db.models.fields.TextField', [], {'max_length': '100'})
1429- },
1430- 'teams.language': {
1431- 'code': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True'}),
1432- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
1433- 'name': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True'})
1434- },
1435- 'teams.team': {
1436- 'Meta': {'db_table': "'teams'"},
1437- 'admin_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['userprofiles.UserProfile']"}),
1438- 'approved': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
1439- 'approved_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
1440- 'city': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
1441- 'contact_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['userprofiles.UserProfile']"}),
1442- 'countries': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Country']"}),
1443- 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
1444- 'expires_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
1445- 'forum_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
1446- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
1447- 'irc_chan': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}),
1448- 'languages': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Language']"}),
1449- 'lp_name': ('django.db.models.fields.SlugField', [], {'max_length': '40', 'null': 'True', 'db_index': 'True'}),
1450- 'ml_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
1451- 'mugshot_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
1452- 'name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'null': 'True'}),
1453- 'owner_profile': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'owner'", 'null': 'True', 'to': "orm['userprofiles.UserProfile']"}),
1454- 'provides_support': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}),
1455- 'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
1456- 'web_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
1457- 'wiki_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
1458- },
1459- 'userprofiles.userprofile': {
1460- 'aim': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
1461- 'blog': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
1462- 'facebook': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
1463- 'flickr': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
1464- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
1465- 'identica': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
1466- 'irc': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
1467- 'picasa': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
1468- 'realname': ('django.db.models.fields.CharField', [], {'max_length': '150', 'blank': 'True'}),
1469- 'twitter': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
1470- 'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}),
1471- 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}),
1472- 'xmpp': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'})
1473- },
1474- 'venues.venue': {
1475- 'Meta': {'unique_together': "(('name', 'country', 'city'), ('longitude', 'latitude'))"},
1476- 'address': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}),
1477- 'city': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}),
1478- 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
1479- 'country': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['teams.Country']", 'null': 'True'}),
1480- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
1481- 'latitude': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
1482- 'longitude': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
1483- 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}),
1484- 'venue_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
1485- }
1486- }
1487-
1488- complete_apps = ['events']
1489
1490=== added file 'loco_directory/events/migrations/0004_auto_20160815_2334.py'
1491--- loco_directory/events/migrations/0004_auto_20160815_2334.py 1970-01-01 00:00:00 +0000
1492+++ loco_directory/events/migrations/0004_auto_20160815_2334.py 2016-08-16 07:31:30 +0000
1493@@ -0,0 +1,29 @@
1494+# -*- coding: utf-8 -*-
1495+from __future__ import unicode_literals
1496+
1497+from django.db import models, migrations
1498+
1499+
1500+class Migration(migrations.Migration):
1501+
1502+ dependencies = [
1503+ ('events', '0003_auto_20160815_2328'),
1504+ ]
1505+
1506+ operations = [
1507+ migrations.AlterField(
1508+ model_name='baseevent',
1509+ name='announce',
1510+ field=models.URLField(help_text='URL to the announcement', null=True, verbose_name='Announcement', blank=True),
1511+ ),
1512+ migrations.AlterField(
1513+ model_name='baseevent',
1514+ name='name',
1515+ field=models.CharField(max_length=150, verbose_name='Event Name'),
1516+ ),
1517+ migrations.AlterField(
1518+ model_name='teamevent',
1519+ name='venue',
1520+ field=models.ForeignKey(blank=True, to='venues.Venue', help_text='Venue of the Event', null=True, verbose_name='Event Venue'),
1521+ ),
1522+ ]
1523
1524=== removed file 'loco_directory/events/migrations/0004_remove_user.py'
1525--- loco_directory/events/migrations/0004_remove_user.py 2010-08-18 14:15:44 +0000
1526+++ loco_directory/events/migrations/0004_remove_user.py 1970-01-01 00:00:00 +0000
1527@@ -1,181 +0,0 @@
1528-
1529-from south.db import db
1530-from django.db import models
1531-from events.models import *
1532-
1533-class Migration:
1534-
1535- def forwards(self, orm):
1536-
1537- # Deleting field 'TeamEventComment.comment_by'
1538- db.delete_column('events_teameventcomment', 'comment_by_id')
1539-
1540- # Deleting field 'Attendee.attendee'
1541- db.delete_column('events_attendee', 'attendee_id')
1542-
1543- # Changing field 'BaseEvent.date_created'
1544- # (to signature: django.db.models.fields.DateTimeField(default=datetime.datetime(2010, 8, 18, 10, 11, 17, 963571), db_index=True))
1545- db.alter_column('events_baseevent', 'date_created', orm['events.baseevent:date_created'])
1546-
1547- # Changing field 'TeamEventComment.date_created'
1548- # (to signature: django.db.models.fields.DateTimeField(default=datetime.datetime(2010, 8, 18, 10, 11, 17, 966242), db_index=True))
1549- db.alter_column('events_teameventcomment', 'date_created', orm['events.teameventcomment:date_created'])
1550-
1551-
1552-
1553- def backwards(self, orm):
1554-
1555- # Adding field 'TeamEventComment.comment_by'
1556- db.add_column('events_teameventcomment', 'comment_by', orm['events.teameventcomment:comment_by'])
1557-
1558- # Adding field 'Attendee.attendee'
1559- db.add_column('events_attendee', 'attendee', orm['events.attendee:attendee'])
1560-
1561- # Changing field 'BaseEvent.date_created'
1562- # (to signature: django.db.models.fields.DateTimeField(default=datetime.datetime(2010, 8, 18, 10, 10, 3, 333840), db_index=True))
1563- db.alter_column('events_baseevent', 'date_created', orm['events.baseevent:date_created'])
1564-
1565- # Changing field 'TeamEventComment.date_created'
1566- # (to signature: django.db.models.fields.DateTimeField(default=datetime.datetime(2010, 8, 18, 10, 10, 3, 336191), db_index=True))
1567- db.alter_column('events_teameventcomment', 'date_created', orm['events.teameventcomment:date_created'])
1568-
1569-
1570-
1571- models = {
1572- 'auth.group': {
1573- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
1574- 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
1575- 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'blank': 'True'})
1576- },
1577- 'auth.permission': {
1578- 'Meta': {'unique_together': "(('content_type', 'codename'),)"},
1579- 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
1580- 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
1581- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
1582- 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
1583- },
1584- 'auth.user': {
1585- 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
1586- 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
1587- 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
1588- 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'blank': 'True'}),
1589- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
1590- 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}),
1591- 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
1592- 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
1593- 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
1594- 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
1595- 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
1596- 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'blank': 'True'}),
1597- 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
1598- },
1599- 'contenttypes.contenttype': {
1600- 'Meta': {'unique_together': "(('app_label', 'model'),)", 'db_table': "'django_content_type'"},
1601- 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
1602- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
1603- 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
1604- 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
1605- },
1606- 'events.attendee': {
1607- 'Meta': {'unique_together': "(('team_event', 'attendee_profile'),)"},
1608- 'attendee_profile': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True'}),
1609- 'guests': ('django.db.models.fields.PositiveSmallIntegerField', [], {}),
1610- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
1611- 'promise': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
1612- 'team_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.TeamEvent']"})
1613- },
1614- 'events.baseevent': {
1615- 'announce': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
1616- 'date_begin': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}),
1617- 'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2010, 8, 18, 10, 11, 17, 963571)', 'db_index': 'True'}),
1618- 'date_end': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}),
1619- 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
1620- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
1621- 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'})
1622- },
1623- 'events.globalevent': {
1624- 'baseevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['events.BaseEvent']", 'unique': 'True', 'primary_key': 'True'}),
1625- 'microbloghashtag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
1626- 'pictag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'})
1627- },
1628- 'events.teamevent': {
1629- 'baseevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['events.BaseEvent']", 'unique': 'True', 'primary_key': 'True'}),
1630- 'global_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.GlobalEvent']", 'null': 'True', 'blank': 'True'}),
1631- 'teams': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Team']", 'db_index': 'True'}),
1632- 'venue': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['venues.Venue']", 'null': 'True', 'blank': 'True'})
1633- },
1634- 'events.teameventcomment': {
1635- 'comment': ('django.db.models.fields.TextField', [], {'db_index': 'True'}),
1636- 'commenter_profile': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True'}),
1637- 'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2010, 8, 18, 10, 11, 17, 966242)', 'db_index': 'True'}),
1638- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
1639- 'team_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.TeamEvent']"})
1640- },
1641- 'teams.continent': {
1642- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
1643- 'name': ('django.db.models.fields.TextField', [], {'max_length': '50'})
1644- },
1645- 'teams.country': {
1646- 'continents': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Continent']"}),
1647- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
1648- 'name': ('django.db.models.fields.TextField', [], {'max_length': '100'})
1649- },
1650- 'teams.language': {
1651- 'code': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True'}),
1652- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
1653- 'name': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True'})
1654- },
1655- 'teams.team': {
1656- 'Meta': {'db_table': "'teams'"},
1657- 'admin_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['userprofiles.UserProfile']"}),
1658- 'approved': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
1659- 'approved_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
1660- 'city': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
1661- 'contact_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['userprofiles.UserProfile']"}),
1662- 'countries': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Country']"}),
1663- 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
1664- 'expires_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
1665- 'forum_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
1666- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
1667- 'irc_chan': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}),
1668- 'languages': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Language']"}),
1669- 'lp_name': ('django.db.models.fields.SlugField', [], {'max_length': '40', 'null': 'True', 'db_index': 'True'}),
1670- 'ml_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
1671- 'mugshot_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
1672- 'name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'null': 'True'}),
1673- 'owner_profile': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'owner'", 'null': 'True', 'to': "orm['userprofiles.UserProfile']"}),
1674- 'provides_support': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}),
1675- 'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
1676- 'web_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
1677- 'wiki_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
1678- },
1679- 'userprofiles.userprofile': {
1680- 'aim': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
1681- 'blog': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
1682- 'facebook': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
1683- 'flickr': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
1684- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
1685- 'identica': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
1686- 'irc': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
1687- 'picasa': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
1688- 'realname': ('django.db.models.fields.CharField', [], {'max_length': '150', 'blank': 'True'}),
1689- 'twitter': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
1690- 'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}),
1691- 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}),
1692- 'xmpp': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'})
1693- },
1694- 'venues.venue': {
1695- 'Meta': {'unique_together': "(('name', 'country', 'city'), ('longitude', 'latitude'))"},
1696- 'address': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}),
1697- 'city': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}),
1698- 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
1699- 'country': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['teams.Country']", 'null': 'True'}),
1700- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
1701- 'latitude': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
1702- 'longitude': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
1703- 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}),
1704- 'venue_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
1705- }
1706- }
1707-
1708- complete_apps = ['events']
1709
1710=== removed file 'loco_directory/events/migrations/0005_allow_external_registration.py'
1711--- loco_directory/events/migrations/0005_allow_external_registration.py 2010-11-27 03:56:49 +0000
1712+++ loco_directory/events/migrations/0005_allow_external_registration.py 1970-01-01 00:00:00 +0000
1713@@ -1,166 +0,0 @@
1714-
1715-from south.db import db
1716-from django.db import models
1717-from events.models import *
1718-
1719-class Migration:
1720-
1721- def forwards(self, orm):
1722-
1723- # Adding field 'TeamEvent.registration'
1724- db.add_column('events_teamevent', 'registration', orm['events.teamevent:registration'])
1725-
1726-
1727- def backwards(self, orm):
1728-
1729- # Deleting field 'TeamEvent.registration'
1730- db.delete_column('events_teamevent', 'registration')
1731-
1732-
1733-
1734-
1735- models = {
1736- 'auth.group': {
1737- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
1738- 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
1739- 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
1740- },
1741- 'auth.permission': {
1742- 'Meta': {'unique_together': "(('content_type', 'codename'),)"},
1743- 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
1744- 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
1745- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
1746- 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
1747- },
1748- 'auth.user': {
1749- 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
1750- 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
1751- 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
1752- 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
1753- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
1754- 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}),
1755- 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
1756- 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
1757- 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
1758- 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
1759- 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
1760- 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
1761- 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
1762- },
1763- 'contenttypes.contenttype': {
1764- 'Meta': {'unique_together': "(('app_label', 'model'),)", 'db_table': "'django_content_type'"},
1765- 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
1766- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
1767- 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
1768- 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
1769- },
1770- 'events.attendee': {
1771- 'Meta': {'unique_together': "(('team_event', 'attendee_profile'),)"},
1772- 'attendee_profile': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True'}),
1773- 'guests': ('django.db.models.fields.PositiveSmallIntegerField', [], {}),
1774- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
1775- 'promise': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
1776- 'team_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.TeamEvent']"})
1777- },
1778- 'events.baseevent': {
1779- 'announce': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
1780- 'date_begin': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}),
1781- 'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2010, 11, 27, 3, 51, 37, 209550)', 'db_index': 'True'}),
1782- 'date_end': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}),
1783- 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
1784- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
1785- 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'})
1786- },
1787- 'events.globalevent': {
1788- 'baseevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['events.BaseEvent']", 'unique': 'True', 'primary_key': 'True'}),
1789- 'microbloghashtag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
1790- 'pictag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'})
1791- },
1792- 'events.teamevent': {
1793- 'baseevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['events.BaseEvent']", 'unique': 'True', 'primary_key': 'True'}),
1794- 'global_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.GlobalEvent']", 'null': 'True', 'blank': 'True'}),
1795- 'registration': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
1796- 'teams': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Team']", 'db_index': 'True', 'symmetrical': 'False'}),
1797- 'venue': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['venues.Venue']", 'null': 'True', 'blank': 'True'})
1798- },
1799- 'events.teameventcomment': {
1800- 'comment': ('django.db.models.fields.TextField', [], {'db_index': 'True'}),
1801- 'commenter_profile': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True'}),
1802- 'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2010, 11, 27, 3, 51, 37, 215508)', 'db_index': 'True'}),
1803- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
1804- 'team_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.TeamEvent']"})
1805- },
1806- 'teams.continent': {
1807- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
1808- 'name': ('django.db.models.fields.TextField', [], {'max_length': '50'})
1809- },
1810- 'teams.country': {
1811- 'continents': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Continent']", 'symmetrical': 'False'}),
1812- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
1813- 'name': ('django.db.models.fields.TextField', [], {'max_length': '100'})
1814- },
1815- 'teams.language': {
1816- 'code': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True'}),
1817- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
1818- 'name': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True'})
1819- },
1820- 'teams.team': {
1821- 'Meta': {'db_table': "'teams'"},
1822- 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}),
1823- 'admin_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['userprofiles.UserProfile']", 'symmetrical': 'False'}),
1824- 'approved': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
1825- 'approved_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
1826- 'city': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
1827- 'contact_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['userprofiles.UserProfile']", 'symmetrical': 'False'}),
1828- 'countries': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Country']", 'symmetrical': 'False'}),
1829- 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
1830- 'expires_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
1831- 'flickr_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
1832- 'forum_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
1833- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
1834- 'irc_chan': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}),
1835- 'languages': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Language']", 'symmetrical': 'False'}),
1836- 'lp_name': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True'}),
1837- 'ml_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
1838- 'mugshot_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
1839- 'name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'null': 'True'}),
1840- 'owner_profile': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'owner'", 'null': 'True', 'to': "orm['userprofiles.UserProfile']"}),
1841- 'picasa_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
1842- 'pixie_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
1843- 'provides_support': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}),
1844- 'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
1845- 'web_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
1846- 'wiki_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
1847- },
1848- 'userprofiles.userprofile': {
1849- 'aim': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
1850- 'blog': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
1851- 'facebook': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
1852- 'flickr': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
1853- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
1854- 'identica': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
1855- 'irc': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
1856- 'picasa': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
1857- 'realname': ('django.db.models.fields.CharField', [], {'max_length': '150', 'blank': 'True'}),
1858- 'twitter': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
1859- 'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}),
1860- 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}),
1861- 'xmpp': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'})
1862- },
1863- 'venues.venue': {
1864- 'Meta': {'unique_together': "(('name', 'country', 'city'), ('longitude', 'latitude'))"},
1865- 'address': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}),
1866- 'city': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}),
1867- 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
1868- 'country': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['teams.Country']", 'null': 'True'}),
1869- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
1870- 'latitude': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
1871- 'longitude': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
1872- 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}),
1873- 'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
1874- 'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}),
1875- 'venue_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
1876- }
1877- }
1878-
1879- complete_apps = ['events']
1880
1881=== added file 'loco_directory/events/migrations/0005_teamevent_registration.py'
1882--- loco_directory/events/migrations/0005_teamevent_registration.py 1970-01-01 00:00:00 +0000
1883+++ loco_directory/events/migrations/0005_teamevent_registration.py 2016-08-16 07:31:30 +0000
1884@@ -0,0 +1,20 @@
1885+# -*- coding: utf-8 -*-
1886+from __future__ import unicode_literals
1887+
1888+from django.db import models, migrations
1889+
1890+
1891+class Migration(migrations.Migration):
1892+
1893+ dependencies = [
1894+ ('events', '0004_auto_20160815_2334'),
1895+ ]
1896+
1897+ operations = [
1898+ migrations.AddField(
1899+ model_name='teamevent',
1900+ name='registration',
1901+ field=models.URLField(help_text='URL to register attendance (leave blank to use the built-in registration system)', null=True, verbose_name='Registration URL', blank=True),
1902+ preserve_default=True,
1903+ ),
1904+ ]
1905
1906=== added file 'loco_directory/events/migrations/0006_auto_20160815_2352.py'
1907--- loco_directory/events/migrations/0006_auto_20160815_2352.py 1970-01-01 00:00:00 +0000
1908+++ loco_directory/events/migrations/0006_auto_20160815_2352.py 2016-08-16 07:31:30 +0000
1909@@ -0,0 +1,40 @@
1910+# -*- coding: utf-8 -*-
1911+from __future__ import unicode_literals
1912+
1913+from django.db import models, migrations
1914+
1915+
1916+class Migration(migrations.Migration):
1917+
1918+ dependencies = [
1919+ ('events', '0005_teamevent_registration'),
1920+ ]
1921+
1922+ operations = [
1923+ migrations.AddField(
1924+ model_name='teamevent',
1925+ name='channel',
1926+ field=models.CharField(help_text='Channel for the Event hosted on the freenode IRC network. Ex. #ubuntu-us-fl', max_length=25, null=True, verbose_name='Event Channel', blank=True),
1927+ preserve_default=True,
1928+ ),
1929+ migrations.AlterField(
1930+ model_name='baseevent',
1931+ name='date_begin',
1932+ field=models.DateTimeField(help_text='Local date and time the event starts', verbose_name='Begins', db_index=True),
1933+ ),
1934+ migrations.AlterField(
1935+ model_name='baseevent',
1936+ name='date_end',
1937+ field=models.DateTimeField(help_text='Local date and time the event ends', verbose_name='Ends', db_index=True),
1938+ ),
1939+ migrations.AlterField(
1940+ model_name='teamevent',
1941+ name='venue',
1942+ field=models.ForeignKey(blank=True, to='venues.Venue', help_text='Venue for the Event', null=True, verbose_name='Event Venue'),
1943+ ),
1944+ migrations.AlterField(
1945+ model_name='teameventcomment',
1946+ name='comment',
1947+ field=models.TextField(help_text='Enter your comment for this event.', db_index=True),
1948+ ),
1949+ ]
1950
1951=== removed file 'loco_directory/events/migrations/0006_event_channel.py'
1952--- loco_directory/events/migrations/0006_event_channel.py 2011-05-14 12:38:08 +0000
1953+++ loco_directory/events/migrations/0006_event_channel.py 1970-01-01 00:00:00 +0000
1954@@ -1,169 +0,0 @@
1955-
1956-from south.db import db
1957-from django.db import models
1958-from events.models import *
1959-
1960-class Migration:
1961-
1962- def forwards(self, orm):
1963-
1964- # Adding field 'TeamEvent.channel'
1965- db.add_column('events_teamevent', 'channel', orm['events.teamevent:channel'])
1966-
1967-
1968-
1969- def backwards(self, orm):
1970-
1971- # Deleting field 'TeamEvent.channel'
1972- db.delete_column('events_teamevent', 'channel')
1973-
1974-
1975-
1976- models = {
1977- 'auth.group': {
1978- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
1979- 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
1980- 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
1981- },
1982- 'auth.permission': {
1983- 'Meta': {'unique_together': "(('content_type', 'codename'),)"},
1984- 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
1985- 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
1986- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
1987- 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
1988- },
1989- 'auth.user': {
1990- 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
1991- 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
1992- 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
1993- 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
1994- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
1995- 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}),
1996- 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
1997- 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
1998- 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
1999- 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
2000- 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
2001- 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
2002- 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
2003- },
2004- 'contenttypes.contenttype': {
2005- 'Meta': {'unique_together': "(('app_label', 'model'),)", 'db_table': "'django_content_type'"},
2006- 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
2007- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
2008- 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
2009- 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
2010- },
2011- 'events.attendee': {
2012- 'Meta': {'unique_together': "(('team_event', 'attendee_profile'),)"},
2013- 'attendee_profile': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True'}),
2014- 'guests': ('django.db.models.fields.PositiveSmallIntegerField', [], {}),
2015- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
2016- 'promise': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
2017- 'team_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.TeamEvent']"})
2018- },
2019- 'events.baseevent': {
2020- 'announce': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
2021- 'date_begin': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}),
2022- 'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2011, 5, 14, 12, 33, 17, 45383)', 'db_index': 'True'}),
2023- 'date_end': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}),
2024- 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
2025- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
2026- 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'})
2027- },
2028- 'events.globalevent': {
2029- 'baseevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['events.BaseEvent']", 'unique': 'True', 'primary_key': 'True'}),
2030- 'microbloghashtag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
2031- 'pictag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'})
2032- },
2033- 'events.teamevent': {
2034- 'baseevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['events.BaseEvent']", 'unique': 'True', 'primary_key': 'True'}),
2035- 'channel': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}),
2036- 'global_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.GlobalEvent']", 'null': 'True', 'blank': 'True'}),
2037- 'registration': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
2038- 'teams': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Team']", 'db_index': 'True', 'symmetrical': 'False'}),
2039- 'venue': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['venues.Venue']", 'null': 'True', 'blank': 'True'})
2040- },
2041- 'events.teameventcomment': {
2042- 'comment': ('django.db.models.fields.TextField', [], {'db_index': 'True'}),
2043- 'commenter_profile': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True'}),
2044- 'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2011, 5, 14, 12, 33, 17, 48101)', 'db_index': 'True'}),
2045- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
2046- 'team_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.TeamEvent']"})
2047- },
2048- 'teams.continent': {
2049- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
2050- 'name': ('django.db.models.fields.TextField', [], {'max_length': '50'})
2051- },
2052- 'teams.country': {
2053- 'continents': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Continent']", 'symmetrical': 'False'}),
2054- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
2055- 'name': ('django.db.models.fields.TextField', [], {'max_length': '100'})
2056- },
2057- 'teams.language': {
2058- 'code': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True'}),
2059- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
2060- 'name': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True'})
2061- },
2062- 'teams.team': {
2063- 'Meta': {'db_table': "'teams'"},
2064- 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}),
2065- 'admin_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['userprofiles.UserProfile']", 'symmetrical': 'False'}),
2066- 'approved': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
2067- 'approved_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
2068- 'city': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
2069- 'contact_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['userprofiles.UserProfile']", 'symmetrical': 'False'}),
2070- 'countries': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Country']", 'symmetrical': 'False'}),
2071- 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
2072- 'expires_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
2073- 'flickr_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
2074- 'forum_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
2075- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
2076- 'irc_chan': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}),
2077- 'languages': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Language']", 'symmetrical': 'False'}),
2078- 'lp_name': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True'}),
2079- 'microbloghashtag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
2080- 'ml_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
2081- 'mugshot_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
2082- 'name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'null': 'True'}),
2083- 'owner_profile': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'owner'", 'null': 'True', 'to': "orm['userprofiles.UserProfile']"}),
2084- 'picasa_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
2085- 'pixie_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
2086- 'provides_support': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}),
2087- 'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
2088- 'web_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
2089- 'wiki_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
2090- },
2091- 'userprofiles.userprofile': {
2092- 'aim': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
2093- 'blog': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
2094- 'facebook': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
2095- 'flickr': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
2096- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
2097- 'identica': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
2098- 'irc': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
2099- 'mugshot': ('django.db.models.fields.URLField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}),
2100- 'picasa': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
2101- 'realname': ('django.db.models.fields.CharField', [], {'max_length': '150', 'blank': 'True'}),
2102- 'twitter': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
2103- 'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}),
2104- 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}),
2105- 'xmpp': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'})
2106- },
2107- 'venues.venue': {
2108- 'Meta': {'unique_together': "(('name', 'country', 'city'), ('longitude', 'latitude'))"},
2109- 'address': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}),
2110- 'city': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}),
2111- 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
2112- 'country': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['teams.Country']", 'null': 'True'}),
2113- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
2114- 'latitude': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
2115- 'longitude': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
2116- 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}),
2117- 'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
2118- 'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}),
2119- 'venue_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
2120- }
2121- }
2122-
2123- complete_apps = ['events']
2124
2125=== added file 'loco_directory/events/migrations/0007_auto_20160815_2359.py'
2126--- loco_directory/events/migrations/0007_auto_20160815_2359.py 1970-01-01 00:00:00 +0000
2127+++ loco_directory/events/migrations/0007_auto_20160815_2359.py 2016-08-16 07:31:30 +0000
2128@@ -0,0 +1,47 @@
2129+# -*- coding: utf-8 -*-
2130+from __future__ import unicode_literals
2131+
2132+from django.db import models, migrations
2133+import datetime
2134+
2135+
2136+class Migration(migrations.Migration):
2137+
2138+ dependencies = [
2139+ ('userprofiles', '0003_userprofile_mugshot'),
2140+ ('events', '0006_auto_20160815_2352'),
2141+ ]
2142+
2143+ operations = [
2144+ migrations.AddField(
2145+ model_name='teamevent',
2146+ name='contact',
2147+ field=models.ForeignKey(verbose_name='Event Contact', to='userprofiles.UserProfile', help_text='Contact person for this event.', null=True),
2148+ preserve_default=True,
2149+ ),
2150+ migrations.AlterField(
2151+ model_name='baseevent',
2152+ name='announce',
2153+ field=models.URLField(help_text='URL for the announcement', null=True, verbose_name='Announcement', blank=True),
2154+ ),
2155+ migrations.AlterField(
2156+ model_name='baseevent',
2157+ name='date_begin',
2158+ field=models.DateTimeField(help_text='Local date and time that the event starts', verbose_name='Begins', db_index=True),
2159+ ),
2160+ migrations.AlterField(
2161+ model_name='baseevent',
2162+ name='date_end',
2163+ field=models.DateTimeField(help_text='Local date and time that the event ends', verbose_name='Ends', db_index=True),
2164+ ),
2165+ migrations.AlterField(
2166+ model_name='teamevent',
2167+ name='teams',
2168+ field=models.ManyToManyField(help_text='teams planning this event.', to=b'teams.Team', verbose_name='Teams Participating', db_index=True),
2169+ ),
2170+ migrations.AlterField(
2171+ model_name='teameventcomment',
2172+ name='date_created',
2173+ field=models.DateTimeField(default=datetime.datetime.now, help_text='Comment date and time', db_index=True),
2174+ ),
2175+ ]
2176
2177=== removed file 'loco_directory/events/migrations/0007_event_contact.py'
2178--- loco_directory/events/migrations/0007_event_contact.py 2011-06-29 23:33:23 +0000
2179+++ loco_directory/events/migrations/0007_event_contact.py 1970-01-01 00:00:00 +0000
2180@@ -1,171 +0,0 @@
2181-
2182-from south.db import db
2183-from django.db import models
2184-from events.models import *
2185-
2186-class Migration:
2187-
2188- def forwards(self, orm):
2189-
2190- # Adding field 'TeamEvent.contact'
2191- db.add_column('events_teamevent', 'contact', orm['events.teamevent:contact'])
2192-
2193-
2194-
2195- def backwards(self, orm):
2196-
2197- # Deleting field 'TeamEvent.contact'
2198- db.delete_column('events_teamevent', 'contact_id')
2199-
2200-
2201-
2202- models = {
2203- 'auth.group': {
2204- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
2205- 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
2206- 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
2207- },
2208- 'auth.permission': {
2209- 'Meta': {'unique_together': "(('content_type', 'codename'),)"},
2210- 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
2211- 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
2212- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
2213- 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
2214- },
2215- 'auth.user': {
2216- 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
2217- 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
2218- 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
2219- 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
2220- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
2221- 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}),
2222- 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
2223- 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
2224- 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
2225- 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
2226- 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
2227- 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
2228- 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
2229- },
2230- 'contenttypes.contenttype': {
2231- 'Meta': {'unique_together': "(('app_label', 'model'),)", 'db_table': "'django_content_type'"},
2232- 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
2233- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
2234- 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
2235- 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
2236- },
2237- 'events.attendee': {
2238- 'Meta': {'unique_together': "(('team_event', 'attendee_profile'),)"},
2239- 'attendee_profile': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True'}),
2240- 'guests': ('django.db.models.fields.PositiveSmallIntegerField', [], {}),
2241- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
2242- 'promise': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
2243- 'team_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.TeamEvent']"})
2244- },
2245- 'events.baseevent': {
2246- 'announce': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
2247- 'date_begin': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}),
2248- 'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2011, 6, 29, 23, 33, 3, 429621)', 'db_index': 'True'}),
2249- 'date_end': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}),
2250- 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
2251- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
2252- 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'})
2253- },
2254- 'events.globalevent': {
2255- 'baseevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['events.BaseEvent']", 'unique': 'True', 'primary_key': 'True'}),
2256- 'microbloghashtag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
2257- 'pictag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'})
2258- },
2259- 'events.teamevent': {
2260- 'baseevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['events.BaseEvent']", 'unique': 'True', 'primary_key': 'True'}),
2261- 'channel': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}),
2262- 'contact': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True'}),
2263- 'global_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.GlobalEvent']", 'null': 'True', 'blank': 'True'}),
2264- 'registration': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
2265- 'teams': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Team']", 'db_index': 'True', 'symmetrical': 'False'}),
2266- 'venue': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['venues.Venue']", 'null': 'True', 'blank': 'True'})
2267- },
2268- 'events.teameventcomment': {
2269- 'comment': ('django.db.models.fields.TextField', [], {'db_index': 'True'}),
2270- 'commenter_profile': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True'}),
2271- 'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2011, 6, 29, 23, 33, 3, 432997)', 'db_index': 'True'}),
2272- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
2273- 'team_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.TeamEvent']"})
2274- },
2275- 'teams.continent': {
2276- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
2277- 'name': ('django.db.models.fields.TextField', [], {'max_length': '50'})
2278- },
2279- 'teams.country': {
2280- 'continents': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Continent']", 'symmetrical': 'False'}),
2281- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
2282- 'name': ('django.db.models.fields.TextField', [], {'max_length': '100'})
2283- },
2284- 'teams.language': {
2285- 'code': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True'}),
2286- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
2287- 'name': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True'})
2288- },
2289- 'teams.team': {
2290- 'Meta': {'db_table': "'teams'"},
2291- 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}),
2292- 'admin_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['userprofiles.UserProfile']", 'symmetrical': 'False'}),
2293- 'approved': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
2294- 'approved_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
2295- 'city': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
2296- 'contact_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['userprofiles.UserProfile']", 'symmetrical': 'False'}),
2297- 'countries': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Country']", 'symmetrical': 'False'}),
2298- 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
2299- 'expires_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
2300- 'flickr_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
2301- 'forum_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
2302- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
2303- 'irc_chan': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}),
2304- 'languages': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Language']", 'symmetrical': 'False'}),
2305- 'lp_name': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True'}),
2306- 'microbloghashtag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
2307- 'ml_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
2308- 'mugshot_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
2309- 'name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'null': 'True'}),
2310- 'owner_profile': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'owner'", 'null': 'True', 'to': "orm['userprofiles.UserProfile']"}),
2311- 'picasa_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
2312- 'pixie_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
2313- 'provides_support': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}),
2314- 'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
2315- 'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}),
2316- 'web_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
2317- 'wiki_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
2318- },
2319- 'userprofiles.userprofile': {
2320- 'aim': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
2321- 'blog': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
2322- 'facebook': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
2323- 'flickr': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
2324- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
2325- 'identica': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
2326- 'irc': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
2327- 'mugshot': ('django.db.models.fields.URLField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}),
2328- 'picasa': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
2329- 'realname': ('django.db.models.fields.CharField', [], {'max_length': '150', 'blank': 'True'}),
2330- 'twitter': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
2331- 'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}),
2332- 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}),
2333- 'xmpp': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'})
2334- },
2335- 'venues.venue': {
2336- 'Meta': {'unique_together': "(('name', 'country', 'city'), ('longitude', 'latitude'))"},
2337- 'address': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}),
2338- 'city': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}),
2339- 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
2340- 'country': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['teams.Country']", 'null': 'True'}),
2341- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
2342- 'latitude': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
2343- 'longitude': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
2344- 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}),
2345- 'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
2346- 'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}),
2347- 'venue_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
2348- }
2349- }
2350-
2351- complete_apps = ['events']
2352
2353=== removed file 'loco_directory/events/migrations/0008_add_global_event_channel.py'
2354--- loco_directory/events/migrations/0008_add_global_event_channel.py 2012-02-06 15:06:39 +0000
2355+++ loco_directory/events/migrations/0008_add_global_event_channel.py 1970-01-01 00:00:00 +0000
2356@@ -1,183 +0,0 @@
2357-# encoding: utf-8
2358-import datetime
2359-from south.db import db
2360-from south.v2 import SchemaMigration
2361-from django.db import models
2362-
2363-class Migration(SchemaMigration):
2364-
2365- def forwards(self, orm):
2366-
2367- # Adding field 'GlobalEvent.channel'
2368- db.add_column('events_globalevent', 'channel', self.gf('django.db.models.fields.CharField')(max_length=25, null=True, blank=True), keep_default=False)
2369-
2370-
2371- def backwards(self, orm):
2372-
2373- # Deleting field 'GlobalEvent.channel'
2374- db.delete_column('events_globalevent', 'channel')
2375-
2376-
2377- models = {
2378- 'auth.group': {
2379- 'Meta': {'object_name': 'Group'},
2380- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
2381- 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
2382- 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
2383- },
2384- 'auth.permission': {
2385- 'Meta': {'ordering': "('content_type__app_label', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
2386- 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
2387- 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
2388- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
2389- 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
2390- },
2391- 'auth.user': {
2392- 'Meta': {'object_name': 'User'},
2393- 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
2394- 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
2395- 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
2396- 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
2397- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
2398- 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
2399- 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
2400- 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
2401- 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
2402- 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
2403- 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
2404- 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
2405- 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
2406- },
2407- 'contenttypes.contenttype': {
2408- 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
2409- 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
2410- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
2411- 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
2412- 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
2413- },
2414- 'events.attendee': {
2415- 'Meta': {'unique_together': "(('team_event', 'attendee_profile'),)", 'object_name': 'Attendee'},
2416- 'attendee_profile': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True'}),
2417- 'guests': ('django.db.models.fields.PositiveSmallIntegerField', [], {}),
2418- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
2419- 'promise': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
2420- 'team_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.TeamEvent']"})
2421- },
2422- 'events.baseevent': {
2423- 'Meta': {'object_name': 'BaseEvent'},
2424- 'announce': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
2425- 'date_begin': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}),
2426- 'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 2, 6, 15, 0, 9, 281269)', 'db_index': 'True'}),
2427- 'date_end': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}),
2428- 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
2429- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
2430- 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'})
2431- },
2432- 'events.globalevent': {
2433- 'Meta': {'object_name': 'GlobalEvent', '_ormbases': ['events.BaseEvent']},
2434- 'baseevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['events.BaseEvent']", 'unique': 'True', 'primary_key': 'True'}),
2435- 'channel': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}),
2436- 'microbloghashtag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
2437- 'pictag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'})
2438- },
2439- 'events.teamevent': {
2440- 'Meta': {'object_name': 'TeamEvent', '_ormbases': ['events.BaseEvent']},
2441- 'baseevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['events.BaseEvent']", 'unique': 'True', 'primary_key': 'True'}),
2442- 'channel': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}),
2443- 'contact': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True'}),
2444- 'global_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.GlobalEvent']", 'null': 'True', 'blank': 'True'}),
2445- 'registration': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
2446- 'teams': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Team']", 'db_index': 'True', 'symmetrical': 'False'}),
2447- 'venue': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['venues.Venue']", 'null': 'True', 'blank': 'True'})
2448- },
2449- 'events.teameventcomment': {
2450- 'Meta': {'object_name': 'TeamEventComment'},
2451- 'comment': ('django.db.models.fields.TextField', [], {'db_index': 'True'}),
2452- 'commenter_profile': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True'}),
2453- 'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 2, 6, 15, 0, 9, 283350)', 'db_index': 'True'}),
2454- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
2455- 'team_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.TeamEvent']"})
2456- },
2457- 'teams.continent': {
2458- 'Meta': {'ordering': "('name',)", 'object_name': 'Continent'},
2459- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
2460- 'name': ('django.db.models.fields.TextField', [], {'max_length': '50'})
2461- },
2462- 'teams.country': {
2463- 'Meta': {'ordering': "('name',)", 'object_name': 'Country'},
2464- 'continents': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Continent']", 'symmetrical': 'False'}),
2465- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
2466- 'name': ('django.db.models.fields.TextField', [], {'max_length': '100'})
2467- },
2468- 'teams.language': {
2469- 'Meta': {'ordering': "('name',)", 'object_name': 'Language'},
2470- 'code': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True'}),
2471- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
2472- 'name': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True'})
2473- },
2474- 'teams.team': {
2475- 'Meta': {'ordering': "('approved', 'name')", 'object_name': 'Team', 'db_table': "'teams'"},
2476- 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
2477- 'admin_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'admins'", 'symmetrical': 'False', 'to': "orm['userprofiles.UserProfile']"}),
2478- 'approved': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
2479- 'approved_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
2480- 'city': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
2481- 'contact_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'contacts'", 'symmetrical': 'False', 'to': "orm['userprofiles.UserProfile']"}),
2482- 'countries': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Country']", 'symmetrical': 'False'}),
2483- 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
2484- 'expires_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
2485- 'flickr_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
2486- 'forum_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
2487- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
2488- 'irc_chan': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}),
2489- 'languages': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Language']", 'symmetrical': 'False'}),
2490- 'lp_name': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True'}),
2491- 'microbloghashtag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
2492- 'ml_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
2493- 'mugshot_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
2494- 'name': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '80'}),
2495- 'override_name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'null': 'True', 'blank': 'True'}),
2496- 'owner_profile': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'owner'", 'null': 'True', 'to': "orm['userprofiles.UserProfile']"}),
2497- 'picasa_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
2498- 'pixie_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
2499- 'provides_support': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
2500- 'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
2501- 'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}),
2502- 'web_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
2503- 'wiki_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
2504- },
2505- 'userprofiles.userprofile': {
2506- 'Meta': {'ordering': "('user__username',)", 'object_name': 'UserProfile'},
2507- 'aim': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
2508- 'blog': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
2509- 'facebook': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
2510- 'flickr': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
2511- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
2512- 'identica': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
2513- 'irc': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
2514- 'mugshot': ('django.db.models.fields.URLField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}),
2515- 'picasa': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
2516- 'realname': ('django.db.models.fields.CharField', [], {'max_length': '150', 'blank': 'True'}),
2517- 'twitter': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
2518- 'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}),
2519- 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}),
2520- 'xmpp': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'})
2521- },
2522- 'venues.venue': {
2523- 'Meta': {'unique_together': "(('name', 'country', 'city'), ('longitude', 'latitude'))", 'object_name': 'Venue'},
2524- 'address': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}),
2525- 'city': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}),
2526- 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
2527- 'continent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['teams.Continent']", 'null': 'True'}),
2528- 'country': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['teams.Country']", 'null': 'True'}),
2529- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
2530- 'latitude': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
2531- 'longitude': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
2532- 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}),
2533- 'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
2534- 'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}),
2535- 'venue_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
2536- }
2537- }
2538-
2539- complete_apps = ['events']
2540
2541=== added file 'loco_directory/events/migrations/0008_auto_20160816_0011.py'
2542--- loco_directory/events/migrations/0008_auto_20160816_0011.py 1970-01-01 00:00:00 +0000
2543+++ loco_directory/events/migrations/0008_auto_20160816_0011.py 2016-08-16 07:31:30 +0000
2544@@ -0,0 +1,36 @@
2545+# -*- coding: utf-8 -*-
2546+from __future__ import unicode_literals
2547+
2548+from django.db import models, migrations
2549+
2550+
2551+class Migration(migrations.Migration):
2552+
2553+ dependencies = [
2554+ ('events', '0007_auto_20160815_2359'),
2555+ ]
2556+
2557+ operations = [
2558+ migrations.AddField(
2559+ model_name='globalevent',
2560+ name='activities',
2561+ field=models.TextField(help_text='Activities to do during the Event', null=True, blank=True),
2562+ preserve_default=True,
2563+ ),
2564+ migrations.AddField(
2565+ model_name='globalevent',
2566+ name='channel',
2567+ field=models.CharField(help_text='Channel for the Event hosted on the freenode IRC network. Ex. #ubuntu-locoteams', max_length=25, null=True, verbose_name='Event Channel', blank=True),
2568+ preserve_default=True,
2569+ ),
2570+ migrations.AlterField(
2571+ model_name='baseevent',
2572+ name='date_begin',
2573+ field=models.DateTimeField(help_text='Local date and time that the event starts', verbose_name='Local Start Time', db_index=True),
2574+ ),
2575+ migrations.AlterField(
2576+ model_name='baseevent',
2577+ name='date_end',
2578+ field=models.DateTimeField(help_text='Local date and time that the event ends', verbose_name='Local End Time', db_index=True),
2579+ ),
2580+ ]
2581
2582=== added file 'loco_directory/events/migrations/0009_auto_20160816_0019.py'
2583--- loco_directory/events/migrations/0009_auto_20160816_0019.py 1970-01-01 00:00:00 +0000
2584+++ loco_directory/events/migrations/0009_auto_20160816_0019.py 2016-08-16 07:31:30 +0000
2585@@ -0,0 +1,28 @@
2586+# -*- coding: utf-8 -*-
2587+from __future__ import unicode_literals
2588+
2589+from django.db import models, migrations
2590+from django.conf import settings
2591+import events.fields
2592+
2593+
2594+class Migration(migrations.Migration):
2595+
2596+ dependencies = [
2597+ migrations.swappable_dependency(settings.AUTH_USER_MODEL),
2598+ ('events', '0008_auto_20160816_0011'),
2599+ ]
2600+
2601+ operations = [
2602+ migrations.AddField(
2603+ model_name='teamevent',
2604+ name='created_by',
2605+ field=models.ForeignKey(blank=True, to=settings.AUTH_USER_MODEL, null=True),
2606+ preserve_default=True,
2607+ ),
2608+ migrations.AlterField(
2609+ model_name='attendee',
2610+ name='guests',
2611+ field=events.fields.GuestsField(verbose_name='Additional Guests'),
2612+ ),
2613+ ]
2614
2615=== removed file 'loco_directory/events/migrations/0009_global_event_activities.py'
2616--- loco_directory/events/migrations/0009_global_event_activities.py 2012-02-09 15:00:00 +0000
2617+++ loco_directory/events/migrations/0009_global_event_activities.py 1970-01-01 00:00:00 +0000
2618@@ -1,184 +0,0 @@
2619-# encoding: utf-8
2620-import datetime
2621-from south.db import db
2622-from south.v2 import SchemaMigration
2623-from django.db import models
2624-
2625-class Migration(SchemaMigration):
2626-
2627- def forwards(self, orm):
2628-
2629- # Adding field 'GlobalEvent.activities'
2630- db.add_column('events_globalevent', 'activities', self.gf('django.db.models.fields.TextField')(null=True, blank=True), keep_default=False)
2631-
2632-
2633- def backwards(self, orm):
2634-
2635- # Deleting field 'GlobalEvent.activities'
2636- db.delete_column('events_globalevent', 'activities')
2637-
2638-
2639- models = {
2640- 'auth.group': {
2641- 'Meta': {'object_name': 'Group'},
2642- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
2643- 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
2644- 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
2645- },
2646- 'auth.permission': {
2647- 'Meta': {'ordering': "('content_type__app_label', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
2648- 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
2649- 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
2650- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
2651- 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
2652- },
2653- 'auth.user': {
2654- 'Meta': {'object_name': 'User'},
2655- 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
2656- 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
2657- 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
2658- 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
2659- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
2660- 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
2661- 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
2662- 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
2663- 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
2664- 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
2665- 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
2666- 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
2667- 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
2668- },
2669- 'contenttypes.contenttype': {
2670- 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
2671- 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
2672- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
2673- 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
2674- 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
2675- },
2676- 'events.attendee': {
2677- 'Meta': {'unique_together': "(('team_event', 'attendee_profile'),)", 'object_name': 'Attendee'},
2678- 'attendee_profile': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True'}),
2679- 'guests': ('django.db.models.fields.PositiveSmallIntegerField', [], {}),
2680- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
2681- 'promise': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
2682- 'team_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.TeamEvent']"})
2683- },
2684- 'events.baseevent': {
2685- 'Meta': {'object_name': 'BaseEvent'},
2686- 'announce': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
2687- 'date_begin': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}),
2688- 'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 2, 9, 2, 3, 36, 943335)', 'db_index': 'True'}),
2689- 'date_end': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}),
2690- 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
2691- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
2692- 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'})
2693- },
2694- 'events.globalevent': {
2695- 'Meta': {'object_name': 'GlobalEvent', '_ormbases': ['events.BaseEvent']},
2696- 'activities': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
2697- 'baseevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['events.BaseEvent']", 'unique': 'True', 'primary_key': 'True'}),
2698- 'channel': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}),
2699- 'microbloghashtag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
2700- 'pictag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'})
2701- },
2702- 'events.teamevent': {
2703- 'Meta': {'object_name': 'TeamEvent', '_ormbases': ['events.BaseEvent']},
2704- 'baseevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['events.BaseEvent']", 'unique': 'True', 'primary_key': 'True'}),
2705- 'channel': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}),
2706- 'contact': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True'}),
2707- 'global_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.GlobalEvent']", 'null': 'True', 'blank': 'True'}),
2708- 'registration': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
2709- 'teams': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Team']", 'db_index': 'True', 'symmetrical': 'False'}),
2710- 'venue': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['venues.Venue']", 'null': 'True', 'blank': 'True'})
2711- },
2712- 'events.teameventcomment': {
2713- 'Meta': {'object_name': 'TeamEventComment'},
2714- 'comment': ('django.db.models.fields.TextField', [], {'db_index': 'True'}),
2715- 'commenter_profile': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True'}),
2716- 'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 2, 9, 2, 3, 36, 945829)', 'db_index': 'True'}),
2717- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
2718- 'team_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.TeamEvent']"})
2719- },
2720- 'teams.continent': {
2721- 'Meta': {'ordering': "('name',)", 'object_name': 'Continent'},
2722- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
2723- 'name': ('django.db.models.fields.TextField', [], {'max_length': '50'})
2724- },
2725- 'teams.country': {
2726- 'Meta': {'ordering': "('name',)", 'object_name': 'Country'},
2727- 'continents': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Continent']", 'symmetrical': 'False'}),
2728- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
2729- 'name': ('django.db.models.fields.TextField', [], {'max_length': '100'})
2730- },
2731- 'teams.language': {
2732- 'Meta': {'ordering': "('name',)", 'object_name': 'Language'},
2733- 'code': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True'}),
2734- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
2735- 'name': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True'})
2736- },
2737- 'teams.team': {
2738- 'Meta': {'ordering': "('approved', 'name')", 'object_name': 'Team', 'db_table': "'teams'"},
2739- 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
2740- 'admin_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'admins'", 'symmetrical': 'False', 'to': "orm['userprofiles.UserProfile']"}),
2741- 'approved': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
2742- 'approved_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
2743- 'city': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
2744- 'contact_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'contacts'", 'symmetrical': 'False', 'to': "orm['userprofiles.UserProfile']"}),
2745- 'countries': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Country']", 'symmetrical': 'False'}),
2746- 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
2747- 'expires_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
2748- 'flickr_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
2749- 'forum_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
2750- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
2751- 'irc_chan': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}),
2752- 'languages': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Language']", 'symmetrical': 'False'}),
2753- 'lp_name': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True'}),
2754- 'microbloghashtag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
2755- 'ml_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
2756- 'mugshot_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
2757- 'name': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '80'}),
2758- 'override_name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'null': 'True', 'blank': 'True'}),
2759- 'owner_profile': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'owner'", 'null': 'True', 'to': "orm['userprofiles.UserProfile']"}),
2760- 'picasa_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
2761- 'pixie_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
2762- 'provides_support': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
2763- 'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
2764- 'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}),
2765- 'web_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
2766- 'wiki_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
2767- },
2768- 'userprofiles.userprofile': {
2769- 'Meta': {'ordering': "('user__username',)", 'object_name': 'UserProfile'},
2770- 'aim': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
2771- 'blog': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
2772- 'facebook': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
2773- 'flickr': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
2774- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
2775- 'identica': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
2776- 'irc': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
2777- 'mugshot': ('django.db.models.fields.URLField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}),
2778- 'picasa': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
2779- 'realname': ('django.db.models.fields.CharField', [], {'max_length': '150', 'blank': 'True'}),
2780- 'twitter': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
2781- 'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}),
2782- 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}),
2783- 'xmpp': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'})
2784- },
2785- 'venues.venue': {
2786- 'Meta': {'unique_together': "(('name', 'country', 'city'), ('longitude', 'latitude'))", 'object_name': 'Venue'},
2787- 'address': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}),
2788- 'city': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}),
2789- 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
2790- 'continent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['teams.Continent']", 'null': 'True'}),
2791- 'country': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['teams.Country']", 'null': 'True'}),
2792- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
2793- 'latitude': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
2794- 'longitude': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
2795- 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}),
2796- 'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
2797- 'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}),
2798- 'venue_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
2799- }
2800- }
2801-
2802- complete_apps = ['events']
2803
2804=== removed file 'loco_directory/events/migrations/0010_auto__chg_field_attendee_guests.py'
2805--- loco_directory/events/migrations/0010_auto__chg_field_attendee_guests.py 2013-02-16 00:29:22 +0000
2806+++ loco_directory/events/migrations/0010_auto__chg_field_attendee_guests.py 1970-01-01 00:00:00 +0000
2807@@ -1,184 +0,0 @@
2808-# encoding: utf-8
2809-import datetime
2810-from south.db import db
2811-from south.v2 import SchemaMigration
2812-from django.db import models
2813-
2814-class Migration(SchemaMigration):
2815-
2816- def forwards(self, orm):
2817-
2818- # Changing field 'Attendee.guests'
2819- db.alter_column('events_attendee', 'guests', self.gf('events.fields.GuestsField')())
2820-
2821-
2822- def backwards(self, orm):
2823-
2824- # Changing field 'Attendee.guests'
2825- db.alter_column('events_attendee', 'guests', self.gf('django.db.models.fields.PositiveSmallIntegerField')())
2826-
2827-
2828- models = {
2829- 'auth.group': {
2830- 'Meta': {'object_name': 'Group'},
2831- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
2832- 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
2833- 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
2834- },
2835- 'auth.permission': {
2836- 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
2837- 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
2838- 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
2839- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
2840- 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
2841- },
2842- 'auth.user': {
2843- 'Meta': {'object_name': 'User'},
2844- 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
2845- 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
2846- 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
2847- 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
2848- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
2849- 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
2850- 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
2851- 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
2852- 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
2853- 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
2854- 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
2855- 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
2856- 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
2857- },
2858- 'contenttypes.contenttype': {
2859- 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
2860- 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
2861- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
2862- 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
2863- 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
2864- },
2865- 'events.attendee': {
2866- 'Meta': {'unique_together': "(('team_event', 'attendee_profile'),)", 'object_name': 'Attendee'},
2867- 'attendee_profile': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True'}),
2868- 'guests': ('events.fields.GuestsField', [], {}),
2869- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
2870- 'promise': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
2871- 'team_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.TeamEvent']"})
2872- },
2873- 'events.baseevent': {
2874- 'Meta': {'object_name': 'BaseEvent'},
2875- 'announce': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
2876- 'date_begin': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}),
2877- 'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2013, 2, 15, 23, 44, 56, 52296)', 'db_index': 'True'}),
2878- 'date_end': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}),
2879- 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
2880- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
2881- 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'})
2882- },
2883- 'events.globalevent': {
2884- 'Meta': {'object_name': 'GlobalEvent', '_ormbases': ['events.BaseEvent']},
2885- 'activities': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
2886- 'baseevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['events.BaseEvent']", 'unique': 'True', 'primary_key': 'True'}),
2887- 'channel': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}),
2888- 'microbloghashtag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
2889- 'pictag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'})
2890- },
2891- 'events.teamevent': {
2892- 'Meta': {'object_name': 'TeamEvent', '_ormbases': ['events.BaseEvent']},
2893- 'baseevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['events.BaseEvent']", 'unique': 'True', 'primary_key': 'True'}),
2894- 'channel': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}),
2895- 'contact': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True'}),
2896- 'global_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.GlobalEvent']", 'null': 'True', 'blank': 'True'}),
2897- 'registration': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
2898- 'teams': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Team']", 'db_index': 'True', 'symmetrical': 'False'}),
2899- 'venue': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['venues.Venue']", 'null': 'True', 'blank': 'True'})
2900- },
2901- 'events.teameventcomment': {
2902- 'Meta': {'object_name': 'TeamEventComment'},
2903- 'comment': ('django.db.models.fields.TextField', [], {'db_index': 'True'}),
2904- 'commenter_profile': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True'}),
2905- 'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2013, 2, 15, 23, 44, 56, 54290)', 'db_index': 'True'}),
2906- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
2907- 'team_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.TeamEvent']"})
2908- },
2909- 'teams.continent': {
2910- 'Meta': {'ordering': "('name',)", 'object_name': 'Continent'},
2911- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
2912- 'name': ('django.db.models.fields.TextField', [], {'max_length': '50'})
2913- },
2914- 'teams.country': {
2915- 'Meta': {'ordering': "('name',)", 'object_name': 'Country'},
2916- 'continents': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Continent']", 'symmetrical': 'False'}),
2917- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
2918- 'name': ('django.db.models.fields.TextField', [], {'max_length': '100'})
2919- },
2920- 'teams.language': {
2921- 'Meta': {'ordering': "('name',)", 'object_name': 'Language'},
2922- 'code': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True'}),
2923- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
2924- 'name': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True'})
2925- },
2926- 'teams.team': {
2927- 'Meta': {'ordering': "('approved', 'name')", 'object_name': 'Team', 'db_table': "'teams'"},
2928- 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
2929- 'admin_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'admins'", 'symmetrical': 'False', 'to': "orm['userprofiles.UserProfile']"}),
2930- 'approved': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
2931- 'approved_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
2932- 'city': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
2933- 'contact_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'contacts'", 'symmetrical': 'False', 'to': "orm['userprofiles.UserProfile']"}),
2934- 'countries': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Country']", 'symmetrical': 'False'}),
2935- 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
2936- 'expires_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
2937- 'flickr_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
2938- 'forum_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
2939- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
2940- 'irc_chan': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}),
2941- 'languages': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Language']", 'symmetrical': 'False'}),
2942- 'lp_name': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True'}),
2943- 'microbloghashtag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
2944- 'ml_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
2945- 'mugshot_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
2946- 'name': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '80'}),
2947- 'override_name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'null': 'True', 'blank': 'True'}),
2948- 'owner_profile': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'owner'", 'null': 'True', 'to': "orm['userprofiles.UserProfile']"}),
2949- 'picasa_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
2950- 'pixie_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
2951- 'provides_support': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
2952- 'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
2953- 'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}),
2954- 'web_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
2955- 'wiki_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
2956- },
2957- 'userprofiles.userprofile': {
2958- 'Meta': {'ordering': "('user__username',)", 'object_name': 'UserProfile'},
2959- 'aim': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
2960- 'blog': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
2961- 'facebook': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
2962- 'flickr': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
2963- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
2964- 'identica': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
2965- 'irc': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
2966- 'mugshot': ('django.db.models.fields.URLField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}),
2967- 'picasa': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
2968- 'realname': ('django.db.models.fields.CharField', [], {'max_length': '150', 'blank': 'True'}),
2969- 'twitter': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
2970- 'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}),
2971- 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}),
2972- 'xmpp': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'})
2973- },
2974- 'venues.venue': {
2975- 'Meta': {'unique_together': "(('name', 'country', 'city'), ('longitude', 'latitude'))", 'object_name': 'Venue'},
2976- 'address': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}),
2977- 'city': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}),
2978- 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
2979- 'continent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['teams.Continent']", 'null': 'True'}),
2980- 'country': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['teams.Country']", 'null': 'True'}),
2981- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
2982- 'latitude': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
2983- 'longitude': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
2984- 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}),
2985- 'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
2986- 'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}),
2987- 'venue_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
2988- }
2989- }
2990-
2991- complete_apps = ['events']
2992
2993=== removed file 'loco_directory/events/migrations/0011_auto__add_field_teamevent_created_by.py'
2994--- loco_directory/events/migrations/0011_auto__add_field_teamevent_created_by.py 2013-02-16 00:29:22 +0000
2995+++ loco_directory/events/migrations/0011_auto__add_field_teamevent_created_by.py 1970-01-01 00:00:00 +0000
2996@@ -1,185 +0,0 @@
2997-# encoding: utf-8
2998-import datetime
2999-from south.db import db
3000-from south.v2 import SchemaMigration
3001-from django.db import models
3002-
3003-class Migration(SchemaMigration):
3004-
3005- def forwards(self, orm):
3006-
3007- # Adding field 'TeamEvent.created_by'
3008- db.add_column('events_teamevent', 'created_by', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'], null=True, blank=True), keep_default=False)
3009-
3010-
3011- def backwards(self, orm):
3012-
3013- # Deleting field 'TeamEvent.created_by'
3014- db.delete_column('events_teamevent', 'created_by_id')
3015-
3016-
3017- models = {
3018- 'auth.group': {
3019- 'Meta': {'object_name': 'Group'},
3020- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
3021- 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
3022- 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
3023- },
3024- 'auth.permission': {
3025- 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
3026- 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
3027- 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
3028- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
3029- 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
3030- },
3031- 'auth.user': {
3032- 'Meta': {'object_name': 'User'},
3033- 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
3034- 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
3035- 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
3036- 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
3037- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
3038- 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
3039- 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
3040- 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
3041- 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
3042- 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
3043- 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
3044- 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
3045- 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
3046- },
3047- 'contenttypes.contenttype': {
3048- 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
3049- 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
3050- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
3051- 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
3052- 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
3053- },
3054- 'events.attendee': {
3055- 'Meta': {'unique_together': "(('team_event', 'attendee_profile'),)", 'object_name': 'Attendee'},
3056- 'attendee_profile': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True'}),
3057- 'guests': ('events.fields.GuestsField', [], {}),
3058- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
3059- 'promise': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
3060- 'team_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.TeamEvent']"})
3061- },
3062- 'events.baseevent': {
3063- 'Meta': {'object_name': 'BaseEvent'},
3064- 'announce': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
3065- 'date_begin': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}),
3066- 'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2013, 2, 15, 23, 47, 40, 592156)', 'db_index': 'True'}),
3067- 'date_end': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}),
3068- 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
3069- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
3070- 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'})
3071- },
3072- 'events.globalevent': {
3073- 'Meta': {'object_name': 'GlobalEvent', '_ormbases': ['events.BaseEvent']},
3074- 'activities': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
3075- 'baseevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['events.BaseEvent']", 'unique': 'True', 'primary_key': 'True'}),
3076- 'channel': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}),
3077- 'microbloghashtag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
3078- 'pictag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'})
3079- },
3080- 'events.teamevent': {
3081- 'Meta': {'object_name': 'TeamEvent', '_ormbases': ['events.BaseEvent']},
3082- 'baseevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['events.BaseEvent']", 'unique': 'True', 'primary_key': 'True'}),
3083- 'channel': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}),
3084- 'contact': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True'}),
3085- 'created_by': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}),
3086- 'global_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.GlobalEvent']", 'null': 'True', 'blank': 'True'}),
3087- 'registration': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
3088- 'teams': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Team']", 'db_index': 'True', 'symmetrical': 'False'}),
3089- 'venue': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['venues.Venue']", 'null': 'True', 'blank': 'True'})
3090- },
3091- 'events.teameventcomment': {
3092- 'Meta': {'object_name': 'TeamEventComment'},
3093- 'comment': ('django.db.models.fields.TextField', [], {'db_index': 'True'}),
3094- 'commenter_profile': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True'}),
3095- 'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2013, 2, 15, 23, 47, 40, 594563)', 'db_index': 'True'}),
3096- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
3097- 'team_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.TeamEvent']"})
3098- },
3099- 'teams.continent': {
3100- 'Meta': {'ordering': "('name',)", 'object_name': 'Continent'},
3101- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
3102- 'name': ('django.db.models.fields.TextField', [], {'max_length': '50'})
3103- },
3104- 'teams.country': {
3105- 'Meta': {'ordering': "('name',)", 'object_name': 'Country'},
3106- 'continents': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Continent']", 'symmetrical': 'False'}),
3107- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
3108- 'name': ('django.db.models.fields.TextField', [], {'max_length': '100'})
3109- },
3110- 'teams.language': {
3111- 'Meta': {'ordering': "('name',)", 'object_name': 'Language'},
3112- 'code': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True'}),
3113- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
3114- 'name': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True'})
3115- },
3116- 'teams.team': {
3117- 'Meta': {'ordering': "('approved', 'name')", 'object_name': 'Team', 'db_table': "'teams'"},
3118- 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
3119- 'admin_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'admins'", 'symmetrical': 'False', 'to': "orm['userprofiles.UserProfile']"}),
3120- 'approved': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
3121- 'approved_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
3122- 'city': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
3123- 'contact_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'contacts'", 'symmetrical': 'False', 'to': "orm['userprofiles.UserProfile']"}),
3124- 'countries': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Country']", 'symmetrical': 'False'}),
3125- 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
3126- 'expires_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
3127- 'flickr_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
3128- 'forum_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
3129- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
3130- 'irc_chan': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}),
3131- 'languages': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Language']", 'symmetrical': 'False'}),
3132- 'lp_name': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True'}),
3133- 'microbloghashtag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
3134- 'ml_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
3135- 'mugshot_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
3136- 'name': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '80'}),
3137- 'override_name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'null': 'True', 'blank': 'True'}),
3138- 'owner_profile': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'owner'", 'null': 'True', 'to': "orm['userprofiles.UserProfile']"}),
3139- 'picasa_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
3140- 'pixie_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
3141- 'provides_support': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
3142- 'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
3143- 'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}),
3144- 'web_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
3145- 'wiki_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
3146- },
3147- 'userprofiles.userprofile': {
3148- 'Meta': {'ordering': "('user__username',)", 'object_name': 'UserProfile'},
3149- 'aim': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
3150- 'blog': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
3151- 'facebook': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
3152- 'flickr': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
3153- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
3154- 'identica': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
3155- 'irc': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
3156- 'mugshot': ('django.db.models.fields.URLField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}),
3157- 'picasa': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
3158- 'realname': ('django.db.models.fields.CharField', [], {'max_length': '150', 'blank': 'True'}),
3159- 'twitter': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
3160- 'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}),
3161- 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}),
3162- 'xmpp': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'})
3163- },
3164- 'venues.venue': {
3165- 'Meta': {'unique_together': "(('name', 'country', 'city'), ('longitude', 'latitude'))", 'object_name': 'Venue'},
3166- 'address': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}),
3167- 'city': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}),
3168- 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
3169- 'continent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['teams.Continent']", 'null': 'True'}),
3170- 'country': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['teams.Country']", 'null': 'True'}),
3171- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
3172- 'latitude': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
3173- 'longitude': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
3174- 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}),
3175- 'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
3176- 'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}),
3177- 'venue_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
3178- }
3179- }
3180-
3181- complete_apps = ['events']
3182
3183=== modified file 'loco_directory/events/models.py'
3184--- loco_directory/events/models.py 2014-04-07 12:45:02 +0000
3185+++ loco_directory/events/models.py 2016-08-16 07:31:30 +0000
3186@@ -24,7 +24,6 @@
3187 import pytz
3188 import datetime
3189
3190-
3191 class BaseEvent(models.Model):
3192 """
3193 a simple basic event
3194@@ -33,7 +32,7 @@
3195 date_begin = models.DateTimeField(help_text=_('Local date and time that the event starts'), verbose_name=_('Local Start Time'), db_index=True)
3196 date_end = models.DateTimeField(help_text=_('Local date and time that the event ends'), verbose_name=_('Local End Time'), db_index=True)
3197 description = models.TextField(help_text=_('Description of the Event'), blank=True, null=True)
3198- announce = models.URLField(verbose_name=_('Announcement'), help_text=_('URL for the announcement'), max_length=200, verify_exists=False, blank=True, null=True)
3199+ announce = models.URLField(verbose_name=_('Announcement'), help_text=_('URL for the announcement'), max_length=200, blank=True, null=True)
3200 date_created = models.DateTimeField(help_text=_('the date and time when the event was created'), default=datetime.datetime.now, db_index=True)
3201
3202 def __unicode__(self):
3203@@ -45,12 +44,20 @@
3204 """
3205 event = cal.add('vevent')
3206 event.add('uid').value = str(self.id)
3207- event.add('dtstart').value = pytz.utc.localize(self.date_begin)
3208- event.add('dtend').value = pytz.utc.localize(self.date_end)
3209 event.add('categories').value = ['Ubuntu Loco Team Event']
3210 event.add('summary').value = self.name or ''
3211 event.add('description').value = self.description or ''
3212
3213+ if self.date_begin.tzinfo is None:
3214+ event.add('dtstart').value = pytz.utc.localize(self.date_begin)
3215+ else:
3216+ event.add('dtstart').value = self.date_begin
3217+
3218+ if self.date_end.tzinfo is None:
3219+ event.add('dtend').value = pytz.utc.localize(self.date_end)
3220+ else:
3221+ event.add('dtend').value = self.date_end
3222+
3223 def is_past(self):
3224 return self.date_end > datetime.datetime.today()
3225
3226@@ -94,7 +101,7 @@
3227 global_event = models.ForeignKey(GlobalEvent, help_text=_('this team event is part of the selected global event'), verbose_name=_('Related Global Event'), blank=True, null=True)
3228 venue = models.ForeignKey(Venue, help_text=_('Venue for the Event'), verbose_name=_('Event Venue'), blank=True, null=True)
3229 channel = models.CharField(help_text=_('Channel for the Event hosted on the freenode IRC network. Ex. #ubuntu-us-fl'), max_length=25, verbose_name=_('Event Channel'), blank=True, null=True)
3230- registration = models.URLField(verbose_name=_('Registration URL'), help_text=_('URL to register attendance (leave blank to use the built-in registration system)'), max_length=200, verify_exists=False, blank=True, null=True)
3231+ registration = models.URLField(verbose_name=_('Registration URL'), help_text=_('URL to register attendance (leave blank to use the built-in registration system)'), max_length=200, blank=True, null=True)
3232
3233 objects = TeamEventManager()
3234
3235@@ -111,8 +118,6 @@
3236 """
3237 event = cal.add('vevent')
3238 event.add('uid').value = str(self.id)
3239- event.add('dtstart').value = pytz.utc.localize(self.date_begin)
3240- event.add('dtend').value = pytz.utc.localize(self.date_end)
3241 event.add('categories').value = ['Ubuntu Loco Team Event']
3242 event.add('summary').value = u"%s" % self.name or ''
3243 event.add('description').value = u"%s" % self.description or ''
3244@@ -122,6 +127,9 @@
3245 #if self.venue:
3246 # event.add('geo').value = u"%s;%s" % (self.venue.latitude, self.venue.longitude)
3247
3248+ event.add('dtstart').value = self.tolocaltime(self.date_begin)
3249+ event.add('dtend').value = self.tolocaltime(self.date_end)
3250+
3251 def get_tz(self):
3252 timezone = 'UTC'
3253 if self.venue:
3254@@ -177,7 +185,6 @@
3255 return total_attending_guests + total_attending_registered
3256
3257 def total_maybe_attending(self):
3258-
3259 total_maybe_attending_guests = queryset_sum('guests', Attendee.objects.filter(team_event__id__exact=self.id).filter(promise="maybe"))
3260 total_maybe_attending_registered = queryset_count('attendee_profile', Attendee.objects.filter(team_event__id__exact=self.id).filter(promise="maybe"))
3261 return total_maybe_attending_guests + total_maybe_attending_registered
3262
3263=== modified file 'loco_directory/events/urls.py'
3264--- loco_directory/events/urls.py 2013-03-11 21:49:37 +0000
3265+++ loco_directory/events/urls.py 2016-08-16 07:31:30 +0000
3266@@ -1,5 +1,5 @@
3267 # -*- coding: utf-8 -*-
3268-from django.conf.urls.defaults import *
3269+from django.conf.urls import *
3270
3271 urlpatterns = patterns('',
3272 #all events
3273
3274=== modified file 'loco_directory/events/views.py'
3275--- loco_directory/events/views.py 2013-05-11 14:07:21 +0000
3276+++ loco_directory/events/views.py 2016-08-16 07:31:30 +0000
3277@@ -2,10 +2,10 @@
3278 from django.template import RequestContext
3279 from django.http import HttpResponse, HttpResponseRedirect, Http404
3280 from django.shortcuts import (render_to_response, redirect, get_object_or_404, get_list_or_404)
3281-from django.contrib.auth.decorators import login_required
3282-from django.utils import simplejson
3283 from django.utils.translation import ugettext as _
3284 from django.db.models import Count
3285+from django.contrib.auth.decorators import login_required
3286+from django.contrib import messages
3287
3288 from .models import (TeamEvent, GlobalEvent, Attendee, TeamEventComment)
3289 from teams.models import Team
3290@@ -18,6 +18,8 @@
3291
3292 import datetime
3293 import vobject
3294+import json
3295+import pytz
3296
3297
3298 def event_list(request):
3299@@ -39,7 +41,7 @@
3300 def event_list_ical(events, name):
3301 """Return any list events as an ical"""
3302 filename = "%s.ics" % name.replace(' ', '-').lower()
3303- response = HttpResponse(mimetype='text/calendar')
3304+ response = HttpResponse(content_type='text/calendar')
3305 response['Content-Disposition'] = 'attachment; filename=%s' % filename.encode('ascii', 'replace')
3306 calendar = vobject.iCalendar()
3307 calendar.add('prodid').value = '-//loco.ubuntu.com//EN'
3308@@ -143,9 +145,9 @@
3309 if form.is_valid():
3310 team_event_comment = form.save(commit=False)
3311 team_event_comment.team_event = team_event
3312- team_event_comment.commenter_profile = request.user.get_profile()
3313+ team_event_comment.commenter_profile = request.user.profile
3314 team_event_comment.save()
3315- request.user.message_set.create(message=_('Your comment has been saved.'))
3316+ messages.success(request,_('Your comment has been saved.'))
3317 return redirect(team_event)
3318 else:
3319 form = TeamEventCommentForm()
3320@@ -180,13 +182,13 @@
3321 if is_on_lc or is_contact:
3322 if request.method == 'POST':
3323 team_event_object.delete()
3324- request.user.message_set.create(message=_('Team Event removed.'))
3325+ messages.success(request,_('Team Event removed.'))
3326 return redirect('event-list')
3327 else:
3328 context = {'team_event_object': team_event_object}
3329 return render_to_response('events/team_event_delete_confirm.html', context, RequestContext(request))
3330 else:
3331- request.user.message_set.create(message='%s %s' % (_('You can not remove this team event.'), _('You are not an admin/owner of the Launchpad team or on the LoCo Council.')))
3332+ messages.error(request,message='%s %s' % (_('You can not remove this team event.'), _('You are not an admin/owner of the Launchpad team or on the LoCo Council.')))
3333 return redirect(team_event_object)
3334
3335
3336@@ -194,7 +196,7 @@
3337 def team_event_select(request):
3338 teams = Team.objects.filter(lp_name__in=[g.name for g in request.user.groups.all()])
3339 if len(teams) == 0:
3340- request.user.message_set.create(message='%s %s' % (_('You can not add a new team event.'), _('You are not a member of any LoCo Teams.')))
3341+ messages.error(request,'%s %s' % (_('You can not add a new team event.'), _('You are not a member of any LoCo Teams.')))
3342 return redirect('event-list')
3343 elif len(teams) == 1:
3344 from django.core import urlresolvers
3345@@ -245,7 +247,7 @@
3346 context, RequestContext(request))
3347 else:
3348 # XXX: Once we move to a new ACL system, this needs fixing.
3349- request.user.message_set.create(message='%s %s' % (_('You can not add a new event for this team.'), _('You are not a member of the team or on the LoCo Council.')))
3350+ messages.error(request,'%s %s' % (_('You can not add a new event for this team.'), _('You are not a member of the team or on the LoCo Council.')))
3351 return redirect(team_object)
3352
3353
3354@@ -284,7 +286,7 @@
3355 context, RequestContext(request))
3356 else:
3357 # XXX: Once we move to a new ACL system, this needs fixing.
3358- request.user.message_set.create(message='%s %s' % (_('You can not add a new event for this team.'), _('You are not a member of the team or on the LoCo Council.')))
3359+ messages.error(request,'%s %s' % (_('You can not add a new event for this team.'), _('You are not a member of the team or on the LoCo Council.')))
3360 return redirect(team_object)
3361
3362
3363@@ -309,7 +311,7 @@
3364 form = TeamEventForm(data=request.POST, instance=team_event, teams=teams)
3365 if form.is_valid():
3366 form.save()
3367- request.user.message_set.create(message=_('Team Event updated.'))
3368+ messages.success(request,_('Team Event updated.'))
3369 return redirect(team_event)
3370 else:
3371 form = TeamEventForm(instance=team_event, teams=teams)
3372@@ -322,7 +324,7 @@
3373 context, RequestContext(request)
3374 )
3375 else:
3376- request.user.message_set.create(message='%s %s' % (_('You can not update this team event.'), _('You are not a member of the team or on the LoCo Council.')))
3377+ messages.error(request,'%s %s' % (_('You can not update this team event.'), _('You are not a member of the team or on the LoCo Council.')))
3378 return redirect(team_event)
3379
3380
3381@@ -333,21 +335,21 @@
3382 """
3383 team_event_object = get_object_or_404(TeamEvent, pk=team_event_id)
3384 if team_event_object.is_attending(request.user):
3385- attendee_object = team_event_object.attendee_set.get(attendee_profile=request.user.get_profile())
3386+ attendee_object = team_event_object.attendee_set.get(attendee_profile=request.user.profile)
3387 else:
3388- attendee_object = Attendee(team_event=team_event_object, attendee_profile=request.user.get_profile())
3389+ attendee_object = Attendee(team_event=team_event_object, attendee_profile=request.user.profile)
3390
3391 if request.method == 'POST':
3392 form = AttendeeRegistrationForm(instance=attendee_object, data=request.POST)
3393 if form.is_valid():
3394 form.save()
3395- request.user.message_set.create(message=_('Your registration has been saved.'))
3396+ messages.success(request,_('Your registration has been saved.'))
3397 return redirect(team_event_object)
3398 else:
3399 form = AttendeeRegistrationForm(instance=attendee_object, initial={'guests': 0})
3400
3401 is_past_event = False
3402- if team_event_object.date_end < datetime.datetime.now():
3403+ if team_event_object.date_end < pytz.utc.localize(datetime.datetime.now()):
3404 is_past_event = True
3405
3406 context = {
3407@@ -371,9 +373,9 @@
3408 if form.is_valid():
3409 team_event_comment = form.save(commit=False)
3410 team_event_comment.team_event = team_event_object
3411- team_event_comment.commenter_profile = request.user.get_profile()
3412+ team_event_comment.commenter_profile = request.user.profile
3413 team_event_comment.save()
3414- request.user.message_set.create(message=_('Comment saved.'))
3415+ messages.success(request,_('Comment saved.'))
3416 return redirect(team_event_object)
3417 else:
3418 form = TeamEventCommentForm()
3419@@ -431,13 +433,13 @@
3420 if is_on_lc:
3421 if request.method == 'POST':
3422 global_event_object.delete()
3423- request.user.message_set.create(message=_('Global Event removed.'))
3424+ messages.success(request,_('Global Event removed.'))
3425 return redirect('event-list')
3426 else:
3427 context = {'global_event_object': global_event_object}
3428 return render_to_response('events/global_event_delete_confirm.html', context, RequestContext(request))
3429 else:
3430- request.user.message_set.create(message='%s %s' % (_('You can not remove this global event.'), _('You are not on the LoCo Council.')))
3431+ messages.error(request,'%s %s' % (_('You can not remove this global event.'), _('You are not on the LoCo Council.')))
3432 return redirect(global_event_object)
3433
3434
3435@@ -452,7 +454,7 @@
3436 form = GlobalEventForm(data=request.POST)
3437 if form.is_valid():
3438 form.save()
3439- request.user.message_set.create(message=_('New Global Event created.'))
3440+ messages.success(request,_('New Global Event created.'))
3441 return redirect('event-list')
3442 else:
3443 form = GlobalEventForm()
3444@@ -463,7 +465,7 @@
3445 return render_to_response('events/global_event_new.html',
3446 context, RequestContext(request))
3447 else:
3448- request.user.message_set.create(message='%s %s' % (_('You can not add a new global event.'), _('You are not on the LoCo Council.')))
3449+ messages.error(request,'%s %s' % (_('You can not add a new global event.'), _('You are not on the LoCo Council.')))
3450 return redirect('event-list')
3451
3452
3453@@ -480,7 +482,7 @@
3454 form = GlobalEventForm(data=request.POST, instance=global_event_object)
3455 if form.is_valid():
3456 form.save()
3457- request.user.message_set.create(message=_('Global Event updated.'))
3458+ messages.success(request,_('Global Event updated.'))
3459 return redirect(global_event_object)
3460 else:
3461 form = GlobalEventForm(instance=global_event_object)
3462@@ -491,7 +493,7 @@
3463 return render_to_response('events/global_event_update.html',
3464 context, RequestContext(request))
3465 else:
3466- request.user.message_set.create(message='%s %s' % (_('You can not update this global event.'), _('You are not on the LoCo Council.')))
3467+ messages.error(request,'%s %s' % (_('You can not update this global event.'), _('You are not on the LoCo Council.')))
3468 return redirect(global_event_object)
3469
3470
3471@@ -515,7 +517,7 @@
3472 location['lat'] = event.venue.latitude
3473 locations.append(location)
3474
3475- json = simplejson.dumps(locations)
3476+ json = json.dumps(locations)
3477
3478 return HttpResponse(json)
3479
3480@@ -539,7 +541,7 @@
3481 location['lat'] = event.venue.latitude
3482 locations.append(location)
3483
3484- json = simplejson.dumps(locations)
3485+ json = json.dumps(locations)
3486
3487 return HttpResponse(json)
3488
3489@@ -581,7 +583,7 @@
3490 response_dict.update({'success': False, 'response': _('Missing arguments.')})
3491 else:
3492 response_dict.update({'success': False, 'response': _('You can\'t edit this comment using this method.')})
3493- return HttpResponse(simplejson.dumps(response_dict), mimetype='application/json')
3494+ return HttpResponse(json.dumps(response_dict), content_type='application/json')
3495
3496
3497 @login_required
3498@@ -593,7 +595,7 @@
3499 comment = get_object_or_404(TeamEventComment, pk=pk)
3500 if comment.commenter_profile.user == request.user:
3501 comment.delete()
3502- request.user.message_set.create(message=_('Your comment has been removed.'))
3503+ messages.success(request,_('Your comment has been removed.'))
3504 if next:
3505 redirect_to = next
3506 else:
3507
3508=== modified file 'loco_directory/manage.py'
3509--- loco_directory/manage.py 2011-06-29 18:35:40 +0000
3510+++ loco_directory/manage.py 2016-08-16 07:31:30 +0000
3511@@ -1,11 +1,9 @@
3512 #!/usr/bin/env python
3513-from django.core.management import execute_manager
3514-try:
3515- import settings # Assumed to be in the same directory.
3516-except ImportError:
3517- import sys
3518- sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n(If the file settings.py does indeed exist, it's causing an ImportError somehow.)\n" % __file__)
3519- sys.exit(1)
3520+import os, sys
3521
3522 if __name__ == "__main__":
3523- execute_manager(settings)
3524+ os.environ.setdefault("DJANGO_SETTINGS_MODULE", "app.settings")
3525+
3526+ from django.core.management import execute_from_command_line
3527+
3528+ execute_from_command_line(sys.argv)
3529
3530=== modified file 'loco_directory/meetings/feeds.py'
3531--- loco_directory/meetings/feeds.py 2013-03-31 01:10:52 +0000
3532+++ loco_directory/meetings/feeds.py 2016-08-16 07:31:30 +0000
3533@@ -1,6 +1,6 @@
3534 # -*- coding: utf-8 -*-
3535 from django.core.urlresolvers import reverse
3536-from django.contrib.syndication.feeds import Feed, FeedDoesNotExist
3537+from django.contrib.syndication.views import Feed, FeedDoesNotExist
3538 from django.utils import translation
3539 from django.template import loader, Context
3540
3541@@ -12,7 +12,9 @@
3542
3543
3544 class TeamMeetingFeed(Feed):
3545- def get_object(self, bits):
3546+
3547+ def get_object(self, request, bits):
3548+ bits = bits.split('/')
3549 if len(bits) >= 1:
3550 try:
3551 lang = bits[1]
3552
3553=== modified file 'loco_directory/meetings/forms.py'
3554--- loco_directory/meetings/forms.py 2013-04-14 23:34:16 +0000
3555+++ loco_directory/meetings/forms.py 2016-08-16 07:31:30 +0000
3556@@ -27,9 +27,13 @@
3557 """
3558 a form to create/update a BaseMeeting
3559 """
3560+
3561+ date_begin = forms.SplitDateTimeField(widget=DateTimeWidget)
3562+ date_end = forms.SplitDateTimeField(widget=DateTimeWidget)
3563+
3564 class Meta:
3565 model = BaseMeeting
3566- exclude = ('date_created')
3567+ exclude = ('date_created',)
3568
3569 class Media:
3570 css = {'all': (
3571@@ -40,10 +44,10 @@
3572 settings.MEDIA_URL + 'js/events-ui.js',
3573 )
3574
3575- def __init__(self, *args, **kargs):
3576- super(BaseMeetingForm, self).__init__(*args, **kargs)
3577- self.fields['date_begin'].widget = DateTimeWidget()
3578- self.fields['date_end'].widget = DateTimeWidget()
3579+ # def __init__(self, *args, **kargs):
3580+ # super(BaseMeetingForm, self).__init__(*args, **kargs)
3581+ # self.fields['date_begin'].widget = DateTimeWidget()
3582+ # self.fields['date_end'].widget = DateTimeWidget()
3583
3584 def clean(self):
3585 begin = self.cleaned_data.get('date_begin')
3586@@ -69,7 +73,7 @@
3587 'chair',
3588 'logs'
3589 )
3590- exclude = ('teams', 'date_created')
3591+ exclude = ('teams', 'date_created',)
3592
3593 def __init__(self, teams=None, *args, **kargs):
3594 super(TeamMeetingForm, self).__init__(*args, **kargs)
3595@@ -121,7 +125,7 @@
3596
3597 class Meta:
3598 model = AgendaItem
3599- exclude = ('meeting', 'created_date')
3600+ exclude = ('meeting', 'created_date',)
3601
3602 def __init__(self, *args, **kargs):
3603 super(AgendaItemForm, self).__init__(*args, **kargs)
3604
3605=== removed file 'loco_directory/meetings/migrations/0001_add_meetings.py'
3606--- loco_directory/meetings/migrations/0001_add_meetings.py 2010-12-02 13:47:55 +0000
3607+++ loco_directory/meetings/migrations/0001_add_meetings.py 1970-01-01 00:00:00 +0000
3608@@ -1,153 +0,0 @@
3609-
3610-from south.db import db
3611-from django.db import models
3612-from meetings.models import *
3613-
3614-class Migration:
3615-
3616- def forwards(self, orm):
3617-
3618- # Adding model 'BaseMeeting'
3619- db.create_table('meetings_basemeeting', (
3620- ('id', orm['meetings.BaseMeeting:id']),
3621- ('name', orm['meetings.BaseMeeting:name']),
3622- ('date_begin', orm['meetings.BaseMeeting:date_begin']),
3623- ('date_end', orm['meetings.BaseMeeting:date_end']),
3624- ('date_created', orm['meetings.BaseMeeting:date_created']),
3625- ))
3626- db.send_create_signal('meetings', ['BaseMeeting'])
3627-
3628- # Adding model 'TeamMeeting'
3629- db.create_table('meetings_teammeeting', (
3630- ('basemeeting_ptr', orm['meetings.TeamMeeting:basemeeting_ptr']),
3631- ))
3632- db.send_create_signal('meetings', ['TeamMeeting'])
3633-
3634- # Adding ManyToManyField 'TeamMeeting.teams'
3635- db.create_table('meetings_teammeeting_teams', (
3636- ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)),
3637- ('teammeeting', models.ForeignKey(orm.TeamMeeting, null=False)),
3638- ('team', models.ForeignKey(orm['teams.Team'], null=False))
3639- ))
3640-
3641-
3642-
3643- def backwards(self, orm):
3644-
3645- # Deleting model 'BaseMeeting'
3646- db.delete_table('meetings_basemeeting')
3647-
3648- # Deleting model 'TeamMeeting'
3649- db.delete_table('meetings_teammeeting')
3650-
3651- # Dropping ManyToManyField 'TeamMeeting.teams'
3652- db.delete_table('meetings_teammeeting_teams')
3653-
3654-
3655-
3656- models = {
3657- 'auth.group': {
3658- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
3659- 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
3660- 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
3661- },
3662- 'auth.permission': {
3663- 'Meta': {'unique_together': "(('content_type', 'codename'),)"},
3664- 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
3665- 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
3666- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
3667- 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
3668- },
3669- 'auth.user': {
3670- 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
3671- 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
3672- 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
3673- 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
3674- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
3675- 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}),
3676- 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
3677- 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
3678- 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
3679- 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
3680- 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
3681- 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
3682- 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
3683- },
3684- 'contenttypes.contenttype': {
3685- 'Meta': {'unique_together': "(('app_label', 'model'),)", 'db_table': "'django_content_type'"},
3686- 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
3687- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
3688- 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
3689- 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
3690- },
3691- 'meetings.basemeeting': {
3692- 'date_begin': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}),
3693- 'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2010, 12, 2, 13, 45, 29, 466637)', 'db_index': 'True'}),
3694- 'date_end': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}),
3695- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
3696- 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'})
3697- },
3698- 'meetings.teammeeting': {
3699- 'basemeeting_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['meetings.BaseMeeting']", 'unique': 'True', 'primary_key': 'True'}),
3700- 'teams': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Team']", 'db_index': 'True', 'symmetrical': 'False'})
3701- },
3702- 'teams.continent': {
3703- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
3704- 'name': ('django.db.models.fields.TextField', [], {'max_length': '50'})
3705- },
3706- 'teams.country': {
3707- 'continents': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Continent']", 'symmetrical': 'False'}),
3708- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
3709- 'name': ('django.db.models.fields.TextField', [], {'max_length': '100'})
3710- },
3711- 'teams.language': {
3712- 'code': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True'}),
3713- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
3714- 'name': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True'})
3715- },
3716- 'teams.team': {
3717- 'Meta': {'db_table': "'teams'"},
3718- 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}),
3719- 'admin_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['userprofiles.UserProfile']", 'symmetrical': 'False'}),
3720- 'approved': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
3721- 'approved_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
3722- 'city': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
3723- 'contact_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['userprofiles.UserProfile']", 'symmetrical': 'False'}),
3724- 'countries': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Country']", 'symmetrical': 'False'}),
3725- 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
3726- 'expires_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
3727- 'flickr_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
3728- 'forum_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
3729- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
3730- 'irc_chan': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}),
3731- 'languages': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Language']", 'symmetrical': 'False'}),
3732- 'lp_name': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True'}),
3733- 'ml_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
3734- 'mugshot_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
3735- 'name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'null': 'True'}),
3736- 'owner_profile': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'owner'", 'null': 'True', 'to': "orm['userprofiles.UserProfile']"}),
3737- 'picasa_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
3738- 'pixie_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
3739- 'provides_support': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}),
3740- 'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
3741- 'web_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
3742- 'wiki_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
3743- },
3744- 'userprofiles.userprofile': {
3745- 'aim': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
3746- 'blog': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
3747- 'facebook': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
3748- 'flickr': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
3749- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
3750- 'identica': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
3751- 'irc': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
3752- 'picasa': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
3753- 'realname': ('django.db.models.fields.CharField', [], {'max_length': '150', 'blank': 'True'}),
3754- 'twitter': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
3755- 'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}),
3756- 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}),
3757- 'xmpp': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'})
3758- }
3759- }
3760-
3761- complete_apps = ['meetings']
3762
3763=== added file 'loco_directory/meetings/migrations/0001_initial.py'
3764--- loco_directory/meetings/migrations/0001_initial.py 1970-01-01 00:00:00 +0000
3765+++ loco_directory/meetings/migrations/0001_initial.py 2016-08-16 07:31:30 +0000
3766@@ -0,0 +1,40 @@
3767+# -*- coding: utf-8 -*-
3768+from __future__ import unicode_literals
3769+
3770+from django.db import models, migrations
3771+import datetime
3772+
3773+
3774+class Migration(migrations.Migration):
3775+
3776+ dependencies = [
3777+ ('teams', '0009_auto_20160815_2339'),
3778+ ]
3779+
3780+ operations = [
3781+ migrations.CreateModel(
3782+ name='BaseMeeting',
3783+ fields=[
3784+ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
3785+ ('name', models.CharField(max_length=150, verbose_name='Meeting Name')),
3786+ ('date_begin', models.DateTimeField(help_text='start date and local time of the meeting in UTC', verbose_name='Begins', db_index=True)),
3787+ ('date_end', models.DateTimeField(help_text='end date and local time of the meeting in UTC', verbose_name='Ends', db_index=True)),
3788+ ('channel', models.CharField(help_text='Channel that the meeting will be held in. Include #', max_length=150, null=True, verbose_name='Meeting Channel')),
3789+ ('logs', models.URLField(help_text='After the meeting, add a link to the meeting log', null=True, verbose_name='Meeting Log', blank=True)),
3790+ ('date_created', models.DateTimeField(default=datetime.datetime(2016, 8, 15, 23, 40, 30, 987478), help_text='the date and time when the event was created', db_index=True)),
3791+ ],
3792+ options={
3793+ },
3794+ bases=(models.Model,),
3795+ ),
3796+ migrations.CreateModel(
3797+ name='TeamMeeting',
3798+ fields=[
3799+ ('basemeeting_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='meetings.BaseMeeting')),
3800+ ('teams', models.ManyToManyField(help_text='teams of this meeting.', to='teams.Team', verbose_name='Teams Participating', db_index=True)),
3801+ ],
3802+ options={
3803+ },
3804+ bases=('meetings.basemeeting',),
3805+ ),
3806+ ]
3807
3808=== added file 'loco_directory/meetings/migrations/0002_auto_20160815_2342.py'
3809--- loco_directory/meetings/migrations/0002_auto_20160815_2342.py 1970-01-01 00:00:00 +0000
3810+++ loco_directory/meetings/migrations/0002_auto_20160815_2342.py 2016-08-16 07:31:30 +0000
3811@@ -0,0 +1,45 @@
3812+# -*- coding: utf-8 -*-
3813+from __future__ import unicode_literals
3814+
3815+from django.db import models, migrations
3816+import datetime
3817+
3818+
3819+class Migration(migrations.Migration):
3820+
3821+ dependencies = [
3822+ ('userprofiles', '0002_auto_20160815_2339'),
3823+ ('meetings', '0001_initial'),
3824+ ]
3825+
3826+ operations = [
3827+ migrations.CreateModel(
3828+ name='AgendaItem',
3829+ fields=[
3830+ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
3831+ ('order', models.PositiveIntegerField(help_text='index number of where this item falls in the agenda', verbose_name='Order')),
3832+ ('created_date', models.DateTimeField(help_text='timestamp of when this item was created', verbose_name='Created Date', auto_now_add=True)),
3833+ ('title', models.CharField(help_text='descriptive name for this item', max_length=150, verbose_name='Title')),
3834+ ('description', models.TextField(help_text='detailed description of this item', null=True, verbose_name='Description', blank=True)),
3835+ ('log', models.URLField(help_text="URL to this item's discussion", null=True, verbose_name='Log URL', blank=True)),
3836+ ('meeting', models.ForeignKey(related_name=b'agenda', verbose_name='Meeting', to='meetings.BaseMeeting', help_text='meeting during which this agenda item is to be discussed')),
3837+ ('owner', models.ForeignKey(verbose_name='Owner', to='userprofiles.UserProfile', help_text='person proposing or responsible for this item')),
3838+ ('parent', models.ForeignKey(related_name=b'children', blank=True, to='meetings.AgendaItem', help_text='agenda item that contains this item', null=True, verbose_name='Parent Agenda Item')),
3839+ ],
3840+ options={
3841+ 'ordering': ('parent__id', 'order'),
3842+ },
3843+ bases=(models.Model,),
3844+ ),
3845+ migrations.AddField(
3846+ model_name='basemeeting',
3847+ name='chair',
3848+ field=models.ForeignKey(blank=True, to='userprofiles.UserProfile', null=True),
3849+ preserve_default=True,
3850+ ),
3851+ migrations.AlterField(
3852+ model_name='basemeeting',
3853+ name='date_created',
3854+ field=models.DateTimeField(default=datetime.datetime.now, help_text='the date and time when the event was created', db_index=True),
3855+ ),
3856+ ]
3857
3858=== removed file 'loco_directory/meetings/migrations/0002_channel_logs.py'
3859--- loco_directory/meetings/migrations/0002_channel_logs.py 2010-12-06 16:22:09 +0000
3860+++ loco_directory/meetings/migrations/0002_channel_logs.py 1970-01-01 00:00:00 +0000
3861@@ -1,135 +0,0 @@
3862-
3863-from south.db import db
3864-from django.db import models
3865-from meetings.models import *
3866-
3867-class Migration:
3868-
3869- def forwards(self, orm):
3870-
3871- # Adding field 'BaseMeeting.logs'
3872- db.add_column('meetings_basemeeting', 'logs', orm['meetings.basemeeting:logs'])
3873-
3874- # Adding field 'BaseMeeting.channel'
3875- db.add_column('meetings_basemeeting', 'channel', orm['meetings.basemeeting:channel'])
3876-
3877-
3878-
3879- def backwards(self, orm):
3880-
3881- # Deleting field 'BaseMeeting.logs'
3882- db.delete_column('meetings_basemeeting', 'logs')
3883-
3884- # Deleting field 'BaseMeeting.channel'
3885- db.delete_column('meetings_basemeeting', 'channel')
3886-
3887-
3888-
3889- models = {
3890- 'auth.group': {
3891- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
3892- 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
3893- 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
3894- },
3895- 'auth.permission': {
3896- 'Meta': {'unique_together': "(('content_type', 'codename'),)"},
3897- 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
3898- 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
3899- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
3900- 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
3901- },
3902- 'auth.user': {
3903- 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
3904- 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
3905- 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
3906- 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
3907- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
3908- 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}),
3909- 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
3910- 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
3911- 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
3912- 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
3913- 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
3914- 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
3915- 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
3916- },
3917- 'contenttypes.contenttype': {
3918- 'Meta': {'unique_together': "(('app_label', 'model'),)", 'db_table': "'django_content_type'"},
3919- 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
3920- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
3921- 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
3922- 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
3923- },
3924- 'meetings.basemeeting': {
3925- 'channel': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True'}),
3926- 'date_begin': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}),
3927- 'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2010, 12, 6, 15, 58, 32, 671272)', 'db_index': 'True'}),
3928- 'date_end': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}),
3929- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
3930- 'logs': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
3931- 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'})
3932- },
3933- 'meetings.teammeeting': {
3934- 'basemeeting_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['meetings.BaseMeeting']", 'unique': 'True', 'primary_key': 'True'}),
3935- 'teams': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Team']", 'db_index': 'True', 'symmetrical': 'False'})
3936- },
3937- 'teams.continent': {
3938- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
3939- 'name': ('django.db.models.fields.TextField', [], {'max_length': '50'})
3940- },
3941- 'teams.country': {
3942- 'continents': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Continent']", 'symmetrical': 'False'}),
3943- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
3944- 'name': ('django.db.models.fields.TextField', [], {'max_length': '100'})
3945- },
3946- 'teams.language': {
3947- 'code': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True'}),
3948- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
3949- 'name': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True'})
3950- },
3951- 'teams.team': {
3952- 'Meta': {'db_table': "'teams'"},
3953- 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}),
3954- 'admin_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['userprofiles.UserProfile']", 'symmetrical': 'False'}),
3955- 'approved': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
3956- 'approved_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
3957- 'city': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
3958- 'contact_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['userprofiles.UserProfile']", 'symmetrical': 'False'}),
3959- 'countries': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Country']", 'symmetrical': 'False'}),
3960- 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
3961- 'expires_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
3962- 'flickr_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
3963- 'forum_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
3964- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
3965- 'irc_chan': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}),
3966- 'languages': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Language']", 'symmetrical': 'False'}),
3967- 'lp_name': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True'}),
3968- 'ml_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
3969- 'mugshot_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
3970- 'name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'null': 'True'}),
3971- 'owner_profile': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'owner'", 'null': 'True', 'to': "orm['userprofiles.UserProfile']"}),
3972- 'picasa_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
3973- 'pixie_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
3974- 'provides_support': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}),
3975- 'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
3976- 'web_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
3977- 'wiki_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
3978- },
3979- 'userprofiles.userprofile': {
3980- 'aim': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
3981- 'blog': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
3982- 'facebook': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
3983- 'flickr': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
3984- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
3985- 'identica': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
3986- 'irc': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
3987- 'picasa': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
3988- 'realname': ('django.db.models.fields.CharField', [], {'max_length': '150', 'blank': 'True'}),
3989- 'twitter': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
3990- 'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}),
3991- 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}),
3992- 'xmpp': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'})
3993- }
3994- }
3995-
3996- complete_apps = ['meetings']
3997
3998=== removed file 'loco_directory/meetings/migrations/0003_add_chair.py'
3999--- loco_directory/meetings/migrations/0003_add_chair.py 2010-12-07 21:33:54 +0000
4000+++ loco_directory/meetings/migrations/0003_add_chair.py 1970-01-01 00:00:00 +0000
4001@@ -1,130 +0,0 @@
4002-
4003-from south.db import db
4004-from django.db import models
4005-from meetings.models import *
4006-
4007-class Migration:
4008-
4009- def forwards(self, orm):
4010-
4011- # Adding field 'BaseMeeting.chair'
4012- db.add_column('meetings_basemeeting', 'chair', orm['meetings.basemeeting:chair'])
4013-
4014-
4015-
4016- def backwards(self, orm):
4017-
4018- # Deleting field 'BaseMeeting.chair'
4019- db.delete_column('meetings_basemeeting', 'chair_id')
4020-
4021-
4022-
4023- models = {
4024- 'auth.group': {
4025- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
4026- 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
4027- 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
4028- },
4029- 'auth.permission': {
4030- 'Meta': {'unique_together': "(('content_type', 'codename'),)"},
4031- 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
4032- 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
4033- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
4034- 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
4035- },
4036- 'auth.user': {
4037- 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
4038- 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
4039- 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
4040- 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
4041- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
4042- 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}),
4043- 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
4044- 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
4045- 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
4046- 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
4047- 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
4048- 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
4049- 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
4050- },
4051- 'contenttypes.contenttype': {
4052- 'Meta': {'unique_together': "(('app_label', 'model'),)", 'db_table': "'django_content_type'"},
4053- 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
4054- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
4055- 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
4056- 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
4057- },
4058- 'meetings.basemeeting': {
4059- 'chair': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True', 'blank': 'True'}),
4060- 'channel': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True'}),
4061- 'date_begin': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}),
4062- 'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2010, 12, 7, 20, 0, 18, 626730)', 'db_index': 'True'}),
4063- 'date_end': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}),
4064- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
4065- 'logs': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
4066- 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'})
4067- },
4068- 'meetings.teammeeting': {
4069- 'basemeeting_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['meetings.BaseMeeting']", 'unique': 'True', 'primary_key': 'True'}),
4070- 'teams': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Team']", 'db_index': 'True', 'symmetrical': 'False'})
4071- },
4072- 'teams.continent': {
4073- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
4074- 'name': ('django.db.models.fields.TextField', [], {'max_length': '50'})
4075- },
4076- 'teams.country': {
4077- 'continents': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Continent']", 'symmetrical': 'False'}),
4078- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
4079- 'name': ('django.db.models.fields.TextField', [], {'max_length': '100'})
4080- },
4081- 'teams.language': {
4082- 'code': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True'}),
4083- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
4084- 'name': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True'})
4085- },
4086- 'teams.team': {
4087- 'Meta': {'db_table': "'teams'"},
4088- 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}),
4089- 'admin_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['userprofiles.UserProfile']", 'symmetrical': 'False'}),
4090- 'approved': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
4091- 'approved_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
4092- 'city': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
4093- 'contact_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['userprofiles.UserProfile']", 'symmetrical': 'False'}),
4094- 'countries': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Country']", 'symmetrical': 'False'}),
4095- 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
4096- 'expires_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
4097- 'flickr_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
4098- 'forum_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
4099- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
4100- 'irc_chan': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}),
4101- 'languages': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Language']", 'symmetrical': 'False'}),
4102- 'lp_name': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True'}),
4103- 'ml_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
4104- 'mugshot_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
4105- 'name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'null': 'True'}),
4106- 'owner_profile': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'owner'", 'null': 'True', 'to': "orm['userprofiles.UserProfile']"}),
4107- 'picasa_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
4108- 'pixie_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
4109- 'provides_support': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}),
4110- 'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
4111- 'web_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
4112- 'wiki_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
4113- },
4114- 'userprofiles.userprofile': {
4115- 'aim': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
4116- 'blog': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
4117- 'facebook': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
4118- 'flickr': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
4119- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
4120- 'identica': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
4121- 'irc': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
4122- 'picasa': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
4123- 'realname': ('django.db.models.fields.CharField', [], {'max_length': '150', 'blank': 'True'}),
4124- 'twitter': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
4125- 'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}),
4126- 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}),
4127- 'xmpp': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'})
4128- }
4129- }
4130-
4131- complete_apps = ['meetings']
4132
4133=== added file 'loco_directory/meetings/migrations/0003_auto_20160815_2344.py'
4134--- loco_directory/meetings/migrations/0003_auto_20160815_2344.py 1970-01-01 00:00:00 +0000
4135+++ loco_directory/meetings/migrations/0003_auto_20160815_2344.py 2016-08-16 07:31:30 +0000
4136@@ -0,0 +1,19 @@
4137+# -*- coding: utf-8 -*-
4138+from __future__ import unicode_literals
4139+
4140+from django.db import models, migrations
4141+
4142+
4143+class Migration(migrations.Migration):
4144+
4145+ dependencies = [
4146+ ('meetings', '0002_auto_20160815_2342'),
4147+ ]
4148+
4149+ operations = [
4150+ migrations.AlterField(
4151+ model_name='basemeeting',
4152+ name='chair',
4153+ field=models.ForeignKey(verbose_name='Meeting Chair', blank=True, to='userprofiles.UserProfile', null=True),
4154+ ),
4155+ ]
4156
4157=== removed file 'loco_directory/meetings/migrations/0004_add_agenda.py'
4158--- loco_directory/meetings/migrations/0004_add_agenda.py 2010-12-07 21:33:54 +0000
4159+++ loco_directory/meetings/migrations/0004_add_agenda.py 1970-01-01 00:00:00 +0000
4160@@ -1,152 +0,0 @@
4161-
4162-from south.db import db
4163-from django.db import models
4164-from meetings.models import *
4165-
4166-class Migration:
4167-
4168- def forwards(self, orm):
4169-
4170- # Adding model 'AgendaItem'
4171- db.create_table('meetings_agendaitem', (
4172- ('id', orm['meetings.agendaitem:id']),
4173- ('meeting', orm['meetings.agendaitem:meeting']),
4174- ('parent', orm['meetings.agendaitem:parent']),
4175- ('order', orm['meetings.agendaitem:order']),
4176- ('owner', orm['meetings.agendaitem:owner']),
4177- ('created_date', orm['meetings.agendaitem:created_date']),
4178- ('title', orm['meetings.agendaitem:title']),
4179- ('description', orm['meetings.agendaitem:description']),
4180- ('log', orm['meetings.agendaitem:log']),
4181- ))
4182- db.send_create_signal('meetings', ['AgendaItem'])
4183-
4184-
4185-
4186- def backwards(self, orm):
4187-
4188- # Deleting model 'AgendaItem'
4189- db.delete_table('meetings_agendaitem')
4190-
4191-
4192-
4193- models = {
4194- 'auth.group': {
4195- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
4196- 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
4197- 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
4198- },
4199- 'auth.permission': {
4200- 'Meta': {'unique_together': "(('content_type', 'codename'),)"},
4201- 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
4202- 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
4203- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
4204- 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
4205- },
4206- 'auth.user': {
4207- 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
4208- 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
4209- 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
4210- 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
4211- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
4212- 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}),
4213- 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
4214- 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
4215- 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
4216- 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
4217- 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
4218- 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
4219- 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
4220- },
4221- 'contenttypes.contenttype': {
4222- 'Meta': {'unique_together': "(('app_label', 'model'),)", 'db_table': "'django_content_type'"},
4223- 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
4224- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
4225- 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
4226- 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
4227- },
4228- 'meetings.agendaitem': {
4229- 'created_date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
4230- 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
4231- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
4232- 'log': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
4233- 'meeting': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['meetings.BaseMeeting']"}),
4234- 'order': ('django.db.models.fields.PositiveIntegerField', [], {}),
4235- 'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']"}),
4236- 'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'children'", 'null': 'True', 'to': "orm['meetings.AgendaItem']"}),
4237- 'title': ('django.db.models.fields.CharField', [], {'max_length': '150'})
4238- },
4239- 'meetings.basemeeting': {
4240- 'chair': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True', 'blank': 'True'}),
4241- 'channel': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True'}),
4242- 'date_begin': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}),
4243- 'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2010, 12, 7, 20, 37, 42, 549244)', 'db_index': 'True'}),
4244- 'date_end': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}),
4245- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
4246- 'logs': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
4247- 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'})
4248- },
4249- 'meetings.teammeeting': {
4250- 'basemeeting_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['meetings.BaseMeeting']", 'unique': 'True', 'primary_key': 'True'}),
4251- 'teams': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Team']", 'db_index': 'True', 'symmetrical': 'False'})
4252- },
4253- 'teams.continent': {
4254- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
4255- 'name': ('django.db.models.fields.TextField', [], {'max_length': '50'})
4256- },
4257- 'teams.country': {
4258- 'continents': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Continent']", 'symmetrical': 'False'}),
4259- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
4260- 'name': ('django.db.models.fields.TextField', [], {'max_length': '100'})
4261- },
4262- 'teams.language': {
4263- 'code': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True'}),
4264- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
4265- 'name': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True'})
4266- },
4267- 'teams.team': {
4268- 'Meta': {'db_table': "'teams'"},
4269- 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}),
4270- 'admin_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['userprofiles.UserProfile']", 'symmetrical': 'False'}),
4271- 'approved': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
4272- 'approved_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
4273- 'city': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
4274- 'contact_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['userprofiles.UserProfile']", 'symmetrical': 'False'}),
4275- 'countries': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Country']", 'symmetrical': 'False'}),
4276- 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
4277- 'expires_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
4278- 'flickr_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
4279- 'forum_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
4280- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
4281- 'irc_chan': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}),
4282- 'languages': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Language']", 'symmetrical': 'False'}),
4283- 'lp_name': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True'}),
4284- 'ml_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
4285- 'mugshot_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
4286- 'name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'null': 'True'}),
4287- 'owner_profile': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'owner'", 'null': 'True', 'to': "orm['userprofiles.UserProfile']"}),
4288- 'picasa_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
4289- 'pixie_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
4290- 'provides_support': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}),
4291- 'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
4292- 'web_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
4293- 'wiki_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
4294- },
4295- 'userprofiles.userprofile': {
4296- 'aim': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
4297- 'blog': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
4298- 'facebook': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
4299- 'flickr': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
4300- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
4301- 'identica': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
4302- 'irc': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
4303- 'picasa': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
4304- 'realname': ('django.db.models.fields.CharField', [], {'max_length': '150', 'blank': 'True'}),
4305- 'twitter': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
4306- 'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}),
4307- 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}),
4308- 'xmpp': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'})
4309- }
4310- }
4311-
4312- complete_apps = ['meetings']
4313
4314=== added file 'loco_directory/meetings/migrations/0004_basemeeting_minutes.py'
4315--- loco_directory/meetings/migrations/0004_basemeeting_minutes.py 1970-01-01 00:00:00 +0000
4316+++ loco_directory/meetings/migrations/0004_basemeeting_minutes.py 2016-08-16 07:31:30 +0000
4317@@ -0,0 +1,20 @@
4318+# -*- coding: utf-8 -*-
4319+from __future__ import unicode_literals
4320+
4321+from django.db import models, migrations
4322+
4323+
4324+class Migration(migrations.Migration):
4325+
4326+ dependencies = [
4327+ ('meetings', '0003_auto_20160815_2344'),
4328+ ]
4329+
4330+ operations = [
4331+ migrations.AddField(
4332+ model_name='basemeeting',
4333+ name='minutes',
4334+ field=models.URLField(help_text='After the meeting, add a link to the meeting minutes', null=True, verbose_name='Meeting Minutes', blank=True),
4335+ preserve_default=True,
4336+ ),
4337+ ]
4338
4339=== removed file 'loco_directory/meetings/migrations/0005_add_meeting_minutes.py'
4340--- loco_directory/meetings/migrations/0005_add_meeting_minutes.py 2010-12-25 17:08:56 +0000
4341+++ loco_directory/meetings/migrations/0005_add_meeting_minutes.py 1970-01-01 00:00:00 +0000
4342@@ -1,142 +0,0 @@
4343-
4344-from south.db import db
4345-from django.db import models
4346-from meetings.models import *
4347-
4348-class Migration:
4349-
4350- def forwards(self, orm):
4351-
4352- # Adding field 'BaseMeeting.minutes'
4353- db.add_column('meetings_basemeeting', 'minutes', orm['meetings.basemeeting:minutes'])
4354-
4355-
4356-
4357- def backwards(self, orm):
4358-
4359- # Deleting field 'BaseMeeting.minutes'
4360- db.delete_column('meetings_basemeeting', 'minutes')
4361-
4362-
4363-
4364- models = {
4365- 'auth.group': {
4366- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
4367- 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
4368- 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
4369- },
4370- 'auth.permission': {
4371- 'Meta': {'unique_together': "(('content_type', 'codename'),)"},
4372- 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
4373- 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
4374- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
4375- 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
4376- },
4377- 'auth.user': {
4378- 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
4379- 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
4380- 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
4381- 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
4382- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
4383- 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}),
4384- 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
4385- 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
4386- 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
4387- 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
4388- 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
4389- 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
4390- 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
4391- },
4392- 'contenttypes.contenttype': {
4393- 'Meta': {'unique_together': "(('app_label', 'model'),)", 'db_table': "'django_content_type'"},
4394- 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
4395- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
4396- 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
4397- 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
4398- },
4399- 'meetings.agendaitem': {
4400- 'created_date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
4401- 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
4402- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
4403- 'log': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
4404- 'meeting': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'agenda'", 'to': "orm['meetings.BaseMeeting']"}),
4405- 'order': ('django.db.models.fields.PositiveIntegerField', [], {}),
4406- 'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']"}),
4407- 'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'children'", 'null': 'True', 'to': "orm['meetings.AgendaItem']"}),
4408- 'title': ('django.db.models.fields.CharField', [], {'max_length': '150'})
4409- },
4410- 'meetings.basemeeting': {
4411- 'chair': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True', 'blank': 'True'}),
4412- 'channel': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True'}),
4413- 'date_begin': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}),
4414- 'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2010, 12, 25, 17, 7, 54, 656457)', 'db_index': 'True'}),
4415- 'date_end': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}),
4416- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
4417- 'logs': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
4418- 'minutes': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
4419- 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'})
4420- },
4421- 'meetings.teammeeting': {
4422- 'basemeeting_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['meetings.BaseMeeting']", 'unique': 'True', 'primary_key': 'True'}),
4423- 'teams': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Team']", 'db_index': 'True', 'symmetrical': 'False'})
4424- },
4425- 'teams.continent': {
4426- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
4427- 'name': ('django.db.models.fields.TextField', [], {'max_length': '50'})
4428- },
4429- 'teams.country': {
4430- 'continents': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Continent']", 'symmetrical': 'False'}),
4431- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
4432- 'name': ('django.db.models.fields.TextField', [], {'max_length': '100'})
4433- },
4434- 'teams.language': {
4435- 'code': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True'}),
4436- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
4437- 'name': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True'})
4438- },
4439- 'teams.team': {
4440- 'Meta': {'db_table': "'teams'"},
4441- 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}),
4442- 'admin_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['userprofiles.UserProfile']", 'symmetrical': 'False'}),
4443- 'approved': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
4444- 'approved_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
4445- 'city': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
4446- 'contact_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['userprofiles.UserProfile']", 'symmetrical': 'False'}),
4447- 'countries': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Country']", 'symmetrical': 'False'}),
4448- 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
4449- 'expires_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
4450- 'flickr_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
4451- 'forum_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
4452- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
4453- 'irc_chan': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}),
4454- 'languages': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Language']", 'symmetrical': 'False'}),
4455- 'lp_name': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True'}),
4456- 'ml_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
4457- 'mugshot_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
4458- 'name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'null': 'True'}),
4459- 'owner_profile': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'owner'", 'null': 'True', 'to': "orm['userprofiles.UserProfile']"}),
4460- 'picasa_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
4461- 'pixie_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
4462- 'provides_support': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}),
4463- 'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
4464- 'web_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
4465- 'wiki_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
4466- },
4467- 'userprofiles.userprofile': {
4468- 'aim': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
4469- 'blog': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
4470- 'facebook': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
4471- 'flickr': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
4472- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
4473- 'identica': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
4474- 'irc': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
4475- 'picasa': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
4476- 'realname': ('django.db.models.fields.CharField', [], {'max_length': '150', 'blank': 'True'}),
4477- 'twitter': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
4478- 'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}),
4479- 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}),
4480- 'xmpp': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'})
4481- }
4482- }
4483-
4484- complete_apps = ['meetings']
4485
4486=== added file 'loco_directory/meetings/migrations/0005_auto_20160815_2352.py'
4487--- loco_directory/meetings/migrations/0005_auto_20160815_2352.py 1970-01-01 00:00:00 +0000
4488+++ loco_directory/meetings/migrations/0005_auto_20160815_2352.py 2016-08-16 07:31:30 +0000
4489@@ -0,0 +1,33 @@
4490+# -*- coding: utf-8 -*-
4491+from __future__ import unicode_literals
4492+
4493+from django.db import models, migrations
4494+
4495+
4496+class Migration(migrations.Migration):
4497+
4498+ dependencies = [
4499+ ('meetings', '0004_basemeeting_minutes'),
4500+ ]
4501+
4502+ operations = [
4503+ migrations.AlterModelOptions(
4504+ name='agendaitem',
4505+ options={'ordering': ('parent__id', 'order', 'created_date')},
4506+ ),
4507+ migrations.AlterField(
4508+ model_name='agendaitem',
4509+ name='order',
4510+ field=models.PositiveIntegerField(default=1, help_text='index number of where this item falls in the agenda', verbose_name='Order'),
4511+ ),
4512+ migrations.AlterField(
4513+ model_name='basemeeting',
4514+ name='date_begin',
4515+ field=models.DateTimeField(help_text='start date and time of the meeting in UTC', verbose_name='Begins', db_index=True),
4516+ ),
4517+ migrations.AlterField(
4518+ model_name='basemeeting',
4519+ name='date_end',
4520+ field=models.DateTimeField(help_text='end date and time of the meeting in UTC', verbose_name='Ends', db_index=True),
4521+ ),
4522+ ]
4523
4524=== removed file 'loco_directory/meetings/migrations/0006_add_timezone.py'
4525--- loco_directory/meetings/migrations/0006_add_timezone.py 2011-06-17 17:10:41 +0000
4526+++ loco_directory/meetings/migrations/0006_add_timezone.py 1970-01-01 00:00:00 +0000
4527@@ -1,154 +0,0 @@
4528-
4529-from south.db import db
4530-from django.db import models
4531-from meetings.models import *
4532-
4533-class Migration:
4534-
4535- def forwards(self, orm):
4536-
4537- # Adding field 'TeamMeeting.meeting_tz'
4538- db.add_column('meetings_teammeeting', 'meeting_tz', orm['meetings.teammeeting:meeting_tz'])
4539-
4540- # Changing field 'BaseMeeting.date_created'
4541- # (to signature: django.db.models.fields.DateTimeField(default=datetime.datetime(2011, 6, 17, 15, 22, 56, 255453), db_index=True))
4542- db.alter_column('meetings_basemeeting', 'date_created', orm['meetings.basemeeting:date_created'])
4543-
4544-
4545-
4546- def backwards(self, orm):
4547-
4548- # Deleting field 'TeamMeeting.meeting_tz'
4549- db.delete_column('meetings_teammeeting', 'meeting_tz')
4550-
4551- # Changing field 'BaseMeeting.date_created'
4552- # (to signature: django.db.models.fields.DateTimeField(default=datetime.datetime(2010, 12, 25, 17, 7, 54, 656457), db_index=True))
4553- db.alter_column('meetings_basemeeting', 'date_created', orm['meetings.basemeeting:date_created'])
4554-
4555-
4556-
4557- models = {
4558- 'auth.group': {
4559- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
4560- 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
4561- 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
4562- },
4563- 'auth.permission': {
4564- 'Meta': {'unique_together': "(('content_type', 'codename'),)"},
4565- 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
4566- 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
4567- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
4568- 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
4569- },
4570- 'auth.user': {
4571- 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
4572- 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
4573- 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
4574- 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
4575- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
4576- 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}),
4577- 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
4578- 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
4579- 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
4580- 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
4581- 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
4582- 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
4583- 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
4584- },
4585- 'contenttypes.contenttype': {
4586- 'Meta': {'unique_together': "(('app_label', 'model'),)", 'db_table': "'django_content_type'"},
4587- 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
4588- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
4589- 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
4590- 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
4591- },
4592- 'meetings.agendaitem': {
4593- 'created_date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
4594- 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
4595- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
4596- 'log': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
4597- 'meeting': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'agenda'", 'to': "orm['meetings.BaseMeeting']"}),
4598- 'order': ('django.db.models.fields.PositiveIntegerField', [], {'default': '1'}),
4599- 'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']"}),
4600- 'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'children'", 'null': 'True', 'to': "orm['meetings.AgendaItem']"}),
4601- 'title': ('django.db.models.fields.CharField', [], {'max_length': '150'})
4602- },
4603- 'meetings.basemeeting': {
4604- 'chair': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True', 'blank': 'True'}),
4605- 'channel': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True'}),
4606- 'date_begin': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}),
4607- 'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2011, 6, 17, 15, 22, 56, 255453)', 'db_index': 'True'}),
4608- 'date_end': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}),
4609- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
4610- 'logs': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
4611- 'minutes': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
4612- 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'})
4613- },
4614- 'meetings.teammeeting': {
4615- 'basemeeting_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['meetings.BaseMeeting']", 'unique': 'True', 'primary_key': 'True'}),
4616- 'meeting_tz': ('django.db.models.fields.CharField', [], {'default': "'team'", 'max_length': '32'}),
4617- 'teams': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Team']", 'db_index': 'True', 'symmetrical': 'False'})
4618- },
4619- 'teams.continent': {
4620- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
4621- 'name': ('django.db.models.fields.TextField', [], {'max_length': '50'})
4622- },
4623- 'teams.country': {
4624- 'continents': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Continent']", 'symmetrical': 'False'}),
4625- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
4626- 'name': ('django.db.models.fields.TextField', [], {'max_length': '100'})
4627- },
4628- 'teams.language': {
4629- 'code': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True'}),
4630- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
4631- 'name': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True'})
4632- },
4633- 'teams.team': {
4634- 'Meta': {'db_table': "'teams'"},
4635- 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}),
4636- 'admin_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['userprofiles.UserProfile']", 'symmetrical': 'False'}),
4637- 'approved': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
4638- 'approved_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
4639- 'city': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
4640- 'contact_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['userprofiles.UserProfile']", 'symmetrical': 'False'}),
4641- 'countries': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Country']", 'symmetrical': 'False'}),
4642- 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
4643- 'expires_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
4644- 'flickr_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
4645- 'forum_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
4646- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
4647- 'irc_chan': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}),
4648- 'languages': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Language']", 'symmetrical': 'False'}),
4649- 'lp_name': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True'}),
4650- 'microbloghashtag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
4651- 'ml_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
4652- 'mugshot_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
4653- 'name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'null': 'True'}),
4654- 'owner_profile': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'owner'", 'null': 'True', 'to': "orm['userprofiles.UserProfile']"}),
4655- 'picasa_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
4656- 'pixie_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
4657- 'provides_support': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}),
4658- 'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
4659- 'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}),
4660- 'web_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
4661- 'wiki_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
4662- },
4663- 'userprofiles.userprofile': {
4664- 'aim': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
4665- 'blog': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
4666- 'facebook': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
4667- 'flickr': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
4668- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
4669- 'identica': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
4670- 'irc': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
4671- 'mugshot': ('django.db.models.fields.URLField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}),
4672- 'picasa': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
4673- 'realname': ('django.db.models.fields.CharField', [], {'max_length': '150', 'blank': 'True'}),
4674- 'twitter': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
4675- 'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}),
4676- 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}),
4677- 'xmpp': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'})
4678- }
4679- }
4680-
4681- complete_apps = ['meetings']
4682
4683=== added file 'loco_directory/meetings/migrations/0006_teammeeting_meeting_tz.py'
4684--- loco_directory/meetings/migrations/0006_teammeeting_meeting_tz.py 1970-01-01 00:00:00 +0000
4685+++ loco_directory/meetings/migrations/0006_teammeeting_meeting_tz.py 2016-08-16 07:31:30 +0000
4686@@ -0,0 +1,20 @@
4687+# -*- coding: utf-8 -*-
4688+from __future__ import unicode_literals
4689+
4690+from django.db import models, migrations
4691+
4692+
4693+class Migration(migrations.Migration):
4694+
4695+ dependencies = [
4696+ ('meetings', '0005_auto_20160815_2352'),
4697+ ]
4698+
4699+ operations = [
4700+ migrations.AddField(
4701+ model_name='teammeeting',
4702+ name='meeting_tz',
4703+ field=models.CharField(default=b'', max_length=32, verbose_name='Timezone', choices=[(b'team', b'Team Default'), (b'Africa/Abidjan', b'Africa/Abidjan'), (b'Africa/Accra', b'Africa/Accra'), (b'Africa/Addis_Ababa', b'Africa/Addis_Ababa'), (b'Africa/Algiers', b'Africa/Algiers'), (b'Africa/Asmara', b'Africa/Asmara'), (b'Africa/Asmera', b'Africa/Asmera'), (b'Africa/Bamako', b'Africa/Bamako'), (b'Africa/Bangui', b'Africa/Bangui'), (b'Africa/Banjul', b'Africa/Banjul'), (b'Africa/Bissau', b'Africa/Bissau'), (b'Africa/Blantyre', b'Africa/Blantyre'), (b'Africa/Brazzaville', b'Africa/Brazzaville'), (b'Africa/Bujumbura', b'Africa/Bujumbura'), (b'Africa/Cairo', b'Africa/Cairo'), (b'Africa/Casablanca', b'Africa/Casablanca'), (b'Africa/Ceuta', b'Africa/Ceuta'), (b'Africa/Conakry', b'Africa/Conakry'), (b'Africa/Dakar', b'Africa/Dakar'), (b'Africa/Dar_es_Salaam', b'Africa/Dar_es_Salaam'), (b'Africa/Djibouti', b'Africa/Djibouti'), (b'Africa/Douala', b'Africa/Douala'), (b'Africa/El_Aaiun', b'Africa/El_Aaiun'), (b'Africa/Freetown', b'Africa/Freetown'), (b'Africa/Gaborone', b'Africa/Gaborone'), (b'Africa/Harare', b'Africa/Harare'), (b'Africa/Johannesburg', b'Africa/Johannesburg'), (b'Africa/Juba', b'Africa/Juba'), (b'Africa/Kampala', b'Africa/Kampala'), (b'Africa/Khartoum', b'Africa/Khartoum'), (b'Africa/Kigali', b'Africa/Kigali'), (b'Africa/Kinshasa', b'Africa/Kinshasa'), (b'Africa/Lagos', b'Africa/Lagos'), (b'Africa/Libreville', b'Africa/Libreville'), (b'Africa/Lome', b'Africa/Lome'), (b'Africa/Luanda', b'Africa/Luanda'), (b'Africa/Lubumbashi', b'Africa/Lubumbashi'), (b'Africa/Lusaka', b'Africa/Lusaka'), (b'Africa/Malabo', b'Africa/Malabo'), (b'Africa/Maputo', b'Africa/Maputo'), (b'Africa/Maseru', b'Africa/Maseru'), (b'Africa/Mbabane', b'Africa/Mbabane'), (b'Africa/Mogadishu', b'Africa/Mogadishu'), (b'Africa/Monrovia', b'Africa/Monrovia'), (b'Africa/Nairobi', b'Africa/Nairobi'), (b'Africa/Ndjamena', b'Africa/Ndjamena'), (b'Africa/Niamey', b'Africa/Niamey'), (b'Africa/Nouakchott', b'Africa/Nouakchott'), (b'Africa/Ouagadougou', b'Africa/Ouagadougou'), (b'Africa/Porto-Novo', b'Africa/Porto-Novo'), (b'Africa/Sao_Tome', b'Africa/Sao_Tome'), (b'Africa/Timbuktu', b'Africa/Timbuktu'), (b'Africa/Tripoli', b'Africa/Tripoli'), (b'Africa/Tunis', b'Africa/Tunis'), (b'Africa/Windhoek', b'Africa/Windhoek'), (b'America/Adak', b'America/Adak'), (b'America/Anchorage', b'America/Anchorage'), (b'America/Anguilla', b'America/Anguilla'), (b'America/Antigua', b'America/Antigua'), (b'America/Araguaina', b'America/Araguaina'), (b'America/Argentina/Buenos_Aires', b'America/Argentina/Buenos_Aires'), (b'America/Argentina/Catamarca', b'America/Argentina/Catamarca'), (b'America/Argentina/ComodRivadavia', b'America/Argentina/ComodRivadavia'), (b'America/Argentina/Cordoba', b'America/Argentina/Cordoba'), (b'America/Argentina/Jujuy', b'America/Argentina/Jujuy'), (b'America/Argentina/La_Rioja', b'America/Argentina/La_Rioja'), (b'America/Argentina/Mendoza', b'America/Argentina/Mendoza'), (b'America/Argentina/Rio_Gallegos', b'America/Argentina/Rio_Gallegos'), (b'America/Argentina/Salta', b'America/Argentina/Salta'), (b'America/Argentina/San_Juan', b'America/Argentina/San_Juan'), (b'America/Argentina/San_Luis', b'America/Argentina/San_Luis'), (b'America/Argentina/Tucuman', b'America/Argentina/Tucuman'), (b'America/Argentina/Ushuaia', b'America/Argentina/Ushuaia'), (b'America/Aruba', b'America/Aruba'), (b'America/Asuncion', b'America/Asuncion'), (b'America/Atikokan', b'America/Atikokan'), (b'America/Atka', b'America/Atka'), (b'America/Bahia', b'America/Bahia'), (b'America/Bahia_Banderas', b'America/Bahia_Banderas'), (b'America/Barbados', b'America/Barbados'), (b'America/Belem', b'America/Belem'), (b'America/Belize', b'America/Belize'), (b'America/Blanc-Sablon', b'America/Blanc-Sablon'), (b'America/Boa_Vista', b'America/Boa_Vista'), (b'America/Bogota', b'America/Bogota'), (b'America/Boise', b'America/Boise'), (b'America/Buenos_Aires', b'America/Buenos_Aires'), (b'America/Cambridge_Bay', b'America/Cambridge_Bay'), (b'America/Campo_Grande', b'America/Campo_Grande'), (b'America/Cancun', b'America/Cancun'), (b'America/Caracas', b'America/Caracas'), (b'America/Catamarca', b'America/Catamarca'), (b'America/Cayenne', b'America/Cayenne'), (b'America/Cayman', b'America/Cayman'), (b'America/Chicago', b'America/Chicago'), (b'America/Chihuahua', b'America/Chihuahua'), (b'America/Coral_Harbour', b'America/Coral_Harbour'), (b'America/Cordoba', b'America/Cordoba'), (b'America/Costa_Rica', b'America/Costa_Rica'), (b'America/Creston', b'America/Creston'), (b'America/Cuiaba', b'America/Cuiaba'), (b'America/Curacao', b'America/Curacao'), (b'America/Danmarkshavn', b'America/Danmarkshavn'), (b'America/Dawson', b'America/Dawson'), (b'America/Dawson_Creek', b'America/Dawson_Creek'), (b'America/Denver', b'America/Denver'), (b'America/Detroit', b'America/Detroit'), (b'America/Dominica', b'America/Dominica'), (b'America/Edmonton', b'America/Edmonton'), (b'America/Eirunepe', b'America/Eirunepe'), (b'America/El_Salvador', b'America/El_Salvador'), (b'America/Ensenada', b'America/Ensenada'), (b'America/Fort_Nelson', b'America/Fort_Nelson'), (b'America/Fort_Wayne', b'America/Fort_Wayne'), (b'America/Fortaleza', b'America/Fortaleza'), (b'America/Glace_Bay', b'America/Glace_Bay'), (b'America/Godthab', b'America/Godthab'), (b'America/Goose_Bay', b'America/Goose_Bay'), (b'America/Grand_Turk', b'America/Grand_Turk'), (b'America/Grenada', b'America/Grenada'), (b'America/Guadeloupe', b'America/Guadeloupe'), (b'America/Guatemala', b'America/Guatemala'), (b'America/Guayaquil', b'America/Guayaquil'), (b'America/Guyana', b'America/Guyana'), (b'America/Halifax', b'America/Halifax'), (b'America/Havana', b'America/Havana'), (b'America/Hermosillo', b'America/Hermosillo'), (b'America/Indiana/Indianapolis', b'America/Indiana/Indianapolis'), (b'America/Indiana/Knox', b'America/Indiana/Knox'), (b'America/Indiana/Marengo', b'America/Indiana/Marengo'), (b'America/Indiana/Petersburg', b'America/Indiana/Petersburg'), (b'America/Indiana/Tell_City', b'America/Indiana/Tell_City'), (b'America/Indiana/Vevay', b'America/Indiana/Vevay'), (b'America/Indiana/Vincennes', b'America/Indiana/Vincennes'), (b'America/Indiana/Winamac', b'America/Indiana/Winamac'), (b'America/Indianapolis', b'America/Indianapolis'), (b'America/Inuvik', b'America/Inuvik'), (b'America/Iqaluit', b'America/Iqaluit'), (b'America/Jamaica', b'America/Jamaica'), (b'America/Jujuy', b'America/Jujuy'), (b'America/Juneau', b'America/Juneau'), (b'America/Kentucky/Louisville', b'America/Kentucky/Louisville'), (b'America/Kentucky/Monticello', b'America/Kentucky/Monticello'), (b'America/Knox_IN', b'America/Knox_IN'), (b'America/Kralendijk', b'America/Kralendijk'), (b'America/La_Paz', b'America/La_Paz'), (b'America/Lima', b'America/Lima'), (b'America/Los_Angeles', b'America/Los_Angeles'), (b'America/Louisville', b'America/Louisville'), (b'America/Lower_Princes', b'America/Lower_Princes'), (b'America/Maceio', b'America/Maceio'), (b'America/Managua', b'America/Managua'), (b'America/Manaus', b'America/Manaus'), (b'America/Marigot', b'America/Marigot'), (b'America/Martinique', b'America/Martinique'), (b'America/Matamoros', b'America/Matamoros'), (b'America/Mazatlan', b'America/Mazatlan'), (b'America/Mendoza', b'America/Mendoza'), (b'America/Menominee', b'America/Menominee'), (b'America/Merida', b'America/Merida'), (b'America/Metlakatla', b'America/Metlakatla'), (b'America/Mexico_City', b'America/Mexico_City'), (b'America/Miquelon', b'America/Miquelon'), (b'America/Moncton', b'America/Moncton'), (b'America/Monterrey', b'America/Monterrey'), (b'America/Montevideo', b'America/Montevideo'), (b'America/Montreal', b'America/Montreal'), (b'America/Montserrat', b'America/Montserrat'), (b'America/Nassau', b'America/Nassau'), (b'America/New_York', b'America/New_York'), (b'America/Nipigon', b'America/Nipigon'), (b'America/Nome', b'America/Nome'), (b'America/Noronha', b'America/Noronha'), (b'America/North_Dakota/Beulah', b'America/North_Dakota/Beulah'), (b'America/North_Dakota/Center', b'America/North_Dakota/Center'), (b'America/North_Dakota/New_Salem', b'America/North_Dakota/New_Salem'), (b'America/Ojinaga', b'America/Ojinaga'), (b'America/Panama', b'America/Panama'), (b'America/Pangnirtung', b'America/Pangnirtung'), (b'America/Paramaribo', b'America/Paramaribo'), (b'America/Phoenix', b'America/Phoenix'), (b'America/Port-au-Prince', b'America/Port-au-Prince'), (b'America/Port_of_Spain', b'America/Port_of_Spain'), (b'America/Porto_Acre', b'America/Porto_Acre'), (b'America/Porto_Velho', b'America/Porto_Velho'), (b'America/Puerto_Rico', b'America/Puerto_Rico'), (b'America/Rainy_River', b'America/Rainy_River'), (b'America/Rankin_Inlet', b'America/Rankin_Inlet'), (b'America/Recife', b'America/Recife'), (b'America/Regina', b'America/Regina'), (b'America/Resolute', b'America/Resolute'), (b'America/Rio_Branco', b'America/Rio_Branco'), (b'America/Rosario', b'America/Rosario'), (b'America/Santa_Isabel', b'America/Santa_Isabel'), (b'America/Santarem', b'America/Santarem'), (b'America/Santiago', b'America/Santiago'), (b'America/Santo_Domingo', b'America/Santo_Domingo'), (b'America/Sao_Paulo', b'America/Sao_Paulo'), (b'America/Scoresbysund', b'America/Scoresbysund'), (b'America/Shiprock', b'America/Shiprock'), (b'America/Sitka', b'America/Sitka'), (b'America/St_Barthelemy', b'America/St_Barthelemy'), (b'America/St_Johns', b'America/St_Johns'), (b'America/St_Kitts', b'America/St_Kitts'), (b'America/St_Lucia', b'America/St_Lucia'), (b'America/St_Thomas', b'America/St_Thomas'), (b'America/St_Vincent', b'America/St_Vincent'), (b'America/Swift_Current', b'America/Swift_Current'), (b'America/Tegucigalpa', b'America/Tegucigalpa'), (b'America/Thule', b'America/Thule'), (b'America/Thunder_Bay', b'America/Thunder_Bay'), (b'America/Tijuana', b'America/Tijuana'), (b'America/Toronto', b'America/Toronto'), (b'America/Tortola', b'America/Tortola'), (b'America/Vancouver', b'America/Vancouver'), (b'America/Virgin', b'America/Virgin'), (b'America/Whitehorse', b'America/Whitehorse'), (b'America/Winnipeg', b'America/Winnipeg'), (b'America/Yakutat', b'America/Yakutat'), (b'America/Yellowknife', b'America/Yellowknife'), (b'Antarctica/Casey', b'Antarctica/Casey'), (b'Antarctica/Davis', b'Antarctica/Davis'), (b'Antarctica/DumontDUrville', b'Antarctica/DumontDUrville'), (b'Antarctica/Macquarie', b'Antarctica/Macquarie'), (b'Antarctica/Mawson', b'Antarctica/Mawson'), (b'Antarctica/McMurdo', b'Antarctica/McMurdo'), (b'Antarctica/Palmer', b'Antarctica/Palmer'), (b'Antarctica/Rothera', b'Antarctica/Rothera'), (b'Antarctica/South_Pole', b'Antarctica/South_Pole'), (b'Antarctica/Syowa', b'Antarctica/Syowa'), (b'Antarctica/Troll', b'Antarctica/Troll'), (b'Antarctica/Vostok', b'Antarctica/Vostok'), (b'Arctic/Longyearbyen', b'Arctic/Longyearbyen'), (b'Asia/Aden', b'Asia/Aden'), (b'Asia/Almaty', b'Asia/Almaty'), (b'Asia/Amman', b'Asia/Amman'), (b'Asia/Anadyr', b'Asia/Anadyr'), (b'Asia/Aqtau', b'Asia/Aqtau'), (b'Asia/Aqtobe', b'Asia/Aqtobe'), (b'Asia/Ashgabat', b'Asia/Ashgabat'), (b'Asia/Ashkhabad', b'Asia/Ashkhabad'), (b'Asia/Baghdad', b'Asia/Baghdad'), (b'Asia/Bahrain', b'Asia/Bahrain'), (b'Asia/Baku', b'Asia/Baku'), (b'Asia/Bangkok', b'Asia/Bangkok'), (b'Asia/Barnaul', b'Asia/Barnaul'), (b'Asia/Beirut', b'Asia/Beirut'), (b'Asia/Bishkek', b'Asia/Bishkek'), (b'Asia/Brunei', b'Asia/Brunei'), (b'Asia/Calcutta', b'Asia/Calcutta'), (b'Asia/Chita', b'Asia/Chita'), (b'Asia/Choibalsan', b'Asia/Choibalsan'), (b'Asia/Chongqing', b'Asia/Chongqing'), (b'Asia/Chungking', b'Asia/Chungking'), (b'Asia/Colombo', b'Asia/Colombo'), (b'Asia/Dacca', b'Asia/Dacca'), (b'Asia/Damascus', b'Asia/Damascus'), (b'Asia/Dhaka', b'Asia/Dhaka'), (b'Asia/Dili', b'Asia/Dili'), (b'Asia/Dubai', b'Asia/Dubai'), (b'Asia/Dushanbe', b'Asia/Dushanbe'), (b'Asia/Gaza', b'Asia/Gaza'), (b'Asia/Harbin', b'Asia/Harbin'), (b'Asia/Hebron', b'Asia/Hebron'), (b'Asia/Ho_Chi_Minh', b'Asia/Ho_Chi_Minh'), (b'Asia/Hong_Kong', b'Asia/Hong_Kong'), (b'Asia/Hovd', b'Asia/Hovd'), (b'Asia/Irkutsk', b'Asia/Irkutsk'), (b'Asia/Istanbul', b'Asia/Istanbul'), (b'Asia/Jakarta', b'Asia/Jakarta'), (b'Asia/Jayapura', b'Asia/Jayapura'), (b'Asia/Jerusalem', b'Asia/Jerusalem'), (b'Asia/Kabul', b'Asia/Kabul'), (b'Asia/Kamchatka', b'Asia/Kamchatka'), (b'Asia/Karachi', b'Asia/Karachi'), (b'Asia/Kashgar', b'Asia/Kashgar'), (b'Asia/Kathmandu', b'Asia/Kathmandu'), (b'Asia/Katmandu', b'Asia/Katmandu'), (b'Asia/Khandyga', b'Asia/Khandyga'), (b'Asia/Kolkata', b'Asia/Kolkata'), (b'Asia/Krasnoyarsk', b'Asia/Krasnoyarsk'), (b'Asia/Kuala_Lumpur', b'Asia/Kuala_Lumpur'), (b'Asia/Kuching', b'Asia/Kuching'), (b'Asia/Kuwait', b'Asia/Kuwait'), (b'Asia/Macao', b'Asia/Macao'), (b'Asia/Macau', b'Asia/Macau'), (b'Asia/Magadan', b'Asia/Magadan'), (b'Asia/Makassar', b'Asia/Makassar'), (b'Asia/Manila', b'Asia/Manila'), (b'Asia/Muscat', b'Asia/Muscat'), (b'Asia/Nicosia', b'Asia/Nicosia'), (b'Asia/Novokuznetsk', b'Asia/Novokuznetsk'), (b'Asia/Novosibirsk', b'Asia/Novosibirsk'), (b'Asia/Omsk', b'Asia/Omsk'), (b'Asia/Oral', b'Asia/Oral'), (b'Asia/Phnom_Penh', b'Asia/Phnom_Penh'), (b'Asia/Pontianak', b'Asia/Pontianak'), (b'Asia/Pyongyang', b'Asia/Pyongyang'), (b'Asia/Qatar', b'Asia/Qatar'), (b'Asia/Qyzylorda', b'Asia/Qyzylorda'), (b'Asia/Rangoon', b'Asia/Rangoon'), (b'Asia/Riyadh', b'Asia/Riyadh'), (b'Asia/Saigon', b'Asia/Saigon'), (b'Asia/Sakhalin', b'Asia/Sakhalin'), (b'Asia/Samarkand', b'Asia/Samarkand'), (b'Asia/Seoul', b'Asia/Seoul'), (b'Asia/Shanghai', b'Asia/Shanghai'), (b'Asia/Singapore', b'Asia/Singapore'), (b'Asia/Srednekolymsk', b'Asia/Srednekolymsk'), (b'Asia/Taipei', b'Asia/Taipei'), (b'Asia/Tashkent', b'Asia/Tashkent'), (b'Asia/Tbilisi', b'Asia/Tbilisi'), (b'Asia/Tehran', b'Asia/Tehran'), (b'Asia/Tel_Aviv', b'Asia/Tel_Aviv'), (b'Asia/Thimbu', b'Asia/Thimbu'), (b'Asia/Thimphu', b'Asia/Thimphu'), (b'Asia/Tokyo', b'Asia/Tokyo'), (b'Asia/Tomsk', b'Asia/Tomsk'), (b'Asia/Ujung_Pandang', b'Asia/Ujung_Pandang'), (b'Asia/Ulaanbaatar', b'Asia/Ulaanbaatar'), (b'Asia/Ulan_Bator', b'Asia/Ulan_Bator'), (b'Asia/Urumqi', b'Asia/Urumqi'), (b'Asia/Ust-Nera', b'Asia/Ust-Nera'), (b'Asia/Vientiane', b'Asia/Vientiane'), (b'Asia/Vladivostok', b'Asia/Vladivostok'), (b'Asia/Yakutsk', b'Asia/Yakutsk'), (b'Asia/Yekaterinburg', b'Asia/Yekaterinburg'), (b'Asia/Yerevan', b'Asia/Yerevan'), (b'Atlantic/Azores', b'Atlantic/Azores'), (b'Atlantic/Bermuda', b'Atlantic/Bermuda'), (b'Atlantic/Canary', b'Atlantic/Canary'), (b'Atlantic/Cape_Verde', b'Atlantic/Cape_Verde'), (b'Atlantic/Faeroe', b'Atlantic/Faeroe'), (b'Atlantic/Faroe', b'Atlantic/Faroe'), (b'Atlantic/Jan_Mayen', b'Atlantic/Jan_Mayen'), (b'Atlantic/Madeira', b'Atlantic/Madeira'), (b'Atlantic/Reykjavik', b'Atlantic/Reykjavik'), (b'Atlantic/South_Georgia', b'Atlantic/South_Georgia'), (b'Atlantic/St_Helena', b'Atlantic/St_Helena'), (b'Atlantic/Stanley', b'Atlantic/Stanley'), (b'Australia/ACT', b'Australia/ACT'), (b'Australia/Adelaide', b'Australia/Adelaide'), (b'Australia/Brisbane', b'Australia/Brisbane'), (b'Australia/Broken_Hill', b'Australia/Broken_Hill'), (b'Australia/Canberra', b'Australia/Canberra'), (b'Australia/Currie', b'Australia/Currie'), (b'Australia/Darwin', b'Australia/Darwin'), (b'Australia/Eucla', b'Australia/Eucla'), (b'Australia/Hobart', b'Australia/Hobart'), (b'Australia/LHI', b'Australia/LHI'), (b'Australia/Lindeman', b'Australia/Lindeman'), (b'Australia/Lord_Howe', b'Australia/Lord_Howe'), (b'Australia/Melbourne', b'Australia/Melbourne'), (b'Australia/NSW', b'Australia/NSW'), (b'Australia/North', b'Australia/North'), (b'Australia/Perth', b'Australia/Perth'), (b'Australia/Queensland', b'Australia/Queensland'), (b'Australia/South', b'Australia/South'), (b'Australia/Sydney', b'Australia/Sydney'), (b'Australia/Tasmania', b'Australia/Tasmania'), (b'Australia/Victoria', b'Australia/Victoria'), (b'Australia/West', b'Australia/West'), (b'Australia/Yancowinna', b'Australia/Yancowinna'), (b'Brazil/Acre', b'Brazil/Acre'), (b'Brazil/DeNoronha', b'Brazil/DeNoronha'), (b'Brazil/East', b'Brazil/East'), (b'Brazil/West', b'Brazil/West'), (b'CET', b'CET'), (b'CST6CDT', b'CST6CDT'), (b'Canada/Atlantic', b'Canada/Atlantic'), (b'Canada/Central', b'Canada/Central'), (b'Canada/East-Saskatchewan', b'Canada/East-Saskatchewan'), (b'Canada/Eastern', b'Canada/Eastern'), (b'Canada/Mountain', b'Canada/Mountain'), (b'Canada/Newfoundland', b'Canada/Newfoundland'), (b'Canada/Pacific', b'Canada/Pacific'), (b'Canada/Saskatchewan', b'Canada/Saskatchewan'), (b'Canada/Yukon', b'Canada/Yukon'), (b'Chile/Continental', b'Chile/Continental'), (b'Chile/EasterIsland', b'Chile/EasterIsland'), (b'Cuba', b'Cuba'), (b'EET', b'EET'), (b'EST', b'EST'), (b'EST5EDT', b'EST5EDT'), (b'Egypt', b'Egypt'), (b'Eire', b'Eire'), (b'Etc/GMT', b'Etc/GMT'), (b'Etc/GMT+0', b'Etc/GMT+0'), (b'Etc/GMT+1', b'Etc/GMT+1'), (b'Etc/GMT+10', b'Etc/GMT+10'), (b'Etc/GMT+11', b'Etc/GMT+11'), (b'Etc/GMT+12', b'Etc/GMT+12'), (b'Etc/GMT+2', b'Etc/GMT+2'), (b'Etc/GMT+3', b'Etc/GMT+3'), (b'Etc/GMT+4', b'Etc/GMT+4'), (b'Etc/GMT+5', b'Etc/GMT+5'), (b'Etc/GMT+6', b'Etc/GMT+6'), (b'Etc/GMT+7', b'Etc/GMT+7'), (b'Etc/GMT+8', b'Etc/GMT+8'), (b'Etc/GMT+9', b'Etc/GMT+9'), (b'Etc/GMT-0', b'Etc/GMT-0'), (b'Etc/GMT-1', b'Etc/GMT-1'), (b'Etc/GMT-10', b'Etc/GMT-10'), (b'Etc/GMT-11', b'Etc/GMT-11'), (b'Etc/GMT-12', b'Etc/GMT-12'), (b'Etc/GMT-13', b'Etc/GMT-13'), (b'Etc/GMT-14', b'Etc/GMT-14'), (b'Etc/GMT-2', b'Etc/GMT-2'), (b'Etc/GMT-3', b'Etc/GMT-3'), (b'Etc/GMT-4', b'Etc/GMT-4'), (b'Etc/GMT-5', b'Etc/GMT-5'), (b'Etc/GMT-6', b'Etc/GMT-6'), (b'Etc/GMT-7', b'Etc/GMT-7'), (b'Etc/GMT-8', b'Etc/GMT-8'), (b'Etc/GMT-9', b'Etc/GMT-9'), (b'Etc/GMT0', b'Etc/GMT0'), (b'Etc/Greenwich', b'Etc/Greenwich'), (b'Etc/UCT', b'Etc/UCT'), (b'Etc/UTC', b'Etc/UTC'), (b'Etc/Universal', b'Etc/Universal'), (b'Etc/Zulu', b'Etc/Zulu'), (b'Europe/Amsterdam', b'Europe/Amsterdam'), (b'Europe/Andorra', b'Europe/Andorra'), (b'Europe/Astrakhan', b'Europe/Astrakhan'), (b'Europe/Athens', b'Europe/Athens'), (b'Europe/Belfast', b'Europe/Belfast'), (b'Europe/Belgrade', b'Europe/Belgrade'), (b'Europe/Berlin', b'Europe/Berlin'), (b'Europe/Bratislava', b'Europe/Bratislava'), (b'Europe/Brussels', b'Europe/Brussels'), (b'Europe/Bucharest', b'Europe/Bucharest'), (b'Europe/Budapest', b'Europe/Budapest'), (b'Europe/Busingen', b'Europe/Busingen'), (b'Europe/Chisinau', b'Europe/Chisinau'), (b'Europe/Copenhagen', b'Europe/Copenhagen'), (b'Europe/Dublin', b'Europe/Dublin'), (b'Europe/Gibraltar', b'Europe/Gibraltar'), (b'Europe/Guernsey', b'Europe/Guernsey'), (b'Europe/Helsinki', b'Europe/Helsinki'), (b'Europe/Isle_of_Man', b'Europe/Isle_of_Man'), (b'Europe/Istanbul', b'Europe/Istanbul'), (b'Europe/Jersey', b'Europe/Jersey'), (b'Europe/Kaliningrad', b'Europe/Kaliningrad'), (b'Europe/Kiev', b'Europe/Kiev'), (b'Europe/Kirov', b'Europe/Kirov'), (b'Europe/Lisbon', b'Europe/Lisbon'), (b'Europe/Ljubljana', b'Europe/Ljubljana'), (b'Europe/London', b'Europe/London'), (b'Europe/Luxembourg', b'Europe/Luxembourg'), (b'Europe/Madrid', b'Europe/Madrid'), (b'Europe/Malta', b'Europe/Malta'), (b'Europe/Mariehamn', b'Europe/Mariehamn'), (b'Europe/Minsk', b'Europe/Minsk'), (b'Europe/Monaco', b'Europe/Monaco'), (b'Europe/Moscow', b'Europe/Moscow'), (b'Europe/Nicosia', b'Europe/Nicosia'), (b'Europe/Oslo', b'Europe/Oslo'), (b'Europe/Paris', b'Europe/Paris'), (b'Europe/Podgorica', b'Europe/Podgorica'), (b'Europe/Prague', b'Europe/Prague'), (b'Europe/Riga', b'Europe/Riga'), (b'Europe/Rome', b'Europe/Rome'), (b'Europe/Samara', b'Europe/Samara'), (b'Europe/San_Marino', b'Europe/San_Marino'), (b'Europe/Sarajevo', b'Europe/Sarajevo'), (b'Europe/Simferopol', b'Europe/Simferopol'), (b'Europe/Skopje', b'Europe/Skopje'), (b'Europe/Sofia', b'Europe/Sofia'), (b'Europe/Stockholm', b'Europe/Stockholm'), (b'Europe/Tallinn', b'Europe/Tallinn'), (b'Europe/Tirane', b'Europe/Tirane'), (b'Europe/Tiraspol', b'Europe/Tiraspol'), (b'Europe/Ulyanovsk', b'Europe/Ulyanovsk'), (b'Europe/Uzhgorod', b'Europe/Uzhgorod'), (b'Europe/Vaduz', b'Europe/Vaduz'), (b'Europe/Vatican', b'Europe/Vatican'), (b'Europe/Vienna', b'Europe/Vienna'), (b'Europe/Vilnius', b'Europe/Vilnius'), (b'Europe/Volgograd', b'Europe/Volgograd'), (b'Europe/Warsaw', b'Europe/Warsaw'), (b'Europe/Zagreb', b'Europe/Zagreb'), (b'Europe/Zaporozhye', b'Europe/Zaporozhye'), (b'Europe/Zurich', b'Europe/Zurich'), (b'GB', b'GB'), (b'GB-Eire', b'GB-Eire'), (b'GMT', b'GMT'), (b'GMT+0', b'GMT+0'), (b'GMT-0', b'GMT-0'), (b'GMT0', b'GMT0'), (b'Greenwich', b'Greenwich'), (b'HST', b'HST'), (b'Hongkong', b'Hongkong'), (b'Iceland', b'Iceland'), (b'Indian/Antananarivo', b'Indian/Antananarivo'), (b'Indian/Chagos', b'Indian/Chagos'), (b'Indian/Christmas', b'Indian/Christmas'), (b'Indian/Cocos', b'Indian/Cocos'), (b'Indian/Comoro', b'Indian/Comoro'), (b'Indian/Kerguelen', b'Indian/Kerguelen'), (b'Indian/Mahe', b'Indian/Mahe'), (b'Indian/Maldives', b'Indian/Maldives'), (b'Indian/Mauritius', b'Indian/Mauritius'), (b'Indian/Mayotte', b'Indian/Mayotte'), (b'Indian/Reunion', b'Indian/Reunion'), (b'Iran', b'Iran'), (b'Israel', b'Israel'), (b'Jamaica', b'Jamaica'), (b'Japan', b'Japan'), (b'Kwajalein', b'Kwajalein'), (b'Libya', b'Libya'), (b'MET', b'MET'), (b'MST', b'MST'), (b'MST7MDT', b'MST7MDT'), (b'Mexico/BajaNorte', b'Mexico/BajaNorte'), (b'Mexico/BajaSur', b'Mexico/BajaSur'), (b'Mexico/General', b'Mexico/General'), (b'NZ', b'NZ'), (b'NZ-CHAT', b'NZ-CHAT'), (b'Navajo', b'Navajo'), (b'PRC', b'PRC'), (b'PST8PDT', b'PST8PDT'), (b'Pacific/Apia', b'Pacific/Apia'), (b'Pacific/Auckland', b'Pacific/Auckland'), (b'Pacific/Bougainville', b'Pacific/Bougainville'), (b'Pacific/Chatham', b'Pacific/Chatham'), (b'Pacific/Chuuk', b'Pacific/Chuuk'), (b'Pacific/Easter', b'Pacific/Easter'), (b'Pacific/Efate', b'Pacific/Efate'), (b'Pacific/Enderbury', b'Pacific/Enderbury'), (b'Pacific/Fakaofo', b'Pacific/Fakaofo'), (b'Pacific/Fiji', b'Pacific/Fiji'), (b'Pacific/Funafuti', b'Pacific/Funafuti'), (b'Pacific/Galapagos', b'Pacific/Galapagos'), (b'Pacific/Gambier', b'Pacific/Gambier'), (b'Pacific/Guadalcanal', b'Pacific/Guadalcanal'), (b'Pacific/Guam', b'Pacific/Guam'), (b'Pacific/Honolulu', b'Pacific/Honolulu'), (b'Pacific/Johnston', b'Pacific/Johnston'), (b'Pacific/Kiritimati', b'Pacific/Kiritimati'), (b'Pacific/Kosrae', b'Pacific/Kosrae'), (b'Pacific/Kwajalein', b'Pacific/Kwajalein'), (b'Pacific/Majuro', b'Pacific/Majuro'), (b'Pacific/Marquesas', b'Pacific/Marquesas'), (b'Pacific/Midway', b'Pacific/Midway'), (b'Pacific/Nauru', b'Pacific/Nauru'), (b'Pacific/Niue', b'Pacific/Niue'), (b'Pacific/Norfolk', b'Pacific/Norfolk'), (b'Pacific/Noumea', b'Pacific/Noumea'), (b'Pacific/Pago_Pago', b'Pacific/Pago_Pago'), (b'Pacific/Palau', b'Pacific/Palau'), (b'Pacific/Pitcairn', b'Pacific/Pitcairn'), (b'Pacific/Pohnpei', b'Pacific/Pohnpei'), (b'Pacific/Ponape', b'Pacific/Ponape'), (b'Pacific/Port_Moresby', b'Pacific/Port_Moresby'), (b'Pacific/Rarotonga', b'Pacific/Rarotonga'), (b'Pacific/Saipan', b'Pacific/Saipan'), (b'Pacific/Samoa', b'Pacific/Samoa'), (b'Pacific/Tahiti', b'Pacific/Tahiti'), (b'Pacific/Tarawa', b'Pacific/Tarawa'), (b'Pacific/Tongatapu', b'Pacific/Tongatapu'), (b'Pacific/Truk', b'Pacific/Truk'), (b'Pacific/Wake', b'Pacific/Wake'), (b'Pacific/Wallis', b'Pacific/Wallis'), (b'Pacific/Yap', b'Pacific/Yap'), (b'Poland', b'Poland'), (b'Portugal', b'Portugal'), (b'ROC', b'ROC'), (b'ROK', b'ROK'), (b'Singapore', b'Singapore'), (b'Turkey', b'Turkey'), (b'UCT', b'UCT'), (b'US/Alaska', b'US/Alaska'), (b'US/Aleutian', b'US/Aleutian'), (b'US/Arizona', b'US/Arizona'), (b'US/Central', b'US/Central'), (b'US/East-Indiana', b'US/East-Indiana'), (b'US/Eastern', b'US/Eastern'), (b'US/Hawaii', b'US/Hawaii'), (b'US/Indiana-Starke', b'US/Indiana-Starke'), (b'US/Michigan', b'US/Michigan'), (b'US/Mountain', b'US/Mountain'), (b'US/Pacific', b'US/Pacific'), (b'US/Pacific-New', b'US/Pacific-New'), (b'US/Samoa', b'US/Samoa'), (b'UTC', b'UTC'), (b'Universal', b'Universal'), (b'W-SU', b'W-SU'), (b'WET', b'WET'), (b'Zulu', b'Zulu')]),
4704+ preserve_default=True,
4705+ ),
4706+ ]
4707
4708=== added file 'loco_directory/meetings/migrations/0007_auto_20160815_2359.py'
4709--- loco_directory/meetings/migrations/0007_auto_20160815_2359.py 1970-01-01 00:00:00 +0000
4710+++ loco_directory/meetings/migrations/0007_auto_20160815_2359.py 2016-08-16 07:31:30 +0000
4711@@ -0,0 +1,69 @@
4712+# -*- coding: utf-8 -*-
4713+from __future__ import unicode_literals
4714+
4715+from django.db import models, migrations
4716+
4717+
4718+class Migration(migrations.Migration):
4719+
4720+ dependencies = [
4721+ ('meetings', '0006_teammeeting_meeting_tz'),
4722+ ]
4723+
4724+ operations = [
4725+ migrations.AlterField(
4726+ model_name='agendaitem',
4727+ name='created_date',
4728+ field=models.DateTimeField(help_text='timestamp of when this agenda item was created', verbose_name='Created Date', auto_now_add=True),
4729+ ),
4730+ migrations.AlterField(
4731+ model_name='agendaitem',
4732+ name='description',
4733+ field=models.TextField(help_text='detailed description of this agenda item', null=True, verbose_name='Description', blank=True),
4734+ ),
4735+ migrations.AlterField(
4736+ model_name='agendaitem',
4737+ name='log',
4738+ field=models.URLField(help_text="URL to this agenda item's discussion", null=True, verbose_name='Log URL', blank=True),
4739+ ),
4740+ migrations.AlterField(
4741+ model_name='agendaitem',
4742+ name='order',
4743+ field=models.PositiveIntegerField(default=1, help_text='index number of where this agenda item falls in the agenda', verbose_name='Order'),
4744+ ),
4745+ migrations.AlterField(
4746+ model_name='agendaitem',
4747+ name='owner',
4748+ field=models.ForeignKey(verbose_name='Owner', to='userprofiles.UserProfile', help_text='person proposing or responsible for this agenda item'),
4749+ ),
4750+ migrations.AlterField(
4751+ model_name='agendaitem',
4752+ name='parent',
4753+ field=models.ForeignKey(related_name=b'children', blank=True, to='meetings.AgendaItem', help_text='agenda item that contains this agenda item', null=True, verbose_name='Parent Agenda Item'),
4754+ ),
4755+ migrations.AlterField(
4756+ model_name='agendaitem',
4757+ name='title',
4758+ field=models.CharField(help_text='descriptive name for this agenda item', max_length=150, verbose_name='Title'),
4759+ ),
4760+ migrations.AlterField(
4761+ model_name='basemeeting',
4762+ name='channel',
4763+ field=models.CharField(help_text='Channel that the meeting will be held in. Ex. #ubuntu-us-fl', max_length=150, null=True, verbose_name='Meeting Channel'),
4764+ ),
4765+ migrations.AlterField(
4766+ model_name='basemeeting',
4767+ name='date_begin',
4768+ field=models.DateTimeField(help_text='Local date and time that the meeting starts', verbose_name='Begins', db_index=True),
4769+ ),
4770+ migrations.AlterField(
4771+ model_name='basemeeting',
4772+ name='date_end',
4773+ field=models.DateTimeField(help_text='Local date and time that the meeting ends', verbose_name='Ends', db_index=True),
4774+ ),
4775+ migrations.AlterField(
4776+ model_name='teammeeting',
4777+ name='teams',
4778+ field=models.ManyToManyField(help_text='team planning this meeting.', to=b'teams.Team', verbose_name='Teams Participating', db_index=True),
4779+ ),
4780+ ]
4781
4782=== modified file 'loco_directory/meetings/models.py'
4783--- loco_directory/meetings/models.py 2013-10-25 23:03:37 +0000
4784+++ loco_directory/meetings/models.py 2016-08-16 07:31:30 +0000
4785@@ -17,8 +17,8 @@
4786 date_begin = models.DateTimeField(help_text=_('Local date and time that the meeting starts'), verbose_name=_('Begins'), db_index=True)
4787 date_end = models.DateTimeField(help_text=_('Local date and time that the meeting ends'), verbose_name=_('Ends'), db_index=True)
4788 channel = models.CharField(max_length=150, verbose_name=_('Meeting Channel'), help_text=_('Channel that the meeting will be held in. Ex. #ubuntu-us-fl'), null=True)
4789- logs = models.URLField(verbose_name=_('Meeting Log'), help_text=_('After the meeting, add a link to the meeting log (leave blank to use the built-in irclog.ubuntu.com'), max_length=200, verify_exists=False, blank=True, null=True)
4790- minutes = models.URLField(verbose_name=_('Meeting Minutes'), help_text=_('After the meeting, add a link to the meeting minutes'), max_length=200, verify_exists=False, blank=True, null=True)
4791+ logs = models.URLField(verbose_name=_('Meeting Log'), help_text=_('After the meeting, add a link to the meeting log (leave blank to use the built-in irclog.ubuntu.com'), max_length=200, blank=True, null=True)
4792+ minutes = models.URLField(verbose_name=_('Meeting Minutes'), help_text=_('After the meeting, add a link to the meeting minutes'), max_length=200, blank=True, null=True)
4793 date_created = models.DateTimeField(help_text=_('the date and time when the event was created'), default=datetime.datetime.now, db_index=True)
4794 chair = models.ForeignKey(UserProfile, verbose_name=_('Meeting Chair'), blank=True, null=True)
4795
4796@@ -47,13 +47,21 @@
4797 """
4798 event = cal.add('vevent')
4799 event.add('uid').value = str(self.id)
4800- event.add('dtstart').value = pytz.utc.localize(self.date_begin)
4801- event.add('dtend').value = pytz.utc.localize(self.date_end)
4802 event.add('categories').value = ['Ubuntu Team Meeting']
4803 event.add('summary').value = self.name or ''
4804
4805+ if self.date_begin.tzinfo is None:
4806+ event.add('dtstart').value = pytz.utc.localize(self.date_begin)
4807+ else:
4808+ event.add('dtstart').value = self.date_begin
4809+
4810+ if self.date_end.tzinfo is None:
4811+ event.add('dtend').value = pytz.utc.localize(self.date_end)
4812+ else:
4813+ event.add('dtend').value = self.date_end
4814+
4815 def is_past(self):
4816- return self.date_end < datetime.datetime.today()
4817+ return self.date_end < self.tolocaltime(datetime.datetime.today())
4818
4819
4820 class TeamMeetingManager(models.Manager):
4821@@ -167,7 +175,7 @@
4822 description = models.TextField(verbose_name=_('Description'), help_text=_('detailed description of this agenda item'), blank=True, null=True)
4823 parent = models.ForeignKey('self', verbose_name=_('Parent Agenda Item'), related_name='children', help_text=_('agenda item that contains this agenda item'), blank=True, null=True)
4824 order = models.PositiveIntegerField(verbose_name=_('Order'), help_text=_('index number of where this agenda item falls in the agenda'), default=1)
4825- log = models.URLField(verbose_name=_('Log URL'), max_length=200, verify_exists=False, help_text=_('URL to this agenda item\'s discussion'), blank=True, null=True)
4826+ log = models.URLField(verbose_name=_('Log URL'), max_length=200, help_text=_('URL to this agenda item\'s discussion'), blank=True, null=True)
4827
4828 objects = AgendaItemManager()
4829
4830
4831=== modified file 'loco_directory/meetings/urls.py'
4832--- loco_directory/meetings/urls.py 2013-04-14 23:00:20 +0000
4833+++ loco_directory/meetings/urls.py 2016-08-16 07:31:30 +0000
4834@@ -1,4 +1,4 @@
4835-from django.conf.urls.defaults import *
4836+from django.conf.urls import *
4837
4838 urlpatterns = patterns('',
4839 #all meetings
4840
4841=== modified file 'loco_directory/meetings/views.py'
4842--- loco_directory/meetings/views.py 2013-11-24 13:57:29 +0000
4843+++ loco_directory/meetings/views.py 2016-08-16 07:31:30 +0000
4844@@ -2,6 +2,7 @@
4845 from django.http import HttpResponse, HttpResponseRedirect
4846 from django.shortcuts import render_to_response, redirect, get_object_or_404
4847 from django.contrib.auth.decorators import login_required
4848+from django.contrib import messages
4849 from django.utils.translation import ugettext as _
4850 from django.core.urlresolvers import reverse
4851
4852@@ -35,7 +36,7 @@
4853 def meeting_list_ical(meetings, name):
4854 """Return any list meetings as an ical"""
4855 filename = "%s.ics" % name.replace(' ', '-').lower()
4856- response = HttpResponse(mimetype='text/calendar')
4857+ response = HttpResponse(content_type='text/calendar')
4858 response['Content-Disposition'] = 'attachment; filename=%s' % filename.encode('ascii', 'replace')
4859 calendar = vobject.iCalendar()
4860 calendar.add('prodid').value = '-//loco.ubuntu.com//EN'
4861@@ -148,14 +149,14 @@
4862 if is_on_lc or is_contact:
4863 if request.method == 'POST':
4864 team_meeting_object.delete()
4865- request.user.message_set.create(message=_('Team Meeting removed.'))
4866+ messages.success(request,_('Team Meeting removed.'))
4867 return redirect('meeting-list')
4868 else:
4869 context = {'team_meeting_object': team_meeting_object}
4870 return render_to_response('meetings/team_meeting_delete_confirm.html', context, RequestContext(request))
4871
4872 else:
4873- request.user.message_set.create(message='%s %s' % (_('You can not remove this team meeting.'), _('You are not an admin/owner of the Launchpad team or on the LoCo Council.')))
4874+ messages.error(request,'%s %s' % (_('You can not remove this team meeting.'), _('You are not an admin/owner of the Launchpad team or on the LoCo Council.')))
4875 return redirect(team_meeting_object)
4876
4877
4878@@ -163,7 +164,7 @@
4879 def team_meeting_select(request):
4880 teams = Team.objects.filter(lp_name__in=[g.name for g in request.user.groups.all()])
4881 if len(teams) == 0:
4882- request.user.message_set.create(message='%s' % (_('You are not a member of any LoCo Teams.')))
4883+ messages.info('%s' % (_('You are not a member of any LoCo Teams.')))
4884 return redirect('meeting-list')
4885 elif len(teams) == 1:
4886 url = reverse('team-meeting-new', args=[teams[0].lp_name])
4887@@ -207,7 +208,7 @@
4888 context, RequestContext(request))
4889 else:
4890 # XXX: Once we move to a new ACL system, this needs fixing.
4891- request.user.message_set.create(message='%s %s' % (_('You can not add a new meeting for this team.'), _('You are not a member of the team or on the LoCo Council.')))
4892+ messages.error(request,'%s %s' % (_('You can not add a new meeting for this team.'), _('You are not a member of the team or on the LoCo Council.')))
4893 return redirect(team_object)
4894
4895
4896@@ -243,7 +244,7 @@
4897 context, RequestContext(request))
4898 else:
4899 # XXX: Once we move to a new ACL system, this needs fixing.
4900- request.user.message_set.create(message='%s %s' % (_('You can not add a new meeting for this team.'), _('You are not a member of the team or on the LoCo Council.')))
4901+ messages.success(request,'%s %s' % (_('You can not add a new meeting for this team.'), _('You are not a member of the team or on the LoCo Council.')))
4902 return redirect(team_object)
4903
4904
4905@@ -267,7 +268,7 @@
4906 form = TeamMeetingForm(data=request.POST, instance=team_meeting_object)
4907 if form.is_valid():
4908 form.save()
4909- request.user.message_set.create(message=_('Team meeting updated.'))
4910+ messages.success(request,_('Team meeting updated.'))
4911 return redirect(team_meeting_object)
4912 else:
4913 form = TeamMeetingForm(instance=team_meeting_object)
4914@@ -281,7 +282,7 @@
4915 RequestContext(request)
4916 )
4917 else:
4918- request.user.message_set.create(message='%s %s' % (_('You can not update this team meeting.'), _('You are not a member of the team or on the LoCo Council.')))
4919+ messages.error(request,'%s %s' % (_('You can not update this team meeting.'), _('You are not a member of the team or on the LoCo Council.')))
4920 return redirect(team_meeting_object)
4921
4922
4923@@ -318,7 +319,7 @@
4924 form = AgendaItemForm(data=request.POST, instance=agenda_item_object)
4925 if form.is_valid():
4926 agenda_item_object = form.save()
4927- request.user.message_set.create(message=_('Meeting agenda updated.'))
4928+ messages.success(request,_('Meeting agenda updated.'))
4929 return redirect(team_meeting_object)
4930 else:
4931 form = AgendaItemForm(instance=agenda_item_object)
4932@@ -331,7 +332,7 @@
4933 context, RequestContext(request))
4934 else:
4935 # XXX: Once we move to a new ACL system, this needs fixing.
4936- request.user.message_set.create(message='%s %s' % (_('You can not add a new agenda item for this team meeting.'), _('You are not a member of the team or on the LoCo Council.')))
4937+ messages.error(request,'%s %s' % (_('You can not add a new agenda item for this team meeting.'), _('You are not a member of the team or on the LoCo Council.')))
4938 return redirect(team_meeting_object)
4939
4940
4941@@ -356,7 +357,7 @@
4942 form = AgendaItemForm(data=request.POST, instance=agenda_item_object)
4943 if form.is_valid():
4944 form.save()
4945- request.user.message_set.create(message=_('Meeting agenda updated.'))
4946+ messages.success(request,_('Meeting agenda updated.'))
4947 return redirect(team_meeting_object)
4948 else:
4949 form = AgendaItemForm(instance=agenda_item_object)
4950@@ -369,7 +370,7 @@
4951 return render_to_response('meetings/agenda_item_update.html',
4952 context, RequestContext(request))
4953 else:
4954- request.user.message_set.create(message='%s %s' % (_('You can not update this team meeting agenda.'), _('You are not a member of the team or on the LoCo Council.')))
4955+ messages.error(request,'%s %s' % (_('You can not update this team meeting agenda.'), _('You are not a member of the team or on the LoCo Council.')))
4956 return redirect(team_meeting_object)
4957
4958
4959@@ -392,7 +393,7 @@
4960 if is_on_lc or is_member:
4961 if request.method == 'POST':
4962 agenda_item_object.delete()
4963