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

2004 Commits

Author SHA1 Message Date
Matthew Chen 96e155c75e Rework appearance of voice messages and audio attachments. 
// FREEBIE
 2017-05-12 09:46:54 -04:00
Matthew Chen 9f2414b371 Merge branch 'charlesmchen/blockedUsersVsNewGroups' 2017-05-12 09:27:09 -04:00
Matthew Chen 0ff3e5e6a3 Don’t add blocked users to new groups and handle block alert results correctly. 
// FREEBIE
 2017-05-12 09:24:58 -04:00
Matthew Chen 5a69917cfd Merge branch 'charlesmchen/textSendVsVoiceMessageButton' 2017-05-11 16:20:00 -04:00
Matthew Chen f10d530410 After sending a text message, the "send" button should revert to mic. 
// FREEBIE
 2017-05-11 16:19:52 -04:00
Matthew Chen 7f83c6f163 Merge branch 'charlesmchen/voiceMessageExtraPeriod' 2017-05-11 16:19:14 -04:00
Matthew Chen 37278c22d5 Remove extra period in voice message file names. 
// FREEBIE
 2017-05-11 10:04:42 -04:00
Michael Kirk 722736d264 translation spellcheck =/ 
// FREEBIE
 2017-05-10 19:02:08 -04:00
Michael Kirk 8a0ff276cf copy tweak 
// FREEBIE
 2017-05-10 18:44:28 -04:00
Michael Kirk 8e24937727 Update translations 
// FREEBIE
 2017-05-10 18:37:05 -04:00
Michael Kirk cf10104983 bump version 
// FREEBIE
 2017-05-10 17:09:45 -04:00
Michael Kirk d3a96725a1 fix block scoping. I'm not even sure how this compiled before. 
// FREEBIE
 2017-05-10 17:04:43 -04:00
Michael Kirk 755d5dc4e6 resolve push-token changes from RI of hotfix/2.11.4 
// FREEBIE
 2017-05-10 17:02:58 -04:00
Michael Kirk 929ba06263 Merge branch 'hotfix/2.11.4' into mkirk/fix-push-sync-job 2017-05-10 16:56:41 -04:00
Michael Kirk 82503db380 sync translations 
// FREEBIE
 2017-05-10 16:38:34 -04:00
Matthew Chen 78b52b6917 Merge branch 'charlesmchen/examplePhoneNumbers' 2017-05-10 16:15:41 -04:00
Matthew Chen c7777bcb13 [SSK] Show example phone numbers. 
// FREEBIE
 2017-05-10 16:15:15 -04:00
Matthew Chen 73f79f05ec Format example phone numbers. 
// FREEBIE
 2017-05-10 16:12:58 -04:00
Matthew Chen c81eed74ca Show example phone numbers. 
// FREEBIE
 2017-05-10 16:12:58 -04:00
Matthew Chen 23558ea875 Merge branch 'charlesmchen/phoneNumberParsing' 2017-05-10 15:04:52 -04:00
Matthew Chen 0bab5ed404 Always honor filtering in contact-related views. 
// FREEBIE
 2017-05-10 15:04:47 -04:00
Matthew Chen fdbc1663f8 Merge branch 'charlesmchen/disappearingMessages' 2017-05-10 15:03:34 -04:00
Matthew Chen 033ce90dd3 Respond to CR. 
// FREEBIE
 2017-05-10 15:03:14 -04:00
Matthew Chen eabda5ad90 Clean up ahead of PR. 
// FREEBIE
 2017-05-10 15:02:16 -04:00
Matthew Chen 19b80d1f4b Rework the “disappearing messages” logic. 
// FREEBIE
 2017-05-10 15:02:16 -04:00
Matthew Chen 0adcd157da [SSK] Don’t ignore “unnamed” phone numbers. 
// FREEBIE
 2017-05-10 14:59:41 -04:00
Matthew Chen eb385f1e97 [SSK] Rework the “disappearing messages” logic. 
// FREEBIE
 2017-05-10 14:55:31 -04:00
Michael Kirk 8fae185ab7 Merge branch 'mkirk/more-call-logging' 2017-05-10 13:04:06 -04:00
Michael Kirk 7bdd732870 remove contact name from production log 
// FREEBIE
 2017-05-10 13:03:45 -04:00
Michael Kirk 20fc733bdf Clearer call logging 
// FREEBIE
 2017-05-10 13:03:45 -04:00
Michael Kirk a25573cf26 Merge branch 'mkirk/edit-1-1-contact' 2017-05-10 12:08:13 -04:00
Michael Kirk 737a5932c0 tapping contact label shows contact edit view 
// FREEBIE
 2017-05-10 12:07:14 -04:00
Michael Kirk bd343f6971 clean up some animations 
// FREEBIE
 2017-05-10 12:02:14 -04:00
Michael Kirk aabd56b23d Clean up comments per CR 
// FREEBIE
 2017-05-10 10:56:57 -04:00
Michael Kirk 9dc9813dea fix layout for long named contacts 
// FREEBIE
 2017-05-10 10:32:41 -04:00
Michael Kirk 3754b6f264 Edit 1:1 contact details 
// FREEBIE
 2017-05-10 10:32:41 -04:00
Matthew Chen 8871331cfa [SPK] Update license. 
// FREEBIE
 2017-05-10 10:26:08 -04:00
Matthew Chen 387f1018f5 [SSK] Auto-rejoin groups by emitting and responding to “request group info” messages. 
// FREEBIE
 2017-05-10 10:06:19 -04:00
Matthew Chen d2ef3c38c9 Merge branch 'charlesmchen/fixScreenProtection' 2017-05-10 09:39:40 -04:00
Matthew Chen b2fba060d8 Fix edge case where screen protection is not removed. 
// FREEBIE
 2017-05-10 09:39:33 -04:00
Michael Kirk e295f92943 [SSK] Safer SignedPreKey deletion policy 
// FREEBIE
 2017-05-09 19:09:46 -04:00
Michael Kirk a4b26dda09 Merge branch 'mkirk/contact-editing' 2017-05-09 18:11:06 -04:00
Michael Kirk e95b579d97 TODONE 
// FREEBIE
 2017-05-09 18:10:46 -04:00
Matthew Chen 41deab12de Fix “two table views” bug in “show group members” view. 
// FREEBIE
 2017-05-09 16:59:31 -04:00
Michael Kirk 073c0d6639 Add/Edit contacts in group list 
* properly populate phone fields
* Fix appearence for CNContactViewController
* "Add Contact" vs "Show Contact"

// FREEBIE
 2017-05-09 16:59:31 -04:00
Michael Kirk 279439843e Merge pull request #2089 from WhisperSystems/mkirk/no-name-contacts 
show number for no-name contacts
 2017-05-09 16:57:52 -04:00
Michael Kirk 8411d13ef6 show number for no-name contacts 
previously if you had a contact, but no saved name
there would be a blank entry in your compose picker

// FREEBIE
 2017-05-09 16:38:47 -04:00
Michael Kirk bfc4ff6f05 Merge branch 'mkirk/missing-contacts-compose' 2017-05-09 16:21:40 -04:00
Michael Kirk 3040c4a341 include missing return 
// FREEBIE
 2017-05-09 16:21:30 -04:00
Michael Kirk fee47efbea Avoid repaint by requestng contacts before Compose 
This entailed passing callback params through the contact request.

// FREEBIE
 2017-05-09 16:21:30 -04:00