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

1819 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Matthew Chen 193d9421ce Respond to CR. 
// FREEBIE
 2017-04-13 16:06:23 -04:00
Matthew Chen 0018d0040b Honor attachment filenames. 
// FREEBIE
 2017-04-13 15:41:28 -04:00
Matthew Chen dd3250a9e8 Honor attachment filenames. 
// FREEBIE
 2017-04-13 15:41:28 -04:00
Matthew Chen aab897abb8 Merge branch 'feature/contactsIntersectionAudit' 2017-04-13 15:38:43 -04:00
Matthew Chen dc3a382c23 Respond to CR. 
// FREEBIE
 2017-04-13 15:38:32 -04:00
Matthew Chen 2e653afff9 Reduce usage of contacts intersection endpoint. 
// FREEBIE
 2017-04-13 15:28:39 -04:00
Matthew Chen 2ede3f3345 Reduce usage of contacts intersection endpoint. 
// FREEBIE
 2017-04-13 15:28:39 -04:00
Matthew Chen 5b4e3a2422 Reduce usage of contacts intersection endpoint. 
// FREEBIE
 2017-04-13 15:28:39 -04:00
Matthew Chen f38f3d8887 [SSK] Update SignalAttachment to allow arbitrary attachments. 
// FREEBIE
 2017-04-13 15:27:55 -04:00
Matthew Chen c1f2ae61b6 Merge branch 'charlesmchen/arbitraryAttachments' 2017-04-13 14:59:11 -04:00
Matthew Chen 70ac0acc68 Respond to CR. 
// FREEBIE
 2017-04-13 14:58:14 -04:00
Matthew Chen 54d2d85ebb Update SignalAttachment to allow arbitrary attachments. 
// FREEBIE
 2017-04-13 14:55:53 -04:00
Matthew Chen 72eb632874 Merge branch 'charlesmchen/sendOversizeTextMessages' 2017-04-13 14:42:19 -04:00
Matthew Chen da13506db1 Respond to CR. 
// FREEBIE
 2017-04-13 14:42:05 -04:00
Matthew Chen db7cb8d388 Send oversize text messages as attachments. 
// FREEBIE
 2017-04-13 14:36:58 -04:00
Matthew Chen 9882eeea93 Merge branch 'charlesmchen/improveAttachmentApprovalView' 2017-04-13 13:50:14 -04:00
Matthew Chen ebde769161 Respond to CR. 
// FREEBIE
 2017-04-13 13:49:46 -04:00
Matthew Chen 7f5847d2d5 Improve file size formatting in attachment approval dialog. 
// FREEBIE
 2017-04-12 16:53:28 -04:00
Matthew Chen de735dcf33 Add stubs for audio preview to attachment approval dialog. 
// FREEBIE
 2017-04-12 16:48:28 -04:00
Matthew Chen fc33b00830 Add animated image preview to attachment approval dialog. 
// FREEBIE
 2017-04-12 16:37:37 -04:00
Matthew Chen 5d79f43970 Add video preview to attachment approval dialog. 
// FREEBIE
 2017-04-12 16:30:25 -04:00
Matthew Chen 4d091b470e Merge branch 'charlesmchen/socketLifecycle' 2017-04-12 12:02:34 -04:00
Matthew Chen 33593921f6 [SSK] Rework socket manager. 
// FREEBIE
 2017-04-12 12:01:38 -04:00
Matthew Chen 625a448901 Respond to CR. 
// FREEBIE
 2017-04-12 11:59:45 -04:00
Matthew Chen effa885614 Rework socket manager. 
// FREEBIE
 2017-04-12 11:59:45 -04:00
Matthew Chen 195d721aa6 Merge branch 'charlesmchen/homeViewBlockIndicator' 2017-04-12 11:57:16 -04:00
Matthew Chen 267462c584 Show block indicator in home view. 
* Improve thread safety of home view cells.

// FREEBIE
 2017-04-12 11:55:37 -04:00
Michael Kirk 1d9de09429 [SSK] Make sure we can return multiple recipients matches 
// FREEBIE
 2017-04-12 11:00:35 -04:00
Michael Kirk 1e47f14bdd Merge branch 'mkirk/update-linter-script' 2017-04-12 10:56:03 -04:00
Michael Kirk 4149cba6db use updated localizable strings linter 
this script checks to make sure the proper number of format characaters
appear in our translated strings.

See: https://github.com/WhisperSystems/l10n_lint

// FREEBIE
 2017-04-12 10:55:53 -04:00
Michael Kirk 88d99b7ad2 Merge branch 'mkirk/fix-edit-menu-positioning' 2017-04-12 10:25:24 -04:00
Michael Kirk 5d604a796c [JSQMVC] Fixes "floating" edit menu for narrow media items 
previously, edit menu was only positioned correctly for text bubbles,
and centered for media bubbles.

It wasn't that noticable for images/videos since those usually extended
to the middle of the conversation view, but with narrower media bubbles
(like arbitrary attachments) this became a bigger problem.

// FREEBIE
 2017-04-12 10:24:29 -04:00
Matthew Chen bf02bd2cc8 Merge branch 'charlesmchen/deferNotifications' 2017-04-12 10:03:41 -04:00
Matthew Chen 2a369273c8 Respond to CR. 
// FREEBIE
 2017-04-12 10:03:09 -04:00
Matthew Chen b7b5dbb563 Do not present local notifications if a read receipt arrives immediately after. 
// FREEBIE
 2017-04-12 09:46:53 -04:00
Matthew Chen 0115eb8475 Merge branch 'charlesmchen/blockOffer' 2017-04-12 09:16:13 -04:00
Matthew Chen 1d2e5d218d [SSK] Create block offer when non-contacts send you a message. 
// FREEBIE
 2017-04-12 08:42:22 -04:00
Matthew Chen 55706e9bb9 Respond to CR. 
// FREEBIE
 2017-04-12 08:38:54 -04:00
Matthew Chen 878704cb12 Create block offer when non-contacts send you a message. 
// FREEBIE
 2017-04-12 08:38:54 -04:00