Commit Graph

8398 Commits (7e5d9480b1b33638c3aaf13236019afe8ee56b15)
 

Author SHA1 Message Date
Michael Kirk e77b798aa7 Merge branch 'mkirk/webrtc-m68' 6 years ago
Michael Kirk 19ece45c8d Update WebRTC to M68 6 years ago
Michael Kirk d5ebd5a60f UBSan fixup 6 years ago
Matthew Chen 73012d4699 Merge branch 'jsq/xcode-file-templates' 6 years ago
Jesse Squires 868a35ce4c Add IDE template macro for consistent headers
Xcode has undesirable default header comments, and now you can customize them.
This adds an `IDETemplateMacros.plist` file to the `xcworkspace` so that new files created
in the workspace have the same, consistent default header comments automatically added:

```
//
//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
//
```

This will prevent contributors from either (1) committing Xcode's default, or
(2) having to manually copy-pasta the standard comment headers for every new file added.

[See here for more details](https://oleb.net/blog/2017/07/xcode-9-text-macros/)
6 years ago
Michael Kirk 3126db4316 Merge branch 'jsq/building-update' 6 years ago
Jesse Squires 196b2fb1fa
[Build] Update clone instructions
Per discussion [here](https://community.signalusers.org/t/not-able-to-build-in-xcode-9-3-9-4/3498/12).

Using `--recurse-submodules` will init and update all submodules, so you can do everything at once. I find this a bit nicer.
(Also, it seems like it might be more reliable with GitHub forks?)

I realize `make dependencies` runs `git submodule update --init`. It will just be a no-op if you clone this way.
6 years ago
Michael Kirk 2298d50d12 Merge branch 'mkirk/cds-retry' 6 years ago
Michael Kirk f002f89f2c Update retryable
Per Jeff, don't handle CDS requests yet.
6 years ago
Michael Kirk 0598733fc6 Merge branch 'mkirk/cds-feedback-2' 6 years ago
Michael Kirk 3507367a90 Don't report feedback for HTTP errors.
// FREEBIE
6 years ago
Michael Kirk 11db859e6b adapt to changes since RI 6 years ago
Michael Kirk 6e1c1a681b Merge tag '2.28.0.12' 6 years ago
Michael Kirk 6518aa24a3 "Bump build to 2.28.0.12." 6 years ago
Michael Kirk d04bb86258 sync translations 6 years ago
Matthew Chen 48fb652d83 Merge branch 'charlesmchen/unknownObjectVsNPE' 6 years ago
Matthew Chen 76f0a6b8b4 Merge branch 'charlesmchen/unknownObjectVsNPE' 6 years ago
Matthew Chen 5530b8d701 Respond to CR. 6 years ago
Matthew Chen 7a898f5e99 Fix NPE using mock for unknown database objects. 6 years ago
Matthew Chen 2c973782c4 Fix NPE using mock for unknown database objects. 6 years ago
Matthew Chen 723691400f Fix NPE using mock for unknown database objects. 6 years ago
Matthew Chen 708ef6f7dd Fix NPE using mock for unknown database objects. 6 years ago
Matthew Chen 060e0fd062 Fix NPE using mock for unknown database objects. 6 years ago
Matthew Chen 79dcbf8a79 Update cocoapods. 6 years ago
Matthew Chen 28ad8d065b Revert Pods update. 6 years ago
Michael Kirk fd9125ce1a Merge branch 'mkirk/remove-swipe-for-info' into release/2.28.0 6 years ago
Michael Kirk 2d4eb7d057 remove interactive 'swipe for info' 6 years ago
Michael Kirk 57c4d97093 Merge branch 'mkirk/speed-up-message-action-presentation' into release/2.28.0 6 years ago
Michael Kirk aba358e894 faster message actions presentation 6 years ago
Michael Kirk f31c6a22f0 Merge branch 'mkirk/cds-feedback' 6 years ago
Michael Kirk 558b3bd245 Report contact discovery feedback 6 years ago
Michael Kirk 0721000251 Merge branch 'mkirk/contact-discovery' 6 years ago
Michael Kirk 8c5d6ba9bb Respond to code review. 6 years ago
Michael Kirk b42f528713 Integrate with new contact discovery endpoint
Also:
* use system cookie parsing
* add AESGCM additional authenticated data parameter

// FREEBIE
6 years ago
Michael Kirk a611625691 fixup lookup threading 6 years ago
Michael Kirk dedfea78da callback handlers for remote attestation 6 years ago
Michael Kirk 58e2e13836 Merge branch 'mkirk/fixup-navbar' into release/2.28.0 6 years ago
Michael Kirk 1d4ead080b fix color behind navbar 6 years ago
Matthew Chen e27e45e661 Merge branch 'charlesmchen/socketVsNewLinkedDevice' 6 years ago
Matthew Chen bebb8ecfd1 Cycle the socket after linking a new device. 6 years ago
Matthew Chen c92f843530 Merge branch 'charlesmchen/byteParser' 6 years ago
Matthew Chen b197e4776e Respond to CR. 6 years ago
Matthew Chen 82ebb6e764 Update cocoapods. 6 years ago
Matthew Chen 73eb0778c0 Add unit tests around byte parser. 6 years ago
Matthew Chen 28f021ba55 Pull byte parser out into separate source file. 6 years ago
Matthew Chen 2fd996a24a Merge branch 'charlesmchen/internJSQ' 6 years ago
Matthew Chen 10636957a2 Intern JSQMessagesViewController. 6 years ago
Matthew Chen e0db33e638 Intern JSQMessagesViewController. 6 years ago
Matthew Chen 25a98554b7 Intern JSQMessagesViewController. 6 years ago
Matthew Chen 906d0b01a4 Fix build break. 6 years ago