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

10540 commits

This branch
This branch
All branches
Author SHA1 Message Date
Matthew Chen 977ee9ffe9 Merge remote-tracking branch 'private/release/2.34.0' 2019-01-22 11:10:04 -05:00
Matthew Chen 710b80e566 Merge branch 'charlesmchen/noteToSelfFeatureFlag' into release/2.34.0 2019-01-22 10:48:01 -05:00
Matthew Chen 6ce6736269 Merge branch 'charlesmchen/linkPreviews5a' 2019-01-22 10:21:58 -05:00
Matthew Chen d6a51a2a42 Fix merge breakage. 2019-01-22 10:21:43 -05:00
Matthew Chen f37aacca85 Respond to CR. 2019-01-22 10:17:11 -05:00
Matthew Chen 2dcc79fbca Fix issues around link previews. 2019-01-22 10:15:50 -05:00
Matthew Chen dd7ff1360a Merge branch 'charlesmchen/linkPreviews4' 2019-01-22 10:12:48 -05:00
Matthew Chen e819f777d2 Update Cocoapods. 2019-01-22 10:12:34 -05:00
Matthew Chen 6e044675ac Respond to CR. 2019-01-22 09:42:25 -05:00
Matthew Chen 8e44bf554c Respond to CR. 2019-01-22 09:42:25 -05:00
Matthew Chen d775a70a89 Build link previews. 2019-01-22 09:42:25 -05:00
Matthew Chen 31ea64bdaf Build link previews. 2019-01-22 09:42:25 -05:00
Matthew Chen 7878c0fac8 Add feature flag for 'note to self'. 2019-01-18 17:22:12 -05:00
Matthew Chen 7f1c6a84c9 "Bump build to 2.34.0.25." 2019-01-18 17:00:17 -05:00
Matthew Chen 3d39286913 Update l10n strings. 2019-01-18 16:59:22 -05:00
Matthew Chen cf2371222d Merge branch 'mkirk/fix-must-reselect' into release/2.34.0 2019-01-18 16:55:17 -05:00
Michael Kirk 066b400590 Honor selection with "Add More" 2019-01-18 10:34:11 -07:00
Michael Kirk d87fc27e78 Merge branch 'mkirk/faster-contact-search' 2019-01-17 13:42:18 -07:00
Michael Kirk 721f330296 warm non-signal accounts cache in the background 2019-01-17 13:27:34 -07:00
Matthew Chen bd5148d27f "Bump build to 2.34.0.24." 2019-01-17 14:47:34 -05:00
Matthew Chen 99478047c5 Merge branch 'mkirk/fix-missing-retry' into release/2.34.0 2019-01-17 14:47:02 -05:00
Matthew Chen 343c7d8ece Remove timer queue. 2019-01-17 14:45:43 -05:00
Michael Kirk 323249baa0 NSRunLoop methods should only be accessed on it's corresponding thread. 2019-01-17 14:43:18 -05:00
Michael Kirk 64cdaae02e schedule retry timer on main run loop 2019-01-17 14:43:18 -05:00
Matthew Chen a479e41628 Merge branch 'charlesmchen/sortIdMigrationRobustness' into release/2.34.0 2019-01-17 14:42:39 -05:00
Matthew Chen debf2e7a95 Fix 'mutation during enumeration' and 'bad ordering' crashes. 2019-01-17 14:42:24 -05:00
Matthew Chen fc36fe4fcf Merge branch 'charlesmchen/convoLoadMore' into release/2.34.0 2019-01-17 14:36:47 -05:00
Matthew Chen 127ccccb80 Tweak conversation view's "load more" behavior. 2019-01-17 14:36:31 -05:00
Michael Kirk 168c77c6fe Merge branch 'mkirk/unblock-reads' 2019-01-17 09:56:30 -07:00
Michael Kirk 0fb6dab020 avoid blocking write connection with long running read when building sync message 2019-01-17 09:55:51 -07:00
Michael Kirk 70f4d69fb7 Merge branch 'mkirk/fix-missing-captionview' into release/2.34.0 2019-01-17 09:54:20 -07:00
Michael Kirk 3c0982e0f9 Fix missing captionView when navigating via RailView 2019-01-17 09:54:10 -07:00
Michael Kirk 2233957b89 Merge branch 'mkirk/contact-search' 2019-01-17 09:50:58 -07:00
Michael Kirk 0c1b2e9f48 CR: remove unnecessary param, clearer code, comment typo 2019-01-17 09:47:01 -07:00
Michael Kirk 6e50a5353b rename for clarity 2019-01-16 17:06:37 -07:00
Matthew Chen c5d568de58 "Bump build to 2.34.0.23." 2019-01-16 16:52:50 -05:00
Matthew Chen b23a8b75d3 Merge branch 'charlesmchen/landscapeOrientationFeatureFlag' into release/2.34.0 2019-01-16 16:52:37 -05:00
Matthew Chen be714399c7 Add feature flag for landscape orientation. 2019-01-16 16:49:25 -05:00
Matthew Chen eab3599ce9 Add feature flag for landscape orientation. 2019-01-16 16:42:11 -05:00
Michael Kirk b4908e71e9 Use FTS for compose picker search 2019-01-16 14:39:35 -07:00
Matthew Chen cef28eb103 "Bump build to 2.34.0.22." 2019-01-16 15:25:32 -05:00
Matthew Chen acab31bb68 Merge branch 'charlesmchen/syncDeviceOrientation' into release/2.34.0 2019-01-16 15:25:13 -05:00
Matthew Chen 9d020e490c Respond to CR. 2019-01-16 15:24:19 -05:00
Michael Kirk 1d24fa7c50 Fixup WebSocket 2019-01-16 10:58:50 -07:00
Michael Kirk e4bb34542b Merge branch 'mkirk/websocket-swift' 2019-01-16 10:45:15 -07:00
Michael Kirk 16c8a1a76e replace SocketRocket with Starscream 2019-01-16 10:44:37 -07:00
Matthew Chen 48fda586c3 Sync device orientation when conversation view and home view appear. 2019-01-16 12:21:43 -05:00
Matthew Chen a5d9a40c8c Merge branch 'charlesmchen/shareExtensionNavbar' into release/2.34.0 2019-01-16 12:20:02 -05:00
Matthew Chen 635a644e2f Fix safe area insets in SAE. 2019-01-16 10:04:33 -05:00
Matthew Chen 50f9a089bf Fix navbar layout in share extension. 2019-01-16 09:55:23 -05:00