Code

Merge prep#46

Code

Merged

RyanBalfanz merged 21 commits intodevelopRyanBalfanz/django-sendgrid:developfrom merge_prepRyanBalfanz/django-sendgrid:merge_prepCopy head branch name to clipboardDec 4, 2012

+355-13

Commits

Commits on Oct 16, 2012

• #21 added timestamp to post_event tests

  

  Tom Hoddes

  committed
  70a80a9

  Copy full SHA for 70a80a9

• use timestamp as creation_time

  

  Tom Hoddes

  committed
  61faf94

  Copy full SHA for 61faf94

• timestamp set in send grid view, auto_now off

  

  Tom Hoddes

  committed
  6f0c48f

  Copy full SHA for 6f0c48f

• unique constraint added to creation_time for Event

  

  Tom Hoddes

  committed
  37d935a

  Copy full SHA for 37d935a

• migration for unique and removal of auto_now_add

  

  Tom Hoddes

  committed
  31bf7d4

  Copy full SHA for 31bf7d4

• removed migration and unique constraint

  

  Tom Hoddes

  committed
  cb7f0ac

  Copy full SHA for cb7f0ac

• added unique_together + migration

  

  Tom Hoddes

  committed
  2ebf6e6

  Copy full SHA for 2ebf6e6

• added email_message to unique_together

  

  Tom Hoddes

  committed
  de675c8

  Copy full SHA for de675c8

• moved unique constraint to the controller level for now because of migration complications

  

  Tom Hoddes

  committed
  05f6f8b

  Copy full SHA for 05f6f8b

• commented out the db part of migration because it's pointless

  

  Tom Hoddes

  committed
  b5aa56d

  Copy full SHA for b5aa56d

• added pass

  

  Tom Hoddes

  committed
  8ea75ba

  Copy full SHA for 8ea75ba

Commits on Oct 18, 2012

• bounce_type and bounce_reason null=True

  

  Tom Hoddes

  committed
  0167864

  Copy full SHA for 0167864

Commits on Nov 26, 2012

• Merge branch 'develop' into feature/null_bounce_type_reason

  Show description for 4c7eabd
  

  Tom Hoddes

  committed
  4c7eabd

  Copy full SHA for 4c7eabd

• Merge branch 'develop' into feature/null_bounce_type_reason

  Show description for 9c1970b
  

  Tom Hoddes

  committed
  9c1970b

  Copy full SHA for 9c1970b

Commits on Nov 27, 2012

• Merge branch 'develop' into feature/null_bounce_type_reason

  Show description for 8df4bad
  

  Tom Hoddes

  committed
  8df4bad

  Copy full SHA for 8df4bad

Commits on Dec 3, 2012

• Merge branch 'feature/null_bounce_type_reason' into merge_prep

  

  Tom Hoddes

  committed
  8b103d0

  Copy full SHA for 8b103d0

• added timestamp column to event and removed experimental code that changed the behavior of creation_time

  

  Tom Hoddes

  committed
  42e9362

  Copy full SHA for 42e9362

• reordered migrations

  

  Tom Hoddes

  committed
  7c1cfce

  Copy full SHA for 7c1cfce

Commits on Dec 4, 2012

• Merge branch 'develop' into merge_prep

  

  Tom Hoddes

  committed
  221d138

  Copy full SHA for 221d138

• Merge branch 'develop' into merge_prep

  RyanBalfanz

  committed
  0d1e45f

  Copy full SHA for 0d1e45f

• Merge branch 'develop' into merge_prep

  RyanBalfanz

  committed
  71ec05e

  Copy full SHA for 71ec05e