LoCo Team Portal

Merge lp:~cjohnston/loco-team-portal/728108 into lp:loco-team-portal

  1. 728108
  2. Merge into 0.2
Proposed by Chris Johnston
Status: Merged
Approved by: Chris Johnston
Approved revision: 410
Merged at revision: 413
Proposed branch: lp:~cjohnston/loco-team-portal/728108
Merge into: lp:loco-team-portal
Diff against target: 29 lines (+4/-4)
2 files modified
loco_directory/events/models.py (+2/-2)
loco_directory/meetings/models.py (+2/-2)
To merge this branch: bzr merge lp:~cjohnston/loco-team-portal/728108
Reviewer Review Type Date Requested Status
Chris Johnston Approve
Review via email: mp+51980@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Chris Johnston (cjohnston) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'loco_directory/events/models.py'
2--- loco_directory/events/models.py 2011-02-23 00:50:39 +0000
3+++ loco_directory/events/models.py 2011-03-02 23:12:33 +0000
4@@ -18,8 +18,8 @@
5 a simple basic event
6 """
7 name = models.CharField(max_length=150, verbose_name=_('Event Name'))
8- date_begin = models.DateTimeField(help_text=_('start date and local time of the event'), verbose_name=_('Begins'), db_index=True)
9- date_end = models.DateTimeField(help_text=_('end date and local time of the event'), verbose_name=_('Ends'), db_index=True)
10+ date_begin = models.DateTimeField(help_text=_('Local date and time the event starts'), verbose_name=_('Begins'), db_index=True)
11+ date_end = models.DateTimeField(help_text=_('Local date and time the event ends'), verbose_name=_('Ends'), db_index=True)
12 description = models.TextField(help_text=_('Description of the Event'), blank=True, null=True)
13 announce = models.URLField(verbose_name=_('Announcement'), help_text=_('URL to the announcement'), max_length=200, verify_exists=False, blank=True, null=True)
14 date_created = models.DateTimeField(help_text=_('the date and time when the event was created'), default=datetime.datetime.now(), db_index=True)
15
16=== modified file 'loco_directory/meetings/models.py'
17--- loco_directory/meetings/models.py 2011-02-03 16:53:41 +0000
18+++ loco_directory/meetings/models.py 2011-03-02 23:12:33 +0000
19@@ -11,8 +11,8 @@
20 a simple basic meeting
21 """
22 name = models.CharField(max_length=150, verbose_name=_('Meeting Name'))
23- date_begin = models.DateTimeField(help_text=_('start date and local time of the meeting in UTC'), verbose_name=_('Begins'), db_index=True)
24- date_end = models.DateTimeField(help_text=_('end date and local time of the meeting in UTC'), verbose_name=_('Ends'), db_index=True)
25+ date_begin = models.DateTimeField(help_text=_('start date and time of the meeting in UTC'), verbose_name=_('Begins'), db_index=True)
26+ date_end = models.DateTimeField(help_text=_('end date and time of the meeting in UTC'), verbose_name=_('Ends'), db_index=True)
27 channel = models.CharField(max_length=150, verbose_name=_('Meeting Channel'), help_text=_('Channel that the meeting will be held in. Include #'), null=True)
28 logs = models.URLField(verbose_name=_('Meeting Log'), help_text=_('After the meeting, add a link to the meeting log'), max_length=200, verify_exists=False, blank=True, null=True)
29 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)

Subscribers

People subscribed via source and target branches