Commit Graph

1505 Commits

Author SHA1 Message Date
Michael Kirk 80ddc1a2c3 sync translations
// FREEBIE
2017-04-04 20:08:14 -04:00
Michael Kirk 127e7f7386 bump release target
// FREEBIE
2017-04-04 20:00:25 -04:00
Matthew Chen d001a5b519 Merge branch 'charlesmchen/blocking3' 2017-04-04 09:32:50 -04:00
Matthew Chen 5fa1a3630f Respond to CR.
// FREEBIE
2017-04-04 09:32:26 -04:00
Matthew Chen 8dadc3ba22 Don’t update contacts in the blacklist views.
// FREEBIE
2017-04-04 09:12:11 -04:00
Matthew Chen 6c1d46c4d7 Use contact names where possible in the block list view.
// FREEBIE
2017-04-04 09:12:11 -04:00
Matthew Chen a7296db1fe Add contacts list to “add blocked number” view.
// FREEBIE
2017-04-04 09:12:11 -04:00
Matthew Chen d84f052b28 Merge branch 'charlesmchen/blocking4' 2017-04-03 19:08:37 -04:00
Matthew Chen 5a234e34d9 Filter incoming and outgoing messages using the blacklist.
// FREEBIE
2017-04-03 18:05:05 -04:00
Matthew Chen 06ad8733b2 Merge branch 'charlesmchen/blocking2' 2017-04-03 17:50:42 -04:00
Matthew Chen 2e0c95c379 Respond to CR.
// FREEBIE
2017-04-03 17:49:06 -04:00
Matthew Chen db31454320 Respond to CR.
// FREEBIE
2017-04-03 17:49:06 -04:00
Matthew Chen 89e244ee0a Update to reflect changes to SSK.
// FREEBIE
2017-04-03 17:49:06 -04:00
Matthew Chen 8578390ee9 Clean up blocklist views.
// FREEBIE
2017-04-03 17:49:06 -04:00
Matthew Chen 922d48904f Refine BlockListViewController and AddToBlockListViewController.
// FREEBIE
2017-04-03 17:49:06 -04:00
Matthew Chen 271cc6f07e Sketch out BlockListViewController and AddToBlockListViewController.
// FREEBIE
2017-04-03 17:49:06 -04:00
Matthew Chen a155df161f Pull out OWSTableViewController.
// FREEBIE
2017-04-03 17:49:06 -04:00
Michael Kirk 176c1f8724 Merge branch 'hotfix/2.9.2' 2017-04-03 17:11:30 -04:00
Matthew Chen eb68746b6d Merge branch 'charlesmchen/singletonAssert' 2017-04-03 14:53:55 -04:00
Matthew Chen f604cfb553 Apply assert to ensure singletons are only created once & filter incoming messages using the blacklist.
// FREEBIE
2017-04-03 14:53:23 -04:00
Michael Kirk 1a25367b03 bump version
// FREEBIE
2017-04-02 21:31:27 -04:00
Michael Kirk 0a806f499e Fix crash when viewing changed safety numbers
Instantiate fingerprintVC programmatically since MVC was not built from
the storyboard and thus doesn't have it's storyboard-defined segues.

// FREEBIE
2017-04-02 20:59:39 -04:00
Matthew Chen 5ff454fd90 Fix double creation of NotificationsManager singleton.
// FREEBIE
2017-03-31 23:25:30 -04:00
Matthew Chen 8374ca149e Apply assert to ensure singletons are only created once.
// FREEBIE
2017-03-31 18:45:51 -04:00
Matthew Chen d00c892158 Apply assert to ensure singletons are only created once.
// FREEBIE
2017-03-31 18:36:30 -04:00
Michael Kirk afcb08c105 Merge branch 'mkirk/crashing-fingerprint' 2017-03-31 14:53:34 -04:00
Michael Kirk 9eb746a7a0 Fix crash when viewing changed safety numbers
Instantiate fingerprintVC programmatically since MVC was not built from
the storyboard and thus doesn't have it's storyboard-defined segues.

// FREEBIE
2017-03-31 14:53:28 -04:00
Michael Kirk e828001544 Merge branch 'mkirk/debug-stores' 2017-03-31 13:51:49 -04:00
Michael Kirk d2732751ad New debug action: print sessions
// FREEBIE
2017-03-31 13:51:38 -04:00
Matthew Chen febc04ca4f Merge branch 'charlesmchen/registrationViewCallingCode' 2017-03-31 13:25:29 -04:00
Matthew Chen 7306803ae7 Add explicit calling code state to registration view.
// FREEBIE
2017-03-31 13:25:03 -04:00
Michael Kirk 7153994929 [SSK] [SPK] Update SignalProtocolKit and SignalServiceKit
// FREEBIE
2017-03-31 12:42:59 -04:00
Matthew Chen 3ed4c48565 Merge branch 'charlesmchen/spacesInPaths' 2017-03-31 12:33:38 -04:00
Matthew Chen d12a582ee3 Rename source directories with a space in their name.
// FREEBIE
2017-03-31 11:58:52 -04:00
Michael Kirk 3d6c153ca3 Merge branch 'mkirk/enforce-singleton' 2017-03-31 10:42:15 -04:00
Michael Kirk 7f239c8040 [SSK] + Enforce singleton access for MessagesManager and MessageSender
// FREEBIE
2017-03-31 10:41:46 -04:00
Matthew Chen eaf7b65037 Merge branch 'charlesmchen/maxGifSize25mb' 2017-03-30 17:37:36 -04:00
Matthew Chen 7058a58d2e Bump maximum animated GIF file size to 25mb.
// FREEBIE
2017-03-30 16:30:13 -04:00
Michael Kirk 4c0242ee17 [spk] Update SignalProtocolKit
// FREEBIE
2017-03-30 13:36:05 -04:00
Matthew Chen 5138539d99 [SSK] Fix sharing of oversize text messages.
// FREEBIE
2017-03-30 11:20:45 -04:00
Michael Kirk 9af19645e7 Merge pull request #1913 from WhisperSystems/mkirk/remove-redphone
Remove some more RP related code
2017-03-30 11:06:19 -04:00
Michael Kirk 0b49037179 Remove some more RP related code
// FREEBIE
2017-03-30 11:00:28 -04:00
Matthew Chen 3765d28da9 Respond to CR.
// FREEBIE
2017-03-30 10:01:52 -04:00
Matthew Chen 2f40e3734e Merge branch 'charlesmchen/oversizeTextMessageView' 2017-03-30 09:51:59 -04:00
Matthew Chen 4649fcfd20 Add "oversize test message" view.
// FREEBIE
2017-03-30 09:51:49 -04:00
Matthew Chen 7ff98a0d82 Merge branch 'charlesmchen/countryCodeViewVsKeyboard' 2017-03-30 09:29:20 -04:00
Matthew Chen 5a2d4ce625 Hide keyboard when scrolling in country code view.
// FREEBIE
2017-03-30 09:29:06 -04:00
Matthew Chen 2e49b77f60 Merge branch 'charlesmchen/imageViewVsShare' 2017-03-30 09:26:13 -04:00
Matthew Chen a9f2382e85 Change alignment of image view’s share button.
// FREEBIE
2017-03-30 09:25:55 -04:00
Matthew Chen bc2e292a63 Add share button to image view.
// FREEBIE
2017-03-30 09:24:05 -04:00