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

6595 commits

This branch
This branch
All branches
Author SHA1 Message Date
Matthew Chen
5a6220a843 "Bump build to 2.24.0.5." 2018-04-16 19:18:37 -04:00
Matthew Chen
26f8050da0 Merge tag '2.23.4.2' 2018-04-16 19:18:31 -04:00
Matthew Chen
e96ad2f973 "Bump build to 2.23.4.2." 2018-04-16 19:13:37 -04:00
Matthew Chen
c3b72ac6b2 Merge branch 'charlesmchen/callViewVsKeyboard_' into hotfix/2.23.4 2018-04-16 19:13:26 -04:00
Matthew Chen
ae61b44a99 Resolve conflict between keyboard and call view. 2018-04-16 19:01:48 -04:00
Matthew Chen
7090a59a35 "Bump build to 2.24.0.4." 2018-04-16 18:15:39 -04:00
Matthew Chen
34e99cc42f Update l10n strings. 2018-04-16 18:15:29 -04:00
Matthew Chen
b8b131a1fb "Bump build to 2.24.0.3." 2018-04-16 17:57:02 -04:00
Matthew Chen
eb51ea42e3 Merge remote-tracking branch 'origin/hotfix/2.23.4' 2018-04-16 17:46:24 -04:00
Matthew Chen
bc35a38592 "Bump build to 2.23.4.1." 2018-04-16 17:41:08 -04:00
Matthew Chen
5cf6e65323 Fix screen lock alerts. 2018-04-16 17:40:06 -04:00
Michael Kirk
66f028a3b3 Update nullability 
If object is nil, which it can be, Swift freaks out, since we'd promised
it would never be nil.

// FREEBIE
 2018-04-16 17:31:23 -04:00
Matthew Chen
7d7981e823 Merge branch 'charlesmchen/mainWindow' into hotfix/2.23.4 2018-04-16 17:31:11 -04:00
Matthew Chen
85cb78ddfe Add mainWindow property to app context. 2018-04-16 17:31:00 -04:00
Matthew Chen
4e9c653c8a "Bump build to 2.23.4.0." 2018-04-16 17:30:41 -04:00
Matthew Chen
27935361c7 Merge branch 'charlesmchen/malformedProtos' 2018-04-16 16:39:40 -04:00
Matthew Chen
5ce39337ed Handle malformed protos. 2018-04-16 16:15:46 -04:00
Matthew Chen
b925f913bd Merge branch 'charlesmchen/attachmentTypeAssets' 2018-04-16 16:13:47 -04:00
Matthew Chen
284cc8c265 Apply attachment type assets. 2018-04-16 16:12:16 -04:00
Matthew Chen
146db1984b Apply attachment type assets. 2018-04-16 16:12:16 -04:00
Michael Kirk
f2d5bd48f3 Merge branch 'mkirk/nullability-fix' 2018-04-16 16:08:35 -04:00
Michael Kirk
c926ca10a5 Update nullability 
If object is nil, which it can be, Swift freaks out, since we'd promised
it would never be nil.

// FREEBIE
 2018-04-16 16:08:31 -04:00
Michael Kirk
4d539ba1c4 Merge branch 'mkirk/retry-failed-thumbnail-download' 2018-04-16 16:06:25 -04:00
Michael Kirk
64ff4cd660 tap-to-retry failed thumbnail downloads 
// FREEBIE
 2018-04-16 16:06:18 -04:00
Matthew Chen
8716d6b7a6 Merge branch 'charlesmchen/homeAndConversationViewDesignTweaks' 2018-04-16 12:39:32 -04:00
Matthew Chen
f6d5b9197c Respond to CR. 2018-04-16 12:39:11 -04:00
Matthew Chen
94e9c72e67 Apply design changes from Myles. 2018-04-16 12:36:30 -04:00
Matthew Chen
bb9c1fb23d Apply design changes from Myles. 2018-04-16 12:36:30 -04:00
Matthew Chen
6a69070ce9 Apply design changes from Myles. 2018-04-16 12:36:30 -04:00
Matthew Chen
aedeca03dd Merge branch 'charlesmchen/shapeLayerAnimations' 2018-04-16 12:14:38 -04:00
Matthew Chen
6831412e44 Respond to CR. 2018-04-16 12:14:09 -04:00
Matthew Chen
a5c7bdb987 Don't animate changes to shape layer properties. 2018-04-16 12:08:57 -04:00
Matthew Chen
e02bbaeec9 Merge branch 'charlesmchen/fixBlockScreenAnimation' 2018-04-16 12:06:43 -04:00
Matthew Chen
115235d1b4 Fix animation glitch in blocking window. 2018-04-16 09:49:37 -04:00
Matthew Chen
df685da497 Merge remote-tracking branch 'private/hotfix/2.23.3' 2018-04-16 09:47:38 -04:00
Michael Kirk
76b9564b83 Merge branch 'mkirk/text-caption-size' 2018-04-13 18:06:15 -04:00
Michael Kirk
f879291f16 Don't underestimate removed space. 
// FREEBIE
 2018-04-13 18:05:35 -04:00
Michael Kirk
13a432b9de Limit attachment caption length to 2k bytes 
// FREEBIE
 2018-04-13 17:57:09 -04:00
Matthew Chen
2a2f0bcadf "Bump build to 2.24.0.2." 2018-04-13 16:21:17 -04:00
Matthew Chen
d821942f02 Merge branch 'charlesmchen/quoteReplyTweaks' 2018-04-13 16:20:43 -04:00
Matthew Chen
59a3d736bf Respond to CR. 2018-04-13 15:10:16 -04:00
Matthew Chen
d7ae35f72c Streamline usage of quoted message view. 2018-04-13 15:03:51 -04:00
Matthew Chen
195d357370 Streamline usage of quoted message view. 2018-04-13 15:03:51 -04:00
Matthew Chen
f8b11c57cc Merge branch 'charlesmchen/incompleteAsserts' 2018-04-13 15:02:35 -04:00
Matthew Chen
daf0f0b22d Fix incomplete asserts. 2018-04-13 15:01:25 -04:00
Matthew Chen
9c93099515 Fix incomplete asserts. 2018-04-13 15:01:25 -04:00
Matthew Chen
194ae2dfd5 Merge branch 'charlesmchen/saeVsMainThread' 2018-04-13 15:00:52 -04:00
Matthew Chen
6caa5b87b6 Add more asserts around thread in SAE. 2018-04-13 14:59:38 -04:00
Matthew Chen
7013cf9b40 Merge branch 'charlesmchen/messageDetailsVsIPhoneX' 2018-04-13 14:53:32 -04:00
Matthew Chen
a5a2f02edc Respond to CR. 2018-04-13 14:53:14 -04:00