Commit Graph

7019 Commits (e138c73bdc3a1d92546c12f3f873514379dd8bd6)
 

Author SHA1 Message Date
Matthew Chen f55012e671 Merge branch 'charlesmchen/debugNotifications' 7 years ago
Matthew Chen 4a4882ebe5 Add debug notification. 7 years ago
Matthew Chen 408b8d01cc Merge branch 'charlesmchen/multipleLocalNotifications' 7 years ago
Matthew Chen a3c853066a Respond to CR. 7 years ago
Matthew Chen f95151ac8d Don't present multiple converastion views ever. 7 years ago
Matthew Chen 940161e62f Don't process multiple local notifications. 7 years ago
Matthew Chen b751a32536 "Bump build to 2.25.0.14." 7 years ago
Matthew Chen faf15e3c8e Update l10n strings. 7 years ago
Matthew Chen ccc64e62bf Fix l10n strings. 7 years ago
Michael Kirk 6ab0d81c30 Merge branch 'mkirk/contact-reply' 7 years ago
Michael Kirk 2cc3eabdb8 quote reply to contact share (no avatar)
// FREEBIE
7 years ago
Michael Kirk 742492dd32 remove redundant protocol definition
`debugDescription` is defined on all NSObjects (but as a property)

// FREEBIE
7 years ago
Matthew Chen 5a80001878 Merge branch 'charlesmchen/mergeOrganizationName' 7 years ago
Matthew Chen 8cdb75d52a Respond to CR. 7 years ago
Matthew Chen 8337c3bd68 Refine contact merging. 7 years ago
Matthew Chen 8eef940baa Merge branch 'charlesmchen/addToContactsAlways' 7 years ago
Matthew Chen c05c1ac879 Always show 'add to contacts' button. 7 years ago
Michael Kirk 52b5021383 Merge branch 'mkirk/show-avatar-in-approval' 7 years ago
Michael Kirk d1c33921ba Show avatar in contact approval view
// FREEBIE
7 years ago
Matthew Chen 46ce2d6f80 Merge branch 'charlesmchen/shareContactSinglePresentation' 7 years ago
Matthew Chen acdc51ba3d Respond to CR. 7 years ago
Matthew Chen 37b8b368a6 Show "share contact" flow in single presented navigation controller. 7 years ago
Matthew Chen 0f535217a0 Merge branch 'charlesmchen/contactViewStatusBar' 7 years ago
Matthew Chen cb7f28ed34 Use dark status bar in contact view. 7 years ago
Matthew Chen 61343f6657 Merge branch 'charlesmchen/contactNames_' 7 years ago
Matthew Chen 6460493669 Surface organization name in contact view. 7 years ago
Matthew Chen aa7cc4633a Rework contact names. 7 years ago
Michael Kirk 6ecaf01b95 Merge branch 'mkirk/contact-sharing-via-sae' 7 years ago
Michael Kirk 407ec997ab Add comment per CR
// FREEBIE
7 years ago
Michael Kirk 7631315227 Remove unused code
// FREEBIE
7 years ago
Michael Kirk a16040f19f Fix avatar sending in SAE
// FREEBIE
7 years ago
Michael Kirk adabf02732 Fix contact sharing (Avatar TODO)
// FREEBIE
7 years ago
Michael Kirk e520451996 Merge branch 'mkirk/cleanup-share-avatars' 7 years ago
Michael Kirk ed2945126a Remove contact share avatars upon message deletion
// FREEBIE
7 years ago
Michael Kirk efa3c81f68 Merge branch 'mkirk/contact-merging' 7 years ago
Michael Kirk c15fea4eca merge avatar with existing
// FREEBIE
7 years ago
Michael Kirk 95b93115f9 Code formatting
// FREEBIE
7 years ago
Michael Kirk bf37f41164 Move CNContact logic into our system contact adapter
// FREEBIE
7 years ago
Michael Kirk 0c469764f1 re-use contact picker for "add to existing"
Required refactor of contact picker to be presented non-modally.

TODO: merge emails, address, display names

// FREEBIE
7 years ago
Michael Kirk 609746abec clarify naming
// FREEBIE
7 years ago
Michael Kirk 69aeb041ba Merge branch 'mkirk/codecleanup-contact-sync' 7 years ago
Michael Kirk b1f3324514 cleanup contact syncing
It's largely a redundant check anyway, but the previous typo was a
no-op.

// FREEBIE
7 years ago
Matthew Chen d0d9d5456c "Bump build to 2.25.0.13." 7 years ago
Matthew Chen 31bea605f6 Merge branch 'charlesmchen/contactViewActions' 7 years ago
Matthew Chen 65a516685d Fix l10n strings. 7 years ago
Matthew Chen b4d24f1c72 Refine field actions in contact view. 7 years ago
Matthew Chen e04e063fcc Merge branch 'charlesmchen/contactShareErrors' 7 years ago
Matthew Chen 3bb9e922d7 Surface contact share errors to user. 7 years ago
Matthew Chen dad3d2b515 Merge branch 'charlesmchen/contactShareAssets2' 7 years ago
Matthew Chen 4079cdb600 Apply more contact share assets. 7 years ago