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

7110 commits

This branch
This branch
All branches
Author SHA1 Message Date
Matthew Chen a48cc8d652 Merge branch 'charlesmchen/normalizeImageColorSpace' 2018-05-17 16:40:01 -04:00
Matthew Chen 0620cb60df Normalize image colorspace. 2018-05-17 16:31:04 -04:00
Matthew Chen 946240fb69 Merge branch 'charlesmchen/readVsVisible2' 2018-05-17 16:07:35 -04:00
Matthew Chen 692d0a7579 Don't mark messages as read if conversation view isn't 100% visible. 2018-05-17 16:07:23 -04:00
Matthew Chen 78de7a10f7 Don't mark messages as read if conversation view isn't 100% visible. 2018-05-17 16:07:23 -04:00
Michael Kirk 18f3bf535a Merge branch 'mkirk/phone-number-display-name' 2018-05-17 11:09:04 -04:00
Michael Kirk c72d45dc91 Fall back to phone number for picker cell display name 
// FREEBIE
 2018-05-17 11:08:56 -04:00
Michael Kirk 8d1d62b610 Merge branch 'mkirk/profile-avatar-in-contact-picker' 2018-05-17 11:08:35 -04:00
Michael Kirk 2098ec570b Contact picker uses profile pic, when available. 
// FREEBIE
 2018-05-17 11:08:21 -04:00
Michael Kirk 87a25804d7 Merge branch 'mkirk/fix-send-with-no-number' 2018-05-17 10:00:24 -04:00
Michael Kirk f2750d18c6 Don't send empty contact card with just avatar 
// FREEBIE
 2018-05-17 09:59:57 -04:00
Michael Kirk ddcca73aa1 Merge branch 'mkirk/fix-localizations' 2018-05-17 09:59:26 -04:00
Michael Kirk af8ddf7bf0 Use raw text when localization fails 
// FREEBIE
 2018-05-17 09:59:07 -04:00
Matthew Chen 7ccb2df331 Merge branch 'charlesmchen/contactShareAvatar' 2018-05-17 09:45:54 -04:00
Matthew Chen db1c8fd9f3 Respond to CR. 2018-05-16 17:24:10 -04:00
Matthew Chen c800ae381b Make contact share "bubble/card" reflect share contents. 2018-05-16 17:19:05 -04:00
Matthew Chen f436fc19c2 Make contact share "bubble/card" reflect share contents. 2018-05-16 17:19:05 -04:00
Matthew Chen 3cdce13b44 Merge branch 'charlesmchen/sortGroupMembers' 2018-05-16 17:13:49 -04:00
Matthew Chen 2edabdbba4 Sort group members. 2018-05-16 17:13:42 -04:00
Matthew Chen cbc27f1c30 Revert "Disable contact sharing." 
This reverts commit 2b6b8c2f69.
 2018-05-16 16:37:39 -04:00
Matthew Chen 762a03dace "Bump build to 2.25.0.24." 2018-05-16 16:37:25 -04:00
Matthew Chen 2b6b8c2f69 Disable contact sharing. 2018-05-16 16:37:22 -04:00
Matthew Chen 7b7435c3aa "Bump build to 2.25.0.23." 2018-05-16 16:37:03 -04:00
Matthew Chen 73ea9d2454 Update l10n strings. 2018-05-16 16:36:52 -04:00
Matthew Chen fb3790ed65 Merge branch 'charlesmchen/asyncNetworkRequests' 2018-05-16 16:32:21 -04:00
Matthew Chen 1a3737d5c6 Respond to CR. 2018-05-16 16:32:10 -04:00
Matthew Chen 530983c161 Build & enqueue network requests async. 2018-05-16 16:30:40 -04:00
Matthew Chen 7a37b3d0b6 Merge branch 'charlesmchen/readVsVisible' 2018-05-16 16:30:16 -04:00
Matthew Chen f6106512db Only mark messages read in conversation view if visible. 2018-05-16 16:30:01 -04:00
Matthew Chen e908413c13 Merge branch 'charlesmchen/peerConnectionClientDelegateCleanup' 2018-05-16 16:29:18 -04:00
Matthew Chen 157f7617ca Respond to CR. 2018-05-16 16:28:48 -04:00
Matthew Chen 3d5cbb73fb Rework cleanup of peer connection client delegates. 2018-05-16 16:28:48 -04:00
Michael Kirk 547605885e Merge branch 'mkirk/localize-all-phone-types' 2018-05-16 13:23:30 -04:00
Michael Kirk f652ecef99 localize _Main_ and other CN label types 
// FREEBIE
 2018-05-15 17:40:41 -04:00
Matthew Chen a62e86c7ab Revert "Disable contact sharing." 
This reverts commit e27af7a66d.
 2018-05-15 17:07:18 -04:00
Matthew Chen 3f5d8aa9ba "Bump build to 2.25.0.22." 2018-05-15 17:06:57 -04:00
Matthew Chen e27af7a66d Disable contact sharing. 2018-05-15 17:06:54 -04:00
Michael Kirk 5d4b34504d Merge branch 'mkirk/return-navigation-bars' 2018-05-15 17:06:12 -04:00
Michael Kirk c3274f4e7b Fix navbar after using message button in contact card 
I removed this earlier - but turns out we still need this strong
reference, even though we're now using willDissapear instead of
didDissappear.

// FREEBIE
 2018-05-15 17:03:38 -04:00
Matthew Chen 986e3e0925 Revert "Disable contact sharing." 
This reverts commit e138c73bdc.
 2018-05-15 17:01:29 -04:00
Matthew Chen 3988654469 "Bump build to 2.25.0.21." 2018-05-15 17:01:14 -04:00
Matthew Chen e138c73bdc Disable contact sharing. 2018-05-15 17:00:41 -04:00
Matthew Chen 443b3c2886 Merge branch 'charlesmchen/profileKeyProtos' 2018-05-15 16:21:03 -04:00
Matthew Chen b74f545a64 Fix profile key protos. 2018-05-15 16:20:56 -04:00
Michael Kirk 4ba0fde3e9 Merge branch 'mkirk/mark-as-read-fix' 2018-05-15 16:17:10 -04:00
Michael Kirk 54f7373037 Clean up logging, start messages timer regardless of current 
configuration

// FREEBIE
 2018-05-15 15:13:58 -04:00
Matthew Chen 68d70da194 "Bump build to 2.25.0.20." 2018-05-15 14:13:33 -04:00
Matthew Chen c14a021ae3 Update l10n strings. 2018-05-15 14:13:24 -04:00
Michael Kirk 127224ad23 Merge branch 'mkirk/resume-read-timer-on-activation' 2018-05-15 13:23:29 -04:00
Michael Kirk 30cef1f084 start readtimer whenever we become active 
// FREEBIE
 2018-05-15 12:56:47 -04:00