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
6979 commits 5 branches 133 tags 218 MiB
Commit graph

6979 commits

This branch
This branch
All branches
Author SHA1 Message Date
Matthew Chen
81a40909f4 Respond to CR. 2018-05-11 15:45:38 -04:00
Matthew Chen
9936003637 Respond to CR. 2018-05-11 15:37:13 -04:00
Matthew Chen
9a4889c4fb Simplify debug notifications. 2018-05-11 15:34:57 -04:00
Matthew Chen
1a170ba484 Simplify debug notifications. 2018-05-11 15:34:57 -04:00
Matthew Chen
b9c852378a Merge branch 'charlesmchen/saeLiveImageCrash' 2018-05-11 14:29:40 -04:00
Matthew Chen
73206c08ad Respond to CR. 2018-05-11 14:29:28 -04:00
Matthew Chen
56b91ddebb Clean up ahead of PR. 2018-05-11 11:28:05 -04:00
Matthew Chen
b62d6900da Fix crash converting images in SAE. 2018-05-11 11:26:04 -04:00
Matthew Chen
744a3b8be1 "Bump build to 2.25.0.15." 2018-05-10 17:26:29 -04:00
Matthew Chen
3579621db6 Improve logging around home view selection. 2018-05-10 17:25:48 -04:00
Matthew Chen
f55012e671 Merge branch 'charlesmchen/debugNotifications' 2018-05-10 17:11:58 -04:00
Matthew Chen
4a4882ebe5 Add debug notification. 2018-05-10 17:11:42 -04:00
Matthew Chen
408b8d01cc Merge branch 'charlesmchen/multipleLocalNotifications' 2018-05-10 16:36:57 -04:00
Matthew Chen
a3c853066a Respond to CR. 2018-05-10 16:36:37 -04:00
Matthew Chen
f95151ac8d Don't present multiple converastion views ever. 2018-05-10 16:35:46 -04:00
Matthew Chen
940161e62f Don't process multiple local notifications. 2018-05-10 16:35:46 -04:00
Matthew Chen
b751a32536 "Bump build to 2.25.0.14." 2018-05-10 14:43:19 -04:00
Matthew Chen
faf15e3c8e Update l10n strings. 2018-05-10 14:43:04 -04:00
Matthew Chen
ccc64e62bf Fix l10n strings. 2018-05-10 14:40:49 -04:00
Michael Kirk
6ab0d81c30 Merge branch 'mkirk/contact-reply' 2018-05-10 14:34:41 -04:00
Michael Kirk
2cc3eabdb8 quote reply to contact share (no avatar) 
// FREEBIE
 2018-05-10 14:34:19 -04:00
Michael Kirk
742492dd32 remove redundant protocol definition 
`debugDescription` is defined on all NSObjects (but as a property)

// FREEBIE
 2018-05-10 13:42:37 -04:00
Matthew Chen
5a80001878 Merge branch 'charlesmchen/mergeOrganizationName' 2018-05-10 13:39:13 -04:00
Matthew Chen
8cdb75d52a Respond to CR. 2018-05-10 13:38:39 -04:00
Matthew Chen
8337c3bd68 Refine contact merging. 2018-05-10 13:36:38 -04:00
Matthew Chen
8eef940baa Merge branch 'charlesmchen/addToContactsAlways' 2018-05-10 13:35:54 -04:00
Matthew Chen
c05c1ac879 Always show 'add to contacts' button. 2018-05-10 13:35:41 -04:00
Michael Kirk
52b5021383 Merge branch 'mkirk/show-avatar-in-approval' 2018-05-10 13:34:36 -04:00
Michael Kirk
d1c33921ba Show avatar in contact approval view 
// FREEBIE
 2018-05-10 13:34:28 -04:00
Matthew Chen
46ce2d6f80 Merge branch 'charlesmchen/shareContactSinglePresentation' 2018-05-10 13:17:43 -04:00
Matthew Chen
acdc51ba3d Respond to CR. 2018-05-10 13:17:34 -04:00
Matthew Chen
37b8b368a6 Show "share contact" flow in single presented navigation controller. 2018-05-10 13:17:01 -04:00
Matthew Chen
0f535217a0 Merge branch 'charlesmchen/contactViewStatusBar' 2018-05-10 13:16:37 -04:00
Matthew Chen
cb7f28ed34 Use dark status bar in contact view. 2018-05-10 12:17:25 -04:00
Matthew Chen
61343f6657 Merge branch 'charlesmchen/contactNames_' 2018-05-10 12:05:21 -04:00
Matthew Chen
6460493669 Surface organization name in contact view. 2018-05-10 12:05:07 -04:00
Matthew Chen
aa7cc4633a Rework contact names. 2018-05-10 12:05:07 -04:00
Michael Kirk
6ecaf01b95 Merge branch 'mkirk/contact-sharing-via-sae' 2018-05-10 11:57:47 -04:00
Michael Kirk
407ec997ab Add comment per CR 
// FREEBIE
 2018-05-10 11:57:30 -04:00
Michael Kirk
7631315227 Remove unused code 
// FREEBIE
 2018-05-10 11:35:43 -04:00
Michael Kirk
a16040f19f Fix avatar sending in SAE 
// FREEBIE
 2018-05-10 11:35:42 -04:00
Michael Kirk
adabf02732 Fix contact sharing (Avatar TODO) 
// FREEBIE
 2018-05-10 11:35:42 -04:00
Michael Kirk
e520451996 Merge branch 'mkirk/cleanup-share-avatars' 2018-05-10 11:33:22 -04:00
Michael Kirk
ed2945126a Remove contact share avatars upon message deletion 
// FREEBIE
 2018-05-10 11:33:13 -04:00
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