and though bugs are the bane of my existence, rest assured the wretched thing will get the best of care here

  1. 26 Aug, 2014 1 commit
    • Jon Rosebaugh's avatar
      GROW-26: (merge) Merge GROW-26 into qa · 00ed32a0
      Jon Rosebaugh authored
          26f522c0 - GROW-26: Allow ExternalEmail recipients to unsubscribe from emails
          d39763d9 - GROW-26: change new_contacts fn
          384139bc - GROW-26: potential fix
          2b247827 - GROW-26: Batch contact invites in groups of 10 contacts
          1cb17768 - GROW-26: Don't send invites to contacts with associated user id
          ad0e178e - GROW-26: Report invite sending to statlog
          dd33f25f - GROW-26: Front End updates
          e396c5c6 - GROW-26: add contact_invite message type
          ae31b60e - GROW-26: Make AMS prefer primary emails for contacts
          1a300a96 - GROW-26: Send contact invites
          b72903f3 - GROW-26: Set Contact public_ids in result value after import
          6647293d - GROW-26: Record is_staff on contact after importing
          f350560f - GROW-26: Prevent unnecessary serialization and deserialization
          a7cf810b - GROW-26: Add 'created_by_staff' flag and 'imported_at' to contacts
      
      Conflicts:
      	lib/python2.7/site-packages/ams/db/models/ams_models.py
      00ed32a0
  2. 25 Aug, 2014 39 commits