oxen-io
/
session-ios
mirror of https://github.com/oxen-io/session-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
17,506 Commits 5 Branches 133 Tags 227 MiB
Commit Graph

17506 Commits

Author SHA1 Message Date
Matthew Chen 218e65de32 Merge branch 'charlesmchen/showMuteStatusInHomeView' 2017-04-19 12:34:53 -04:00
Matthew Chen 2b09033dda Show mute status in home view. 
// FREEBIE
 2017-04-19 12:34:45 -04:00
Matthew Chen d02c3e2784 Merge branch 'charlesmchen/fixMuteUntilDateFormat' 2017-04-19 12:33:40 -04:00
Matthew Chen b2dd458f12 Fix “muted until” date format. 
// FREEBIE
 2017-04-19 11:55:00 -04:00
Matthew Chen 0603ab72d0 Merge branch 'charlesmchen/pauseMediaAdapters' 2017-04-19 11:48:02 -04:00
Matthew Chen d65e398450 Respond to CR. 
// FREEBIE
 2017-04-19 11:47:47 -04:00
Matthew Chen b2664158b1 Pause animated gifs when offscreen; clean up media views more aggressively. 
// FREEBIE
 2017-04-19 11:45:06 -04:00
Matthew Chen 4045d3bda1 Merge branch 'charlesmchen/improveGroupMembersView' 2017-04-19 11:40:35 -04:00
Matthew Chen ee765df4b1 Respond to CR. 
// FREEBIE
 2017-04-19 11:39:13 -04:00
Matthew Chen e36b5a4602 Improve group members view. 
// FREEBIE
 2017-04-19 11:37:27 -04:00
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 b9eeb408c3 Merge branch 'charlesmchen/muteThreads' 2017-04-19 10:00:06 -04:00
Matthew Chen f0ca468839 Respond to CR. 
// FREEBIE
 2017-04-19 09:59:49 -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 0e9da39c6b Add muting of threads. 
// FREEBIE
 2017-04-19 09:57:05 -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
Matthew Chen 51689b3341 Merge branch 'charlesmchen/fixMessagesFromLinkedDevices' 2017-04-19 09:49:43 -04:00
Matthew Chen a3db112c50 Fix outgoing message status for messages sent from linked devices. 
// FREEBIE
 2017-04-18 21:45:33 -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 bb24ffc917 Merge branch 'charlesmchen/outgoingMessageState' 2017-04-17 18:05:22 -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