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

1908 commits

This branch
This branch
All branches
Author SHA1 Message Date
Matthew Chen
9f3e5561fc Merge branch 'charlesmchen/fixConversationSettingsSegues' 2017-04-19 11:34:26 -04:00
Matthew Chen
06f9affc01 Fix segues in conversation settings view. 
// FREEBIE
 2017-04-19 11:04:25 -04:00
Matthew Chen
c81206ca70 Merge branch 'charlesmchen/syncContactsEagerly' 2017-04-19 10:28:33 -04:00
Matthew Chen
a29809e672 Respond to CR. 
// FREEBIE
 2017-04-19 10:28:24 -04:00
Matthew Chen
bfd29cd994 Send contacts sync messages whenever the contacts change. 
// FREEBIE
 2017-04-19 10:25:33 -04:00
Matthew Chen
bd261f16c3 Merge branch 'charlesmchen/fixPasteText' 2017-04-19 10:23:01 -04:00
Matthew Chen
2a9ac87568 Fix paste of text. 
// FREEBIE
 2017-04-19 10:22:53 -04:00
Matthew Chen
4451a3a41b Merge branch 'charlesmchen/callServiceEdgeCases' 2017-04-19 10:18:13 -04:00
Matthew Chen
791dba9242 Respond to CR. 
// FREEBIE
 2017-04-19 10:18:03 -04:00
Matthew Chen
3368659d87 Improve handling of call service edge cases. 
// FREEBIE
 2017-04-19 10:09:40 -04:00
Matthew Chen
b4464f91a2 Improve handling of call service edge cases. 
// FREEBIE
 2017-04-19 10:09:40 -04:00
Matthew Chen
3c4955840d Improve handling of call service edge cases. 
// FREEBIE
 2017-04-19 10:09:40 -04:00
Matthew Chen
f920300f28 Improve handling of call service edge cases. 
// FREEBIE
 2017-04-19 10:09:40 -04:00
Matthew Chen
603d514732 Merge branch 'charlesmchen/muteThreads' 2017-04-19 10:02:04 -04:00
Matthew Chen
3c8635c352 [SSK] Add muting of threads. 
// FREEBIE
 2017-04-19 10:01:29 -04:00
Matthew Chen
499c8d0bc1 Add muting of threads. 
// FREEBIE
 2017-04-19 09:57:12 -04:00
Matthew Chen
d968c899b5 Add muting of threads. 
// FREEBIE
 2017-04-19 09:57:12 -04:00
Matthew Chen
2ca122f579 Add muting of threads. 
// FREEBIE
 2017-04-19 09:57:12 -04:00
Matthew Chen
2c286c8b53 Add muting of threads. 
// FREEBIE
 2017-04-19 09:57:12 -04:00
Matthew Chen
c8466912f0 Add muting of threads. 
// FREEBIE
 2017-04-19 09:57:12 -04:00
Matthew Chen
ea848f31e6 [SSK] Fix outgoing message status for messages sent from linked devices. 
// FREEBIE
 2017-04-19 09:53:34 -04:00
Michael Kirk
b54508bb28 when generating strings verify that SSK is on master 
Otherwise it's really easy to generate strings from the wrong branch

// FREEBIE
 2017-04-18 12:59:00 -04:00
Matthew Chen
20ea6b8d31 Merge branch 'charlesmchen/justOnceContactStore' 2017-04-18 12:33:27 -04:00
Matthew Chen
3ccee7ffda Don’t load contact store twice. 
// FREEBIE
 2017-04-18 12:33:19 -04:00
Matthew Chen
5713a0e306 Merge branch 'charlesmchen/fixCalling' 2017-04-18 12:32:55 -04:00
Matthew Chen
1fa037527c Fix calling by using actual session descriptions. 
// FREEBIE
 2017-04-18 12:32:45 -04:00
Matthew Chen
f0727b541e Merge branch 'charlesmchen/outgoingMessageState' 2017-04-17 18:07:52 -04:00
Matthew Chen
dd807f676c [SSK] Rework outgoing message state & refine error handling for outgoing group messages. 
// FREEBIE
 2017-04-17 18:07:37 -04:00
Matthew Chen
d614073795 Respond to CR. 
// FREEBIE
 2017-04-17 18:05:47 -04:00
Matthew Chen
e025b86e75 Rework outgoing message state. 
// FREEBIE
 2017-04-17 18:05:47 -04:00
Matthew Chen
cc766bcc53 Rework outgoing message state. 
// FREEBIE
 2017-04-17 18:05:47 -04:00
Matthew Chen
66d1a37859 Rework outgoing message state. 
// FREEBIE
 2017-04-17 18:05:47 -04:00
Matthew Chen
2c46220ebf Merge branch 'charlesmchen/notificationsVsConcurrency' 2017-04-17 16:49:22 -04:00
Matthew Chen
3e53605009 Improve thread safety in PushManager and NotificationsManager. 
// FREEBIE
 2017-04-17 16:49:09 -04:00
Matthew Chen
dca3fa5001 Merge branch 'charlesmchen/lostMessages' 2017-04-17 16:08:39 -04:00
Matthew Chen
f41762c316 [SSK] Avoid lost messages. 
// FREEBIE
 2017-04-17 16:08:25 -04:00
Matthew Chen
1558d8c6c5 Avoid lost messages by acknowledges message receipt after the message is processed. 
// FREEBIE
 2017-04-17 16:07:03 -04:00
Matthew Chen
f9b51c01f4 [SSK] De-bounce the prekey checks. 
// FREEBIE
 2017-04-14 14:35:32 -04:00
Michael Kirk
fa5bb7ad9d Make it easier to track local users registration ID in debug log 
// FREEBIE
 2017-04-14 11:08:06 -04:00
Michael Kirk
0743722782 [SSK] ensure accepted SPKs are marked 
// FREEBIE
 2017-04-14 10:58:15 -04:00
Michael Kirk
d911b6a995 Merge branch 'call-permissions' 2017-04-14 10:47:04 -04:00
Michael Kirk
da8596c1ba Check microphone permissions: Clean up 
* copy tweaks
* use "settings" instead of "privacy settings" for button text
* include comments in NSLocalizedString param so they can be extracted with genstrings
* style dismiss action as "cancel"

// FREEBIE
 2017-04-14 10:46:40 -04:00
Christoph Hagen
70efb5e9ec Check microphone permissions before starting a call 2017-04-14 10:46:18 -04:00
Matthew Chen
528b7296d2 Merge branch 'charlesmchen/hardwareRingerVsPlayback' 2017-04-13 16:24:58 -04:00
Matthew Chen
5c20a85974 Respond to CR. 
// FREEBIE
 2017-04-13 16:24:48 -04:00
Matthew Chen
bf9ae552a3 Ignore hardware mute switch during video playback in attachment approval view. 
// FREEBIE
 2017-04-13 16:17:35 -04:00
Matthew Chen
d9ef27d802 Ignore hardware mute switch during video playback in messages view. 
// FREEBIE
 2017-04-13 16:17:35 -04:00
Matthew Chen
1cf45a26d0 Merge remote-tracking branch 'origin/hotfix/2.10.1' 2017-04-13 16:13:35 -04:00
Matthew Chen
3e7ecf335c Merge branch 'charlesmchen/honorAttachmentFilenames' 2017-04-13 16:10:00 -04:00
Matthew Chen
9c6f76253a [SSK] Honor attachment filenames. 
// FREEBIE
 2017-04-13 16:09:51 -04:00