Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

updating changes #1

Open
wants to merge 951 commits into
base: master
Choose a base branch
from
Open
This pull request is big! We’re only showing the most recent 250 commits.

Commits on Mar 16, 2014

  1. placeholder for db password

    corbett committed Mar 16, 2014
    Configuration menu
    Copy the full SHA
    327ca05 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b7e5b86 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    211fcba View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    1012fc7 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    f640afa View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2014

  1. Screenshot protection

    FredericJacobs committed Mar 17, 2014
    Configuration menu
    Copy the full SHA
    ebc2491 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    70396ac View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    2a38152 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    aa70a5b View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    9e7b4c6 View commit details
    Browse the repository at this point in the history
  6. deregister account option

    corbett committed Mar 17, 2014
    Configuration menu
    Copy the full SHA
    f6b6bdd View commit details
    Browse the repository at this point in the history
  7. deregister account option

    corbett committed Mar 17, 2014
    Configuration menu
    Copy the full SHA
    3fd658d View commit details
    Browse the repository at this point in the history
  8. Merge branch 'deregister'

    corbett committed Mar 17, 2014
    Configuration menu
    Copy the full SHA
    5b0d5d0 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    8d493df View commit details
    Browse the repository at this point in the history
  10. New API + Key versions

    FredericJacobs committed Mar 17, 2014
    Configuration menu
    Copy the full SHA
    e457f71 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    6a5b6c4 View commit details
    Browse the repository at this point in the history
  12. tests

    corbett committed Mar 17, 2014
    Configuration menu
    Copy the full SHA
    facba84 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    cd5a635 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    e1b41bc View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    d811894 View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2014

  1. Configuration menu
    Copy the full SHA
    70ac5bd View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    9353e9f View commit details
    Browse the repository at this point in the history
  3. tests

    corbett committed Mar 18, 2014
    Configuration menu
    Copy the full SHA
    c85cfce View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    e5e6c92 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    95b4d48 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    9d179d2 View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2014

  1. testing protocol buffers

    corbett committed Mar 19, 2014
    Configuration menu
    Copy the full SHA
    0180b55 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    a79ebbc View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    45517bd View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    400b310 View commit details
    Browse the repository at this point in the history
  5. just avatars for groups left

    corbett committed Mar 19, 2014
    Configuration menu
    Copy the full SHA
    948969e View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    9579cbf View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2014

  1. Configuration menu
    Copy the full SHA
    4119a91 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2014

  1. Configuration menu
    Copy the full SHA
    c4e2252 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    54f6fbc View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2014

  1. version should be 1

    FredericJacobs committed Mar 22, 2014
    Configuration menu
    Copy the full SHA
    0df438d View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2014

  1. Quick fix for #130

    FredericJacobs committed Mar 23, 2014
    Configuration menu
    Copy the full SHA
    4a0c25f View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    10ab4d2 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    5c27f45 View commit details
    Browse the repository at this point in the history
  4. tests succeeded

    corbett committed Mar 23, 2014
    Configuration menu
    Copy the full SHA
    90d4281 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    5db3138 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    be166b7 View commit details
    Browse the repository at this point in the history
  7. refactoring, more of it

    corbett committed Mar 23, 2014
    Configuration menu
    Copy the full SHA
    0432359 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    829c4e7 View commit details
    Browse the repository at this point in the history
  9. moving methods around

    corbett committed Mar 23, 2014
    Configuration menu
    Copy the full SHA
    978156b View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    d786407 View commit details
    Browse the repository at this point in the history
  11. merging Fred's deletes

    corbett committed Mar 23, 2014
    Configuration menu
    Copy the full SHA
    e5e0c25 View commit details
    Browse the repository at this point in the history
  12. fixing bug in send

    corbett committed Mar 23, 2014
    Configuration menu
    Copy the full SHA
    1a99542 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    2b9a3da View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    f8d6a7f View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    516e746 View commit details
    Browse the repository at this point in the history
  16. Fixes #131

    FredericJacobs committed Mar 23, 2014
    Configuration menu
    Copy the full SHA
    785c956 View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2014

  1. Configuration menu
    Copy the full SHA
    d0eda9f View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4e3abd6 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    464c716 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    325dbc1 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    785b744 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    4a51ba1 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    6a34726 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    22ee5ae View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    9c00a97 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    cabe5a7 View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2014

  1. RKs matching on sending and receiving device for their mirrored 3ECDH…

    … RKs and sending/receiving RKs. so like things should work soon
    corbett committed Mar 25, 2014
    Configuration menu
    Copy the full SHA
    677504c View commit details
    Browse the repository at this point in the history
  2. first hmac matching

    corbett committed Mar 25, 2014
    Configuration menu
    Copy the full SHA
    0c18654 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    703dc5b View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    4002432 View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2014

  1. Configuration menu
    Copy the full SHA
    7a86c0d View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    6e7c32a View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2014

  1. typo

    corbett committed Mar 29, 2014
    Configuration menu
    Copy the full SHA
    7ff4120 View commit details
    Browse the repository at this point in the history
  2. merged Fred's fixes

    corbett committed Mar 29, 2014
    Configuration menu
    Copy the full SHA
    07039f9 View commit details
    Browse the repository at this point in the history
  3. basic verification UI

    corbett committed Mar 29, 2014
    Configuration menu
    Copy the full SHA
    052cb45 View commit details
    Browse the repository at this point in the history
  4. opens up verification

    corbett committed Mar 29, 2014
    Configuration menu
    Copy the full SHA
    0e45664 View commit details
    Browse the repository at this point in the history
  5. formats keys correctly

    corbett committed Mar 29, 2014
    Configuration menu
    Copy the full SHA
    d859194 View commit details
    Browse the repository at this point in the history
  6. displaying my identity key

    corbett committed Mar 29, 2014
    Configuration menu
    Copy the full SHA
    e16b094 View commit details
    Browse the repository at this point in the history
  7. displaying their identity key

    corbett committed Mar 29, 2014
    Configuration menu
    Copy the full SHA
    49cd8bd View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    7122fbb View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2014

  1. Configuration menu
    Copy the full SHA
    3b5e496 View commit details
    Browse the repository at this point in the history
  2. scanner in place

    corbett committed Mar 30, 2014
    Configuration menu
    Copy the full SHA
    a11c1ea View commit details
    Browse the repository at this point in the history
  3. demo of scan

    corbett committed Mar 30, 2014
    Configuration menu
    Copy the full SHA
    4471ff9 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    c38e52d View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    01d80c5 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    b9ee25d View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2014

  1. Configuration menu
    Copy the full SHA
    bccfe1d View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2014

  1. merger Fred's work

    corbett committed Apr 1, 2014
    Configuration menu
    Copy the full SHA
    c01caf7 View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2014

  1. idkey stuff

    corbett committed Apr 5, 2014
    Configuration menu
    Copy the full SHA
    a92fc24 View commit details
    Browse the repository at this point in the history
  2. merged

    corbett committed Apr 5, 2014
    Configuration menu
    Copy the full SHA
    381eb9c View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2014

  1. basic ipad

    corbett committed Apr 6, 2014
    Configuration menu
    Copy the full SHA
    7302817 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    6c2ef0d View commit details
    Browse the repository at this point in the history
  3. refactored tests

    corbett committed Apr 6, 2014
    Configuration menu
    Copy the full SHA
    68f32a2 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    aa9157a View commit details
    Browse the repository at this point in the history
  5. tests passing

    corbett committed Apr 6, 2014
    Configuration menu
    Copy the full SHA
    da96c2d View commit details
    Browse the repository at this point in the history
  6. AESCBC encryption/decryption of TS Attachments uses HMACSHA256 to mac…

    …, while encryption/decryption of apple push message content uses HMACSHA1. refactor to make this difference more obvious to programmer, and passing tests
    corbett committed Apr 6, 2014
    Configuration menu
    Copy the full SHA
    83364d1 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    750b0c5 View commit details
    Browse the repository at this point in the history
  8. now sending command to refresh database on receipt. Droid-> first sen…

    …d works well, but not displaying even with refreshing functioning correctly. must be DB issue.
    corbett committed Apr 6, 2014
    Configuration menu
    Copy the full SHA
    e0e0a9e View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    dd68349 View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2014

  1. Configuration menu
    Copy the full SHA
    ed46c05 View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2014

  1. Configuration menu
    Copy the full SHA
    d9d4ba4 View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2014

  1. Configuration menu
    Copy the full SHA
    aaade2c View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    d363c17 View commit details
    Browse the repository at this point in the history
  3. finished writing tests

    corbett committed Apr 12, 2014
    Configuration menu
    Copy the full SHA
    5618364 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    c62a9d6 View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2014

  1. Fix Locale bug where appears with garbage values

    dtsbourg committed Apr 15, 2014
    Configuration menu
    Copy the full SHA
    7cbd1f4 View commit details
    Browse the repository at this point in the history
  2. Verification View Controller UI

    dtsbourg committed Apr 15, 2014
    Configuration menu
    Copy the full SHA
    eb05792 View commit details
    Browse the repository at this point in the history
  3. Redesign signup view

    dtsbourg committed Apr 15, 2014
    Configuration menu
    Copy the full SHA
    f21a99c View commit details
    Browse the repository at this point in the history
  4. Remove cancel button

    dtsbourg committed Apr 15, 2014
    Configuration menu
    Copy the full SHA
    cb9e344 View commit details
    Browse the repository at this point in the history
  5. reinsert navbar for countryVC

    dtsbourg committed Apr 15, 2014
    Configuration menu
    Copy the full SHA
    8d11cc2 View commit details
    Browse the repository at this point in the history
  6. remove navbar for verif

    dtsbourg committed Apr 15, 2014
    Configuration menu
    Copy the full SHA
    79b5ae1 View commit details
    Browse the repository at this point in the history
  7. Color category

    dtsbourg committed Apr 15, 2014
    Configuration menu
    Copy the full SHA
    ef6bfe2 View commit details
    Browse the repository at this point in the history
  8. layout for iphone 4 VerifVC

    dtsbourg committed Apr 15, 2014
    Configuration menu
    Copy the full SHA
    0903452 View commit details
    Browse the repository at this point in the history
  9. MONEYMONEY

    dtsbourg committed Apr 15, 2014
    Configuration menu
    Copy the full SHA
    4c546ee View commit details
    Browse the repository at this point in the history
  10. disable button if number invalid

    dtsbourg committed Apr 15, 2014
    Configuration menu
    Copy the full SHA
    8702258 View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2014

  1. Configuration menu
    Copy the full SHA
    0bfd24c View commit details
    Browse the repository at this point in the history
  2. Removing duplicates

    Country code lookup based on phone number prefix was already implemented
    FredericJacobs committed Apr 16, 2014
    Configuration menu
    Copy the full SHA
    5ae7806 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    62fece7 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    61d2b8f View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    2616f5d View commit details
    Browse the repository at this point in the history
  6. Update CONTRIBUTING.md

    corbett committed Apr 16, 2014
    Configuration menu
    Copy the full SHA
    60260f5 View commit details
    Browse the repository at this point in the history
  7. UI for pw strength

    dtsbourg committed Apr 16, 2014
    Configuration menu
    Copy the full SHA
    7504e55 View commit details
    Browse the repository at this point in the history
  8. clear code string after verification

    dtsbourg committed Apr 16, 2014
    Configuration menu
    Copy the full SHA
    ea9d0c6 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    4e48e25 View commit details
    Browse the repository at this point in the history
  10. fixes on pw view

    dtsbourg committed Apr 16, 2014
    Configuration menu
    Copy the full SHA
    c70d26f View commit details
    Browse the repository at this point in the history
  11. Shake if password incorrect + redesign pw view

    dtsbourg committed Apr 16, 2014
    Configuration menu
    Copy the full SHA
    e3714ea View commit details
    Browse the repository at this point in the history
  12. Redesign group setup VC

    dtsbourg committed Apr 16, 2014
    Configuration menu
    Copy the full SHA
    89a5b9f View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2014

  1. Fix some warnings

    dtsbourg committed Apr 17, 2014
    Configuration menu
    Copy the full SHA
    23e1274 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b7024d6 View commit details
    Browse the repository at this point in the history
  3. MONEYMONEY

    dtsbourg committed Apr 17, 2014
    Configuration menu
    Copy the full SHA
    25918b9 View commit details
    Browse the repository at this point in the history
  4. fixes

    dtsbourg committed Apr 17, 2014
    Configuration menu
    Copy the full SHA
    df9f4e3 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    31d8f42 View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2014

  1. Merge pull request #163 from WhisperSystems/contributors

    shoutout to contributors with substantial contributions
    FredericJacobs committed Apr 18, 2014
    Configuration menu
    Copy the full SHA
    b713289 View commit details
    Browse the repository at this point in the history
  2. Update CONTRIBUTING.md

    FredericJacobs committed Apr 18, 2014
    Configuration menu
    Copy the full SHA
    8aa5757 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    f3a6cb6 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    859b94d View commit details
    Browse the repository at this point in the history
  5. Remove notification observers.

    Claudiu-Vlad Ursache committed Apr 18, 2014
    Configuration menu
    Copy the full SHA
    c67789b View commit details
    Browse the repository at this point in the history
  6. Hide navigation bar in viewWillAppear instead of viewDidAppear.

    Claudiu-Vlad Ursache committed Apr 18, 2014
    Configuration menu
    Copy the full SHA
    f4cd600 View commit details
    Browse the repository at this point in the history
  7. Make code more readable with early return.

    Claudiu-Vlad Ursache committed Apr 18, 2014
    Configuration menu
    Copy the full SHA
    2a05ed0 View commit details
    Browse the repository at this point in the history
  8. Move UIColor category to categories folder.

    Claudiu-Vlad Ursache committed Apr 18, 2014
    Configuration menu
    Copy the full SHA
    9205205 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    9ebbf68 View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2014

  1. local

    corbett committed Apr 19, 2014
    Configuration menu
    Copy the full SHA
    a4937c2 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    fea0a26 View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2014

  1. Configuration menu
    Copy the full SHA
    4fcf24e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    223c139 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    54f72e3 View commit details
    Browse the repository at this point in the history
  4. Storing contact on receipt

    This is important because we iterate over TSContacts when displaying
    the conversation view controller.
    FredericJacobs committed Apr 20, 2014
    Configuration menu
    Copy the full SHA
    1e2300c View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    45b7b63 View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2014

  1. Starting fix for #165

    FredericJacobs committed Apr 21, 2014
    Configuration menu
    Copy the full SHA
    b595c14 View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2014

  1. improvements for password view

    - password strength was one character behind input
    - reset password strength when second password does not match
    - enforce reasonable password strength
    cbs committed Apr 24, 2014
    Configuration menu
    Copy the full SHA
    1128a04 View commit details
    Browse the repository at this point in the history
  2. improvements for password handling

    - do not enforce password policy, only requires password to be existent (i.e. >0)
    - added possibility to skip password protection
    - automatically unlocks database if no password is set
    cbs committed Apr 24, 2014
    Configuration menu
    Copy the full SHA
    b0fb75e View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2014

  1. improvements and enhancements for setting and entering passwords

    - setting a password is now optional and informs user about iOS Data Protection
    - do not enforce a password policy besides length > 0
    - do not display entropy to user
    - providing a switch to choose between PIN with numeric keyboard or alphanumeric passphrase
    - store setting in UserDefaults to skip password entry (no password) or display numeric keyboard (PIN)
    cbs committed Apr 25, 2014
    Configuration menu
    Copy the full SHA
    412dd0e View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2014

  1. fixed double send issue, by changing counterFromNumber function to ma…

    …tch the IV calculated by droid for CTR mode encryption
    corbett committed Apr 26, 2014
    Configuration menu
    Copy the full SHA
    4af2edd View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    92f4a1f View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    f55f611 View commit details
    Browse the repository at this point in the history
  4. just a bit of code cleanup

    corbett committed Apr 26, 2014
    Configuration menu
    Copy the full SHA
    cf24764 View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2014

  1. Configuration menu
    Copy the full SHA
    634fcca View commit details
    Browse the repository at this point in the history

Commits on May 1, 2014

  1. Fix for #173

    FredericJacobs committed May 1, 2014
    Configuration menu
    Copy the full SHA
    50c335a View commit details
    Browse the repository at this point in the history

Commits on May 3, 2014

  1. Closes #174

    FredericJacobs committed May 3, 2014
    Configuration menu
    Copy the full SHA
    b4cc128 View commit details
    Browse the repository at this point in the history

Commits on May 11, 2014

  1. story

    corbett committed May 11, 2014
    Configuration menu
    Copy the full SHA
    704f435 View commit details
    Browse the repository at this point in the history
  2. merge

    corbett committed May 11, 2014
    Configuration menu
    Copy the full SHA
    0c9cc55 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    55f685e View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    62d9a70 View commit details
    Browse the repository at this point in the history
  5. cleanup

    corbett committed May 11, 2014
    Configuration menu
    Copy the full SHA
    5955643 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    e5ab668 View commit details
    Browse the repository at this point in the history

Commits on May 12, 2014

  1. Configuration menu
    Copy the full SHA
    f198039 View commit details
    Browse the repository at this point in the history

Commits on May 15, 2014

  1. Configuration menu
    Copy the full SHA
    cad9567 View commit details
    Browse the repository at this point in the history
  2. Fixes memory leak

    Jaxan committed May 15, 2014
    Configuration menu
    Copy the full SHA
    64d769d View commit details
    Browse the repository at this point in the history
  3. Fixes some format strings

    Jaxan committed May 15, 2014
    Configuration menu
    Copy the full SHA
    18aebaa View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    8aa5e23 View commit details
    Browse the repository at this point in the history
  5. Merge pull request #180 from Jaxan/analyzer-issues

    Analyzer issues
    FredericJacobs committed May 15, 2014
    Configuration menu
    Copy the full SHA
    974ef06 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2014

  1. Configuration menu
    Copy the full SHA
    64dc27b View commit details
    Browse the repository at this point in the history

Commits on May 18, 2014

  1. Configuration menu
    Copy the full SHA
    5e20a39 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    91cd418 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    c3fd854 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    66efccb View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    61631d1 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    94f6aae View commit details
    Browse the repository at this point in the history
  7. Update CONTRIBUTING.md

    corbett committed May 18, 2014
    Configuration menu
    Copy the full SHA
    02e7fae View commit details
    Browse the repository at this point in the history
  8. Update CONTRIBUTING.md

    corbett committed May 18, 2014
    Configuration menu
    Copy the full SHA
    8fbf732 View commit details
    Browse the repository at this point in the history
  9. Update CONTRIBUTING.md

    corbett committed May 18, 2014
    Configuration menu
    Copy the full SHA
    81e9c56 View commit details
    Browse the repository at this point in the history
  10. Update CONTRIBUTING.md

    corbett committed May 18, 2014
    Configuration menu
    Copy the full SHA
    978942b View commit details
    Browse the repository at this point in the history
  11. Update CONTRIBUTING.md

    corbett committed May 18, 2014
    Configuration menu
    Copy the full SHA
    2b6567d View commit details
    Browse the repository at this point in the history

Commits on May 19, 2014

  1. Configuration menu
    Copy the full SHA
    3e3046b View commit details
    Browse the repository at this point in the history
  2. Update CONTRIBUTING.md

    corbett committed May 19, 2014
    Configuration menu
    Copy the full SHA
    48ec8a0 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    faa97c4 View commit details
    Browse the repository at this point in the history
  4. Revert "Disable WebSockets on master"

    This reverts commit faa97c4.
    FredericJacobs committed May 19, 2014
    Configuration menu
    Copy the full SHA
    32bcc0e View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    e9e8c66 View commit details
    Browse the repository at this point in the history

Commits on May 24, 2014

  1. Configuration menu
    Copy the full SHA
    52d64ab View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    fe038c2 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    84a1049 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    68df450 View commit details
    Browse the repository at this point in the history
  5. after some work with unwinding segues, now works on Alice's side (Bob…

    … verifying). But Bob's keys don't match between Alice and Bob. Probably a version byte issue, will debug
    corbett committed May 24, 2014
    Configuration menu
    Copy the full SHA
    2fbcd02 View commit details
    Browse the repository at this point in the history

Commits on May 25, 2014

  1. Configuration menu
    Copy the full SHA
    ce525b2 View commit details
    Browse the repository at this point in the history
  2. git push origin masterMerge branch 'cbs-master'

    password pin ability.
    corbett committed May 25, 2014
    Configuration menu
    Copy the full SHA
    7adcab0 View commit details
    Browse the repository at this point in the history
  3. merging project file

    corbett committed May 25, 2014
    Configuration menu
    Copy the full SHA
    669b8ef View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    58cc9f8 View commit details
    Browse the repository at this point in the history
  5. Merge branch 'master' of https://github.com/dcestari/TextSecure-iOS i…

    …nto dcestari-master
    corbett committed May 25, 2014
    Configuration menu
    Copy the full SHA
    dd31afa View commit details
    Browse the repository at this point in the history
  6. git push origin masterMerge branch 'dcestari-master'

    Travis CI support
    corbett committed May 25, 2014
    Configuration menu
    Copy the full SHA
    6824f70 View commit details
    Browse the repository at this point in the history

Commits on May 26, 2014

  1. Configuration menu
    Copy the full SHA
    76df0bf View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    a50d992 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    3e3d2f2 View commit details
    Browse the repository at this point in the history

Commits on May 29, 2014

  1. Merge pull request #186 from cbs/PasswordReset

    Password reset contribution
    FredericJacobs committed May 29, 2014
    Configuration menu
    Copy the full SHA
    bbb4132 View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2014

  1. Configuration menu
    Copy the full SHA
    4853122 View commit details
    Browse the repository at this point in the history
  2. redo group creation UI

    corbett committed Jun 1, 2014
    Configuration menu
    Copy the full SHA
    2ce82bd View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    bbd323f View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    d888d9b View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    88d71ca View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2014

  1. group stuff

    corbett committed Jun 21, 2014
    Configuration menu
    Copy the full SHA
    da81ec0 View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2014

  1. PublicKeyPinning

    FredericJacobs committed Jul 14, 2014
    Configuration menu
    Copy the full SHA
    77b7016 View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2014

  1. Configuration menu
    Copy the full SHA
    1690520 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b067309 View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2014

  1. WebSocket integration

    FredericJacobs committed Jul 21, 2014
    Configuration menu
    Copy the full SHA
    4fabea5 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'WebSockets'

    Conflicts:
    	TextSecureiOS.xcodeproj/project.pbxproj
    	TextSecureiOS/MessagesManager/TSMessagesManager.mm
    FredericJacobs committed Jul 21, 2014
    Configuration menu
    Copy the full SHA
    63ff33c View commit details
    Browse the repository at this point in the history
  3. conflict resolved

    corbett committed Jul 21, 2014
    Configuration menu
    Copy the full SHA
    0e03017 View commit details
    Browse the repository at this point in the history
  4. merge

    corbett committed Jul 21, 2014
    Configuration menu
    Copy the full SHA
    d19937c View commit details
    Browse the repository at this point in the history
  5. Cleanup

    FredericJacobs committed Jul 21, 2014
    Configuration menu
    Copy the full SHA
    2c01c8e View commit details
    Browse the repository at this point in the history
  6. group work

    corbett committed Jul 21, 2014
    Configuration menu
    Copy the full SHA
    7bcff4f View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    3b8c791 View commit details
    Browse the repository at this point in the history
  8. merged old group work

    corbett committed Jul 21, 2014
    Configuration menu
    Copy the full SHA
    e73a94c View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2014

  1. Configuration menu
    Copy the full SHA
    6cb4823 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    cfab74a View commit details
    Browse the repository at this point in the history
  3. group database tested

    corbett committed Jul 22, 2014
    Configuration menu
    Copy the full SHA
    4c2072d View commit details
    Browse the repository at this point in the history
  4. iterating toward groups

    corbett committed Jul 22, 2014
    Configuration menu
    Copy the full SHA
    9bc7ca7 View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2014

  1. closer to groups

    corbett committed Jul 23, 2014
    Configuration menu
    Copy the full SHA
    7c98e90 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    083fd01 View commit details
    Browse the repository at this point in the history
  3. now android can reply

    corbett committed Jul 23, 2014
    Configuration menu
    Copy the full SHA
    68dbac9 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    6f35331 View commit details
    Browse the repository at this point in the history
  5. group volleys

    corbett committed Jul 23, 2014
    Configuration menu
    Copy the full SHA
    60a4dd6 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    befa382 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    5a873c6 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    38a7ad0 View commit details
    Browse the repository at this point in the history
  9. now puts conversation with most recent message to top of conversation…

    … view. also, displays preview of most recent message instead of first message.
    corbett committed Jul 23, 2014
    Configuration menu
    Copy the full SHA
    433ef9a View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2014

  1. added support for displaying meta messages (group joins/quits/creatio…

    …n title updates) in group
    corbett committed Jul 24, 2014
    Configuration menu
    Copy the full SHA
    85d560e View commit details
    Browse the repository at this point in the history
  2. broadcast groups

    corbett committed Jul 24, 2014
    Configuration menu
    Copy the full SHA
    0021007 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    3cdb54e View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    aba2b08 View commit details
    Browse the repository at this point in the history
  5. working on broadcast groups

    corbett committed Jul 24, 2014
    Configuration menu
    Copy the full SHA
    1fcaa49 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    593447d View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2014

  1. Configuration menu
    Copy the full SHA
    382559a View commit details
    Browse the repository at this point in the history
  2. more broadcast work

    corbett committed Jul 25, 2014
    Configuration menu
    Copy the full SHA
    2435fbc View commit details
    Browse the repository at this point in the history
  3. removing broadcast groups from UI to be consistent with android for n…

    …ow. can later add in.
    corbett committed Jul 25, 2014
    Configuration menu
    Copy the full SHA
    08b58f1 View commit details
    Browse the repository at this point in the history
  4. working on protobuf bug

    corbett committed Jul 25, 2014
    Configuration menu
    Copy the full SHA
    7ae8899 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    061e7e8 View commit details
    Browse the repository at this point in the history
  6. Fixing double receive

    FredericJacobs committed Jul 25, 2014
    Configuration menu
    Copy the full SHA
    c3c2f69 View commit details
    Browse the repository at this point in the history
  7. Disabling temporary database

    Messages are now only processed of the WebSocket when the database is
    unlocked.
    FredericJacobs committed Jul 25, 2014
    Configuration menu
    Copy the full SHA
    b26a71c View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    d2b8d36 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2014

  1. Revert "group work"

    This reverts commit 7bcff4f. This revert was necessary as some code from an old branch made it into this code, and a simple merge sucks.
    
    Conflicts:
    	TextSecureiOS/MessagesManager/TSMessagesManager.mm
    	TextSecureiOS/ViewControllers/Conversations/TSMessageViewController.m
    corbett committed Jul 26, 2014
    Configuration menu
    Copy the full SHA
    3a617db View commit details
    Browse the repository at this point in the history
  2. one method misnamed

    corbett committed Jul 26, 2014
    Configuration menu
    Copy the full SHA
    a5c853f View commit details
    Browse the repository at this point in the history
  3. Merging groups

    FredericJacobs committed Jul 26, 2014
    Configuration menu
    Copy the full SHA
    033a61d View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    45a6032 View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2014

  1. Update README.md

    FredericJacobs committed Aug 11, 2014
    Configuration menu
    Copy the full SHA
    82595a8 View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2014

  1. Fixed UI bug in set master password step of sign up stage

    The keyboard wasn't hiding when pressing return, this was causing issues
    on smaller screens, e.g. iPhone 4S and earlier. This has been fixed.
    gavia committed Sep 24, 2014
    Configuration menu
    Copy the full SHA
    a8d99c2 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #208 from gavia/master

    Fixed UI bug in set master password step of sign up stage
    FredericJacobs committed Sep 24, 2014
    Configuration menu
    Copy the full SHA
    7a3e6ca View commit details
    Browse the repository at this point in the history