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

6850 commits

This branch
This branch
All branches
Author SHA1 Message Date
Matthew Chen 4fcbfe0e12 Fix merge breakage. 2018-05-04 16:20:33 -04:00
Matthew Chen 8622dba39f Merge branch 'charlesmchen/contactShareDesign' 2018-05-04 13:34:24 -04:00
Matthew Chen 1fc401d200 Respond to CR. 2018-05-04 13:34:11 -04:00
Matthew Chen bff6c84403 Clean up ahead of PR. 2018-05-04 13:21:53 -04:00
Matthew Chen b37588fc4c Provide default labels for custom contact fields. 2018-05-04 13:21:53 -04:00
Matthew Chen 72102cd5fa No navigation bar in Contact view, custom back button, fix scrolling. 2018-05-04 13:21:53 -04:00
Matthew Chen 575573ef6b Let users pick recipient id for actions in contact view. 2018-05-04 13:21:53 -04:00
Matthew Chen 1a1a043b27 Format phone numbers of contacts. 2018-05-04 13:21:53 -04:00
Matthew Chen dcf7a05986 Use default avatars for contact shares in contact view. 2018-05-04 13:21:53 -04:00
Matthew Chen 66989b8db7 Use default avatars for contact shares in conversation view. 2018-05-04 13:21:53 -04:00
Matthew Chen dbbd35f923 Merge branch 'charlesmchen/queueSystemContactFetch' 2018-05-04 13:20:24 -04:00
Matthew Chen f9d5421edc Modify system contacts fetch to use serial queue. 2018-05-04 13:20:17 -04:00
Matthew Chen bec5a9f428 Revert "oOnly one system contacts fetch at a time." 
This reverts commit d84e27f5a5f953fd68dbdf1086a75ffe6aee6720.
 2018-05-04 13:20:17 -04:00
Matthew Chen b767996dba oOnly one system contacts fetch at a time. 2018-05-04 13:20:17 -04:00
Matthew Chen e1a078900f "Bump build to 2.25.0.6." 2018-05-04 10:43:35 -04:00
Matthew Chen 00181479e8 Update l10n strings. 2018-05-04 10:43:26 -04:00
Michael Kirk 80b1bfacf4 Merge branch 'mkirk/debug-disappearing' 2018-05-04 10:41:20 -04:00
Michael Kirk a01164e8b1 Add canary assert 
// FREEBIE
 2018-05-04 10:40:41 -04:00
Michael Kirk ecf767ea53 canary assert 2018-05-04 10:36:22 -04:00
Michael Kirk 1dd8c41770 Only touch messages which have been read. 
// FREEBIE
 2018-05-04 10:33:05 -04:00
Michael Kirk 24f3362df1 ensure expirations started 
// FREEBIE
 2018-05-04 10:33:05 -04:00
Michael Kirk ed3db50978 clarify naming 
// FREEBIE
 2018-05-04 10:33:05 -04:00
Michael Kirk 0b8daaba2e Merge branch 'mkirk/fix-info-message-ordering' 2018-05-04 10:32:43 -04:00
Michael Kirk 242cc1138f A few lingering places were ordered with their envelope timestamp 
// FREEBIE
 2018-05-04 10:32:34 -04:00
Matthew Chen 3ad0b0ad6c Merge branch 'charlesmchen/sendFakeContacts' 2018-05-04 09:39:10 -04:00
Matthew Chen 8e84f89239 Respond to CR. 2018-05-04 09:38:37 -04:00
Matthew Chen 8dc3333467 Send fake contact shares. 2018-05-04 09:37:04 -04:00
Matthew Chen 390c0bc201 Send fake contact shares. 2018-05-04 09:37:04 -04:00
Matthew Chen c53b2934a8 Send fake contact shares. 2018-05-04 09:36:34 -04:00
Matthew Chen 612df0a026 Send fake contacts. 2018-05-04 09:36:34 -04:00
Matthew Chen d4bec2d068 Merge branch 'charlesmchen/contactSharingFeatureFlag' 2018-05-04 09:35:56 -04:00
Matthew Chen 459101c20e Add feature flag for contact sharing. 2018-05-04 09:35:47 -04:00
Matthew Chen f4ee688401 Add feature flag for contact sharing. 2018-05-04 09:35:47 -04:00
Michael Kirk 36abd6ab73 Merge branch 'mkirk/media-title-view' 2018-05-03 17:56:54 -04:00
Michael Kirk b32a1d5076 Fix media page title view on iOS9/10 
We must specify the frame of the titleView

Previously the titleView was the stackview, but we don't want to
"stretch" the labels to fit the size of the stack view, so we wrap the
stack view in a container view which becomes the new titleView.

// FREEBIE
 2018-05-03 17:56:46 -04:00
Matthew Chen ed7fe90e15 Merge branch 'charlesmchen/contactView' 2018-05-03 14:31:41 -04:00
Matthew Chen ff6b45abee Respond to CR. 2018-05-03 14:31:11 -04:00
Matthew Chen 1d56d56ca2 Clean up ahead of PR. 2018-05-03 14:09:54 -04:00
Matthew Chen 91d54360ba Add contact view. 2018-05-03 14:09:54 -04:00
Matthew Chen fa5577eece Create contact view. 2018-05-03 14:09:54 -04:00
Matthew Chen 2738bcbc58 Create contact view. 2018-05-03 14:09:54 -04:00
Michael Kirk 9c661b220a Merge branch 'mkirk/errant-input-toolbar' 2018-05-03 12:45:55 -04:00
Michael Kirk e604437e24 Don't become first responder while presenting 
// FREEBIE
 2018-05-03 12:45:48 -04:00
Michael Kirk fff7b11961 Merge branch 'mkirk/new-loading-screen' 2018-05-03 10:49:01 -04:00
Michael Kirk d98341697c format debug stats 
// FREEBIE
 2018-05-03 09:11:51 -04:00
Michael Kirk f782ea97df Use loading screen whenever launch is slow. 
Previously we had to manually account for each version that had a DB
change.

// FREEBIE
 2018-05-03 09:11:51 -04:00
Matthew Chen f2cc8cf9d2 Merge branch 'charlesmchen/contactSharePreviews' 2018-05-02 11:13:41 -04:00
Matthew Chen 00eadd629f Text previews for contact shares. 2018-05-02 11:13:35 -04:00
Michael Kirk 424bcbf83e Merge branch 'mkirk/contact-share' 2018-05-02 11:06:16 -04:00
Michael Kirk 5c0c01dea2 Contact picking 
// FREEBIE
 2018-05-02 11:06:09 -04:00