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

5116 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Kirk
726fde235a Merge branch 'mkirk/affix-searchbar' 2017-12-08 13:32:26 -05:00
Michael Kirk
23014f9ea4 Keep header affixed to navbar. 
// FREEBIE
 2017-12-08 11:40:59 -05:00
Michael Kirk
b014c236b8 bump build number 2017-12-07 18:05:18 -05:00
Michael Kirk
f7dfe23c66 sync translations 2017-12-07 18:00:30 -05:00
Michael Kirk
d6359d6551 Update carthage - WebRTC M63 
// FREEBIE
 2017-12-07 17:32:41 -05:00
Michael Kirk
71f56ef3da Merge branch 'mkirk/dismiss-share-view' 2017-12-07 17:28:02 -05:00
Michael Kirk
1c74d8f912 CR: remove reset of BundleDocumentTypes 2017-12-07 17:27:37 -05:00
Michael Kirk
dd1795e337 fixup rebae 2017-12-07 17:12:03 -05:00
Michael Kirk
3ecf0a7537 Cancelling dismisses share extension, remove "import with signal" 
Usinig the new ShareViewDelegate to dismiss the share extension, might
have broken the "import with signal" functionality. But because we
want to remove it anyway, I've done that now, rather than fix it up.

// FREEBIE
 2017-12-07 17:12:03 -05:00
Michael Kirk
2cd3ce62f9 Merge branch 'mkirk/conversation-picker-presentation' 2017-12-07 16:48:21 -05:00
Michael Kirk
ed33663e6d CR: remove redundant isHidden 
// FREEBIE
 2017-12-07 16:48:02 -05:00
Michael Kirk
cd95e1784b avoid race condition in presentation animation 2017-12-07 16:48:02 -05:00
Michael Kirk
3bb772f135 Modal conversation picker, hide loading screen when possible 
The first usable screen in the conversation picker, that's the first
thing we want to show the user, and the modal presentation feels like
the right way to introduce this new context.

Long load times should be the exception, not the normal flow, so we
delay it's presentation in hopes that it will generally never be seen.

// FREEBIE
 2017-12-07 16:48:01 -05:00
Matthew Chen
6bb9b9cbc6 Merge branch 'charlesmchen/saeSetupOrder' 2017-12-07 16:29:31 -05:00
Matthew Chen
d15d5ce3a2 Respond to CR. 2017-12-07 16:29:24 -05:00
Matthew Chen
791743a5f0 Fix order of operations in SAE setup. 2017-12-07 16:04:52 -05:00
Matthew Chen
03d1165947 Merge branch 'charlesmchen/estonianAndTaiwaneseChinese' 2017-12-07 14:46:21 -05:00
Matthew Chen
345323fe8a Add Estonian and Taiwanese Chinese localizations. 2017-12-07 14:46:12 -05:00
Matthew Chen
5053b02681 Merge branch 'charlesmchen/logTagProperty' 2017-12-07 14:44:53 -05:00
Matthew Chen
f7bcf1d04d Fix tests. 2017-12-07 14:44:38 -05:00
Matthew Chen
1be828574d Respond to CR. 2017-12-07 14:33:54 -05:00
Matthew Chen
f148003fb3 Convert logTag to property. 2017-12-07 14:32:22 -05:00
Matthew Chen
c36c4d6ec3 Merge branch 'charlesmchen/swiftSingletons' 2017-12-07 14:31:33 -05:00
Matthew Chen
b12f192c6f Respond to CR. 2017-12-07 14:31:00 -05:00
Matthew Chen
36703d3bbd Add asserts around Swift singletons. 2017-12-07 13:58:27 -05:00
Matthew Chen
7a1e47cd26 Add asserts around Swift singletons. 2017-12-07 13:57:45 -05:00
Matthew Chen
26bd1f2e65 Merge branch 'charlesmchen/saeVsStatics' 2017-12-07 13:56:28 -05:00
Matthew Chen
8312614cf7 Respond to CR. 2017-12-07 13:53:13 -05:00
Matthew Chen
99f0b9d3e8 Fix issues around statics. 2017-12-07 12:34:02 -05:00
Michael Kirk
28a55e2449 Merge branch 'mkirk/preview' 2017-12-07 11:08:28 -05:00
Michael Kirk
0429836ff9 CR: rename keyWindow -> keyReferenceView, split long line 
// FREEBIE
 2017-12-07 10:39:44 -05:00
Michael Kirk
ca999627ef CR: replace, not push VC 
// FREEBIE
 2017-12-07 10:22:04 -05:00
Michael Kirk
c0c71ad765 cleanup 2017-12-07 10:15:35 -05:00
Michael Kirk
4aba6e0c9f Present conversation picker when DB is ready 
// FREEBIE
 2017-12-07 10:15:35 -05:00
Michael Kirk
3f6f881d3f Use assets from duplicated main bundle 
// FREEBIE
 2017-12-07 10:14:30 -05:00
Michael Kirk
eca19e5874 Reconcile MediaMessageView zoom behavior with AppExtension 
Previously it was predicated on UIApplication.shared

// FREEBIE
 2017-12-07 10:14:30 -05:00
Michael Kirk
3036337a5a Include filename, support sharing all other image types 
// FREEBIE
 2017-12-07 10:14:30 -05:00
Michael Kirk
3eceb86371 Show alert if we fail to build the attachment 
// FREEBIE
 2017-12-07 10:14:30 -05:00
Michael Kirk
89b9887f1d Make DeviceSleepManager extension compatible 
// FREEBIE
 2017-12-07 10:13:47 -05:00
Michael Kirk
e20072ff2b CR: remove bundle specific image assets 
// FREEBIE
 2017-12-07 10:13:06 -05:00
Michael Kirk
654d345469 remove null references to moved certificates 2017-12-07 10:13:06 -05:00
Michael Kirk
c52192295b fixup rebase. move jobs to proper dir 2017-12-07 10:13:06 -05:00
Michael Kirk
56fe9d057d Attachment Approval 
// FREEBIE
 2017-12-07 10:13:06 -05:00
Michael Kirk
a58f1f385c Share a photo from photos app 
Shows the conversation picker, and sends the attachment to that
conversation.

There's still a lot TODO

-[ ] resolve JSQ dependency
-[ ] properly wait for app to load
-[ ] dismiss share extension after send is complete
-[ ] support non jpeg file types
-[ ] Fix device sleep manager

// FREEBIE
 2017-12-07 10:13:06 -05:00
Michael Kirk
f781199e27 ignore warnings in AFNetworking 
// FREEBIE
 2017-12-07 10:12:23 -05:00
Matthew Chen
1a6f219963 Merge branch 'charlesmchen/saeErrorViews' 2017-12-06 21:47:10 -05:00
Matthew Chen
3960b8162e Respond to CR. 2017-12-06 21:47:03 -05:00
Matthew Chen
848f055da1 Add SAE error views. 2017-12-06 21:38:53 -05:00
Matthew Chen
f1c42a5dbc Merge branch 'charlesmchen/sendDebugLogToSelf' 2017-12-06 21:36:25 -05:00
Matthew Chen
94b5dfb1b5 Localize the debug log UI. 2017-12-06 18:01:44 -05:00