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

4954 commits

This branch
This branch
All branches
Author SHA1 Message Date
Matthew Chen
b6ca9a8cef Merge branch 'charlesmchen/permissionsVsInactive' 2017-11-09 03:15:55 -05:00
Matthew Chen
fc07c7c04f Respond to CR. 
// FREEBIE
 2017-11-09 03:14:58 -05:00
Matthew Chen
593c684fcb Don't ask for camera permissions if app is not active. 
// FREEBIE
 2017-11-09 03:02:05 -05:00
Matthew Chen
5cc292fb6c Don't ask for camera permissions if app is not active. 
// FREEBIE
 2017-11-09 03:02:05 -05:00
Matthew Chen
5e61307ce3 Don't ask for microphone permissions if app is not active. 
// FREEBIE
 2017-11-09 02:58:51 -05:00
Matthew Chen
f86882b5ff Don't ask for camera permissions if app is not active. 
// FREEBIE
 2017-11-09 02:57:15 -05:00
Matthew Chen
f757b7dcb1 Merge branch 'charlesmchen/xcode91' 2017-11-09 02:53:08 -05:00
Matthew Chen
5541be784f Fix build warnings from XCode 9. 2017-11-09 02:52:44 -05:00
Matthew Chen
6e840ff956 Fix build warnings from XCode 9. 2017-11-09 02:52:44 -05:00
Matthew Chen
a6bfc0a60e Fix build warnings from XCode 9. 2017-11-09 02:52:44 -05:00
Matthew Chen
2d21e2ae2c Fix build warnings from XCode 9. 2017-11-09 02:52:44 -05:00
Michael Kirk
48df161eb5 Merge branch 'mkirk/re-register-push-tokens' 2017-11-08 10:55:37 -05:00
Michael Kirk
c0bcc40a6f Ensure we re-upload push tokens after re-registering. 
// FREEBIE
 2017-11-08 10:55:34 -05:00
Michael Kirk
2c5389d03f Merge branch 'mkirk/cdn-fail-xcode9' 2017-11-08 10:55:18 -05:00
Michael Kirk
f297465713 Whitelist *.signal.org from ATS. 
We are validating against our own CA.

// FREEBIE
 2017-11-08 10:54:36 -05:00
Michael Kirk
cc0c914ad1 Merge branch 'mkirk/fix-contact-offer' 2017-11-08 10:52:26 -05:00
Michael Kirk
90dad75446 CR: remove unnecessary property 
// FREEBIE
 2017-11-08 10:50:25 -05:00
Michael Kirk
1f5603760b Fix contact offer 
We never assign interaction, but we can get it via the viewItem.

// FREEBIE
 2017-11-08 10:46:46 -05:00
Michael Kirk
e38535cbe1 update OpenSSL pod 
// FREEBIE
 2017-11-08 10:43:45 -05:00
Matthew Chen
34abb42469 Update build versions to v2.19.0. 
// FREEBIE
 2017-11-07 21:05:50 -05:00
Matthew Chen
f9fc23660c Merge tag '2.18.2.1' 2017-11-07 21:03:21 -05:00
Matthew Chen
40d2e003a4 Bump build to 2.18.2.1. 
// FREEBIE
 2017-11-07 20:39:28 -05:00
Matthew Chen
00752c17a2 Merge branch 'charlesmchen/approveGIFs' into release/2.18.2 2017-11-07 20:36:36 -05:00
Matthew Chen
1f35a1d29c Show attachment approval for GIFs. 
// FREEBIE
 2017-11-07 20:34:52 -05:00
Matthew Chen
957c2e3963 Merge branch 'charlesmchen/attachmentApprovalCrash' into release/2.18.2 2017-11-07 10:47:22 -05:00
Matthew Chen
167a171caf Fix crashes in attachment approval view. 
// FREEBIE
 2017-11-07 09:46:34 -05:00
Michael Kirk
d168485831 Merge branch 'mkirk/update-carthage' 2017-11-07 09:43:52 -05:00
Matthew Chen
511ff83edb Bumped version numbers for hotfix v2.18.2. 
// FREEBIE
 2017-11-06 22:31:47 -05:00
Michael Kirk
28cb7751d8 Update dependencies via Carthage 
Avoid PromiseKit 5 for now.

// FREEBIE
 2017-11-06 19:18:32 -05:00
Matthew Chen
f59f908930 Merge branch 'charlesmchen/burmese' 2017-11-06 16:40:56 -05:00
Matthew Chen
3952f717a5 Add Burmese l10n. 
// FREEBIE
 2017-11-06 15:15:22 -05:00
Matthew Chen
da7338580c Merge tag '2.18.1.0' 2017-11-06 14:28:43 -05:00
Matthew Chen
9c9c63db87 Bumped version numbers for hotfix v2.18.1. 
// FREEBIE
 2017-11-06 13:41:41 -05:00
Michael Kirk
bdc43ac112 Merge branch 'mkirk/group-sync-deadlock' into release/2.18.1 2017-11-06 13:39:49 -05:00
Michael Kirk
e82a3f3ddf respond to CR 
// FREEBIE
 2017-11-06 13:39:23 -05:00
Michael Kirk
8ef9e96b91 Avoid group-sync deadlock by making post-upload save async 
// FREEBIE
 2017-11-06 13:39:23 -05:00
Michael Kirk
98fd15fae7 Avoid groupsync deadlock - pass in transaction 
// FREEBIE
 2017-11-06 13:39:23 -05:00
Matthew Chen
e4d608c61a Merge branch 'charlesmchen/inputToolbarEdge' 2017-11-06 12:54:18 -05:00
Matthew Chen
e3f7947da0 Emphasize borders of input toolbar. 
// FREEBIE
 2017-11-06 12:54:09 -05:00
Matthew Chen
6297663d34 Merge branch 'charlesmchen/multipleLocalNotifications' 2017-11-06 12:51:02 -05:00
Matthew Chen
204902c111 Respond to CR. 
// FREEBIE
 2017-11-06 12:50:20 -05:00
Matthew Chen
03241128f6 Respond to CR. 
// FREEBIE
 2017-11-06 12:37:15 -05:00
Matthew Chen
1ea413ad48 Be more defensive about handling local notifications. 
// FREEBIE
 2017-11-06 11:14:31 -05:00
Matthew Chen
ee4906b952 Merge branch 'charlesmchen/maxTextCellHeight' 2017-11-03 15:48:14 -04:00
Matthew Chen
a5c4140a12 Reduce max text message bubble size. 
// FREEBIE
 2017-11-03 15:48:08 -04:00
Matthew Chen
ea0b6065e3 Revert "Constrain the max text cell height to the height of the screen." 
This reverts commit b9583a3c85a3b27f65b653a1d851c7c966fdc83d.

// FREEBIE
 2017-11-03 15:48:08 -04:00
Matthew Chen
608cd2781f Constrain the max text cell height to the height of the screen. 
// FREEBIE
 2017-11-03 15:48:08 -04:00
Matthew Chen
0cd49e597e Merge branch 'charlesmchen/ensureAttachmentContentType' 2017-11-03 15:24:29 -04:00
Matthew Chen
8b6265f1b5 Respond to CR. 
// FREEBIE
 2017-11-03 15:24:22 -04:00
Matthew Chen
4d57402367 Ensure attachments always have a valid content type. 
// FREEBIE
 2017-11-03 15:03:17 -04:00