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

10357 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Kirk
371a6a6f15 Merge branch 'mkirk/m71' 2019-01-07 10:39:45 -07:00
Michael Kirk
e091551600 Fix: subsequent video calls fail to transmit video 2019-01-07 10:39:08 -07:00
Michael Kirk
91cf022716 WebRTC M71 
Protocol was renamed in 416018d455%5E%21/

And the RTC_SUPPORTS_METAL define was removed from RTC headers.
 2019-01-07 10:39:08 -07:00
Matthew Chen
befe37a8d8 Merge branch 'charlesmchen/signalingKey' 2019-01-07 09:02:53 -05:00
Matthew Chen
951f0dab22 Respond to CR. 2019-01-07 09:02:39 -05:00
Matthew Chen
3a5de59dcb Try to update account attributes every time we upgrade. 2019-01-07 09:02:39 -05:00
Matthew Chen
ed25f4748d Deprecate 'signaling key'. 2019-01-07 09:02:39 -05:00
Matthew Chen
b29f55b99c Merge branch 'charlesmchen/noSearchResultsSeparators' 2019-01-07 08:58:55 -05:00
Matthew Chen
858e47b9b5 Remove unsightly separators from 'no search results' state. 2019-01-07 08:58:49 -05:00
Matthew Chen
aabb468bf2 Merge branch 'charlesmchen/noSessionForTransientMessages' 2019-01-07 08:52:32 -05:00
Matthew Chen
78d0685cba Discard transient messages if there is no session. 2019-01-07 08:49:31 -05:00
Matthew Chen
27bc569fbe Merge branch 'charlesmchen/unseenVsUnreadViews' 2019-01-07 08:49:00 -05:00
Matthew Chen
1934b5d589 Tweak unseen database view accessor. 2019-01-07 08:48:52 -05:00
Matthew Chen
4011ee0254 Merge branch 'charlesmchen/imageEditorFeatureFlag' 2019-01-07 08:48:27 -05:00
Matthew Chen
5e3de84fdc Add feature flag for image editor. 2019-01-07 08:48:18 -05:00
Matthew Chen
8d8469d1ca Merge branch 'charlesmchen/noteToSelf2' 2019-01-07 08:47:51 -05:00
Matthew Chen
9ab8bec2b1 Fix searching for 'note to self'. 2019-01-07 08:45:42 -05:00
Matthew Chen
f68c1e179b Update Cocoapods. 2019-01-04 16:29:34 -05:00
Michael Kirk
914d12eda7 Merge branch 'mkirk/fix-timer-update-message' 2019-01-04 11:55:49 -07:00
Michael Kirk
432af13b63 Fix timer update message. 
This was broken in 5671fd252 while resolving merge conflicts from applying the
sortId changes.
 2019-01-04 10:57:13 -07:00
Matthew Chen
5ec28406e9 "Bump build to 2.34.0.0." 2019-01-04 09:41:47 -05:00
Matthew Chen
de8abe269f Merge branch 'charlesmchen/noteToSelf' 2019-01-04 09:19:59 -05:00
Matthew Chen
449633e0dc Respond to CR. 2019-01-04 09:19:41 -05:00
Matthew Chen
a7909c9c2e Note to Self. 2019-01-03 18:06:56 -05:00
Matthew Chen
fc8fbebd97 Note to Self. 2019-01-03 18:06:56 -05:00
Matthew Chen
1d13a02927 Note to Self. 2019-01-03 18:06:56 -05:00
Matthew Chen
e52feb3c36 Note to Self. 2019-01-03 18:06:56 -05:00
Matthew Chen
f2e44487ae Merge branch 'charlesmchen/imageEditor6' 2019-01-03 18:06:21 -05:00
Matthew Chen
fcedd1d10f Revert "Revert "Revert "Debug scaffolding.""" 
This reverts commit 1cd6941f68cac054355277bea6972fe571651402.
 2019-01-03 18:03:47 -05:00
Matthew Chen
8aa68327e6 Add primitive color picker. 2019-01-03 18:03:47 -05:00
Matthew Chen
e6d499a354 Revert "Revert "Debug scaffolding."" 
This reverts commit a5e71e6eaa71b4ccc7f45bc574b7a1e1c3ebb772.
 2019-01-03 18:03:47 -05:00
Matthew Chen
58cb02bc9e Merge branch 'charlesmchen/imageEditor5' 2019-01-03 18:03:12 -05:00
Matthew Chen
a440f692ce Clean up image editor temp files. 2019-01-03 18:01:45 -05:00
Matthew Chen
b24e8e4f81 Use autoreleasepool when rendering image editor output. 2019-01-03 18:01:45 -05:00
Matthew Chen
2b25d875bc Don't select a tool by default in image editor view. 2019-01-03 18:01:45 -05:00
Matthew Chen
8736db96af Merge branch 'charlesmchen/imageEditor4' 2019-01-03 18:00:21 -05:00
Matthew Chen
5dcde44486 Image editor fixes. 2019-01-03 16:56:24 -05:00
Matthew Chen
17c3ba0580 Image editor fixes. 2019-01-03 16:56:24 -05:00
Matthew Chen
a6bc328779 Revert "Revert "Revert "Debug scaffolding.""" 
This reverts commit 075ea35bbee4815fb77ecf3024ef29a933cc0ec0.
 2019-01-03 16:56:24 -05:00
Matthew Chen
5ac6d97bce Revert "Revert "Debug scaffolding."" 
This reverts commit a5e71e6eaa71b4ccc7f45bc574b7a1e1c3ebb772.
 2019-01-03 16:56:24 -05:00
Matthew Chen
ab8122d9a1 Merge branch 'charlesmchen/attachmentCrash' 2019-01-03 16:44:55 -05:00
Matthew Chen
dc6dadad43 Respond to CR. 2019-01-03 16:43:52 -05:00
Matthew Chen
1260e7459d Add asserts around attachment crash. 2019-01-03 16:43:52 -05:00
Matthew Chen
4a84a19d00 Merge tag '2.33.0.11' 2019-01-02 17:24:07 -05:00
Matthew Chen
3cd31c6c53 "Bump build to 2.33.0.11." 2019-01-02 16:43:14 -05:00
Matthew Chen
43527ac731 Merge branch 'mkirk/fix-view-model-update' into release/2.33.0 2019-01-02 16:43:06 -05:00
Michael Kirk
049b858125 Fix crash when update corresponds to a move. 
reloading during performBatchUpdates requires the *original* indexPath, not the
new index path.
 2019-01-02 16:42:48 -05:00
Matthew Chen
badc959e66 Update l10n. 2019-01-02 16:42:35 -05:00
Matthew Chen
3d6b9e1dc3 Fix build warning. 2019-01-02 16:41:03 -05:00
Michael Kirk
9f67d181bf Merge branch 'release/2.33.0' 2019-01-02 10:51:45 -07:00