oxen-io/session-ios
1
0
Fork 0
mirror of https://github.com/oxen-io/session-ios.git synced 2023-12-13 21:30:14 +01:00
Code Issues Projects Releases Wiki Activity
7135 commits 5 branches 133 tags 218 MiB
Commit graph

7135 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Kirk efa3c81f68 Merge branch 'mkirk/contact-merging' 2018-05-10 11:31:31 -04:00
Michael Kirk c15fea4eca merge avatar with existing 
// FREEBIE
 2018-05-10 11:31:22 -04:00
Michael Kirk 95b93115f9 Code formatting 
// FREEBIE
 2018-05-10 11:31:22 -04:00
Michael Kirk bf37f41164 Move CNContact logic into our system contact adapter 
// FREEBIE
 2018-05-10 11:31:22 -04:00
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
 2018-05-10 11:31:22 -04:00
Michael Kirk 609746abec clarify naming 
// FREEBIE
 2018-05-10 11:31:22 -04:00
Michael Kirk 69aeb041ba Merge branch 'mkirk/codecleanup-contact-sync' 2018-05-09 21:56:38 -04:00
Michael Kirk b1f3324514 cleanup contact syncing 
It's largely a redundant check anyway, but the previous typo was a
no-op.

// FREEBIE
 2018-05-09 21:56:33 -04:00
Matthew Chen d0d9d5456c "Bump build to 2.25.0.13." 2018-05-09 17:57:53 -04:00
Matthew Chen 31bea605f6 Merge branch 'charlesmchen/contactViewActions' 2018-05-09 17:53:51 -04:00
Matthew Chen 65a516685d Fix l10n strings. 2018-05-09 17:53:40 -04:00
Matthew Chen b4d24f1c72 Refine field actions in contact view. 2018-05-09 17:52:36 -04:00
Matthew Chen e04e063fcc Merge branch 'charlesmchen/contactShareErrors' 2018-05-09 17:52:11 -04:00
Matthew Chen 3bb9e922d7 Surface contact share errors to user. 2018-05-09 17:52:00 -04:00
Matthew Chen dad3d2b515 Merge branch 'charlesmchen/contactShareAssets2' 2018-05-09 17:51:35 -04:00
Matthew Chen 4079cdb600 Apply more contact share assets. 2018-05-09 17:51:27 -04:00
Matthew Chen b7946fa904 Merge branch 'charlesmchen/contactShareDynamicTypeRTL' 2018-05-09 17:47:17 -04:00
Matthew Chen 0b8d9991ef Respond to CR. 2018-05-09 17:46:51 -04:00
Matthew Chen f77731eb7a Fix h margins in "edit contact share name" view. 2018-05-09 17:46:05 -04:00
Matthew Chen ff3524fb00 Improve contact share message bubble layout with large dynamic type sizes. 2018-05-09 17:46:05 -04:00
Matthew Chen b4ef8afbf0 "Bump build to 2.25.0.12." 2018-05-09 16:18:07 -04:00
Michael Kirk 6d52636892 Merge branch 'mkirk/return-navbar' 2018-05-09 16:01:19 -04:00
Michael Kirk ad4e4b0c4c return navbar after tapping message/call buttons 
// FREEBIE
 2018-05-09 16:01:12 -04:00
Matthew Chen f6c5141cbd "Bump build to 2.25.0.11." 2018-05-09 15:53:03 -04:00
Michael Kirk e5258770a1 Merge branch 'mkirk/cleanup-contact-share-view-helper' 2018-05-09 10:25:58 -04:00
Michael Kirk 42109593af Remove fromViewController state from ContactShareViewHelper 
// FREEBIE
 2018-05-09 10:21:00 -04:00
Michael Kirk 77bbbad70c Remove contactShare state from ContactShareViewHelper 
// FREEBIE
 2018-05-09 10:21:00 -04:00
Matthew Chen 0265787dd6 "Bump build to 2.25.0.10." 2018-05-08 18:35:21 -04:00
Matthew Chen 37da52413f Fix contact share protos: display name, organization name. 2018-05-08 18:35:11 -04:00
Matthew Chen 0b90c094aa "Bump build to 2.25.0.9." 2018-05-08 17:37:14 -04:00
Matthew Chen 946cc114ed Update l10n strings. 2018-05-08 17:37:08 -04:00
Matthew Chen 6c84f6eef5 Merge branch 'charlesmchen/contactActionsAndPhoneNumberParsing' 2018-05-08 17:24:15 -04:00
Matthew Chen c2adf624ea Respond to CR. 2018-05-08 17:22:34 -04:00
Matthew Chen 44ceee5849 Add contact share actions to conversation view and improve phone number parsing. 2018-05-08 17:22:34 -04:00
Michael Kirk 445c10a7ea Merge branch 'mkirk/first-responder' 2018-05-08 17:12:20 -04:00
Michael Kirk 7e22d9e900 Prevent input toolbar from appearing over camera view, contact view or actionsheet 
// FREEBIE
 2018-05-08 17:07:15 -04:00
Michael Kirk 353abfc13e Views presented from ConversationVC must become first responder. 
// FREEBIE
 2018-05-08 17:07:15 -04:00
Michael Kirk 41aa7eafe3 makeKeyAndVisible restores first responder, so no need to track it 
ourselves.

This isn't *quite* as nice for the case when we want to restore a
textfield that was active before, but it much more simply covers the
more important case that we restore input accessory views after
backgrounding/foregrounding.

// FREEBIE
 2018-05-08 17:07:15 -04:00
Matthew Chen 882098e9cb Merge branch 'charlesmchen/contactShareAssets' 2018-05-08 16:56:37 -04:00
Matthew Chen 01bfa8dfc4 Apply contact share assets. 2018-05-08 16:56:08 -04:00
Matthew Chen 5a3c37458b Merge branch 'charlesmchen/faceIDUsageDescription' 2018-05-08 15:58:44 -04:00
Matthew Chen 9e49224028 Add usage description for Face ID. 2018-05-08 15:58:38 -04:00
Michael Kirk 4d65646dc0 Merge branch 'mkirk/no-reply-from-gallery' 2018-05-08 15:00:02 -04:00
Michael Kirk fda5d65674 Avoid crash - reply only works from ConversationVC 
// FREEBIE
 2018-05-08 13:56:28 -04:00
Michael Kirk ac458197a5 Merge branch 'mkirk/fix-spurious-disabled-timer-messages' 2018-05-08 13:21:21 -04:00
Michael Kirk 98aa054496 Avoid spurious "Disabled Disappearing Messages" 
`dictionaryDidChange` was always true for new records.

// FREEBIE
 2018-05-08 10:19:33 -04:00
Michael Kirk 7ca07d61d9 "Bump build to 2.25.0.8." 2018-05-07 17:43:57 -04:00
Michael Kirk e261b6fcdf Merge branch 'mkirk/fix-attachment-building' 2018-05-07 17:42:17 -04:00
Michael Kirk d3cda951ef Fix/Simplify outgoing attachment proto building 
// FREEBIE
 2018-05-07 17:42:08 -04:00
Matthew Chen 73102a9963 Merge branch 'charlesmchen/shareContactsFromShareExtension' 2018-05-07 17:06:10 -04:00