Skip to content
This repository has been archived by the owner on Feb 17, 2023. It is now read-only.

V4.0 wire #1036

Open
wants to merge 88 commits into
base: master
Choose a base branch
from
Open

V4.0 wire #1036

wants to merge 88 commits into from

Commits on Jul 11, 2016

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

Commits on Jul 12, 2016

  1. Configuration menu
    Copy the full SHA
    f96fdd8 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    8888e34 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    eac57a4 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    17f085f View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    5ec783b View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    ecb8e10 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    244d097 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    526926b View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    657ce7b View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    ed22afb View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    59fea58 View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2016

  1. Merge branch 'master' into core/crypto

    # Conflicts:
    #	actor-sdk/sdk-core-android/android-sdk/src/main/java/im/actor/sdk/controllers/conversation/messages/MessagesFragment.java
    ex3ndr committed Jul 14, 2016
    Configuration menu
    Copy the full SHA
    b7211c3 View commit details
    Browse the repository at this point in the history
  2. feat(core): Update encryption scheme to reduce unnecessary duplicatio…

    …n, implementing multi-peer message sending
    ex3ndr committed Jul 14, 2016
    Configuration menu
    Copy the full SHA
    b3fe084 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    4f76b1d View commit details
    Browse the repository at this point in the history
  4. fix(core): Restore keys validation in chain decryption, fix key filtr…

    …ation in EncryptedUserActor, fallback of processing of encrypted updates
    ex3ndr committed Jul 14, 2016
    Configuration menu
    Copy the full SHA
    be30ad4 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    1044341 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    c96b897 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    687bb12 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    a880f86 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    713b44f View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    48a5113 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    f704831 View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2016

  1. Configuration menu
    Copy the full SHA
    1c62f16 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    a112449 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    f3c9ad6 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    059e48e View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    e4aa8ad View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    ab5dd51 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    14298cd View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    8eb48a7 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    9d3332b View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    5782709 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    e576151 View commit details
    Browse the repository at this point in the history
  12. feat(core): Update encryption scheme to reduce unnecessary duplicatio…

    …n, implementing multi-peer message sending
    ex3ndr committed Jul 29, 2016
    Configuration menu
    Copy the full SHA
    3a5a6f5 View commit details
    Browse the repository at this point in the history
  13. fix(core): Restore keys validation in chain decryption, fix key filtr…

    …ation in EncryptedUserActor, fallback of processing of encrypted updates
    ex3ndr committed Jul 29, 2016
    Configuration menu
    Copy the full SHA
    af2362f View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    923f85b View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    1e58a78 View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    86ebed4 View commit details
    Browse the repository at this point in the history
  17. Configuration menu
    Copy the full SHA
    41094b5 View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    f5adf6b View commit details
    Browse the repository at this point in the history
  19. Configuration menu
    Copy the full SHA
    3c72e20 View commit details
    Browse the repository at this point in the history
  20. Configuration menu
    Copy the full SHA
    b0e0c6e View commit details
    Browse the repository at this point in the history
  21. Merge branch 'core/crypto' of https://github.com/actorapp/actor-platform

     into core/crypto
    
    # Conflicts:
    #	actor-sdk/sdk-core-android/android-sdk/src/main/java/im/actor/sdk/controllers/conversation/ChatActivity.java
    #	actor-sdk/sdk-core/core/core-shared/src/main/java/im/actor/core/modules/messaging/dialogs/DialogsActor.java
    ex3ndr committed Jul 29, 2016
    Configuration menu
    Copy the full SHA
    305bf54 View commit details
    Browse the repository at this point in the history
  22. fix(core): Missing changes

    ex3ndr committed Jul 29, 2016
    Configuration menu
    Copy the full SHA
    66f4708 View commit details
    Browse the repository at this point in the history
  23. Configuration menu
    Copy the full SHA
    4eb53c9 View commit details
    Browse the repository at this point in the history
  24. Configuration menu
    Copy the full SHA
    d09c866 View commit details
    Browse the repository at this point in the history
  25. Configuration menu
    Copy the full SHA
    5943256 View commit details
    Browse the repository at this point in the history
  26. Configuration menu
    Copy the full SHA
    817c77f View commit details
    Browse the repository at this point in the history
  27. Configuration menu
    Copy the full SHA
    2344f57 View commit details
    Browse the repository at this point in the history
  28. Configuration menu
    Copy the full SHA
    919df73 View commit details
    Browse the repository at this point in the history
  29. Configuration menu
    Copy the full SHA
    5093dd7 View commit details
    Browse the repository at this point in the history
  30. Configuration menu
    Copy the full SHA
    43e8f9c View commit details
    Browse the repository at this point in the history
  31. Configuration menu
    Copy the full SHA
    1b31b13 View commit details
    Browse the repository at this point in the history
  32. Configuration menu
    Copy the full SHA
    b991e63 View commit details
    Browse the repository at this point in the history
  33. Configuration menu
    Copy the full SHA
    7e06844 View commit details
    Browse the repository at this point in the history
  34. Configuration menu
    Copy the full SHA
    867e8c7 View commit details
    Browse the repository at this point in the history
  35. Configuration menu
    Copy the full SHA
    60e282c View commit details
    Browse the repository at this point in the history
  36. Configuration menu
    Copy the full SHA
    58005ce View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2016

  1. Configuration menu
    Copy the full SHA
    70fe79d View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    991b387 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    f5c1d54 View commit details
    Browse the repository at this point in the history
  4. feat(*): Version bump

    ex3ndr committed Jul 30, 2016
    Configuration menu
    Copy the full SHA
    27cac98 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    f6d711a View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    09ba411 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    1deb2e6 View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2016

  1. Merge branch 'master' into v4.0-wire

    # Conflicts:
    #	actor-sdk/sdk-core-android/android-sdk/src/main/java/im/actor/sdk/controllers/conversation/ChatActivity.java
    #	actor-sdk/sdk-core/core/core-shared/src/main/java/im/actor/core/modules/Modules.java
    #	actor-sdk/sdk-core/core/core-shared/src/main/java/im/actor/core/modules/messaging/router/RouterActor.java
    #	actor-sdk/sdk-core/core/core-shared/src/main/java/im/actor/core/modules/settings/SettingsModule.java
    #	actor-sdk/sdk-core/core/core-shared/src/main/java/im/actor/core/modules/settings/SettingsProcessor.java
    #	actor-sdk/sdk-core/core/core-shared/src/main/java/im/actor/core/modules/settings/SettingsSyncActor.java
    ex3ndr committed Aug 16, 2016
    Configuration menu
    Copy the full SHA
    7b03093 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    a5f83c0 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    1fc7a8b View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2016

  1. Configuration menu
    Copy the full SHA
    204d3fa View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    d763ab7 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    bd5821e View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    958f745 View commit details
    Browse the repository at this point in the history
  5. Merge branch 'master' into v4.0-wire

    kor_ka committed Aug 17, 2016
    Configuration menu
    Copy the full SHA
    7772070 View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2016

  1. feat(iOS): iOS compatibility

    ex3ndr committed Aug 24, 2016
    Configuration menu
    Copy the full SHA
    3e808f5 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    2725b5f View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2016

  1. Configuration menu
    Copy the full SHA
    82dc23b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4d0506f View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    5b89de4 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    858707d View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    89fdb77 View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2016

  1. Mergeerge branch 'master' into v4.0-wire

    kor_ka committed Sep 14, 2016
    Configuration menu
    Copy the full SHA
    bd95a39 View commit details
    Browse the repository at this point in the history
  2. fix(core): self destruct timer plurals

    kor_ka committed Sep 14, 2016
    Configuration menu
    Copy the full SHA
    e770b86 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    a40d348 View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2016

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

Commits on Sep 16, 2016

  1. feat(core): hide encrypted message content rom notifications, fix not…

    …ifications encrypted counter
    kor_ka committed Sep 16, 2016
    Configuration menu
    Copy the full SHA
    31a2f9e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b9ed6a3 View commit details
    Browse the repository at this point in the history
  3. fix(core): mark encrypted messages as read after destruct/message del…

    …ete/chat delete
    kor_ka committed Sep 16, 2016
    Configuration menu
    Copy the full SHA
    00e6b13 View commit details
    Browse the repository at this point in the history