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

Merge upstream master #3

Merged
merged 122 commits into from Sep 27, 2018
Merged

Merge upstream master #3

merged 122 commits into from Sep 27, 2018

Commits on Jul 9, 2018

  1. [MOBILE-207p] Allow disabling modules with app version (#1495)

    * [MOBILE-207p] Allow disabling modules with app version
    
    * [MOBILE-207p] comments
    crow committed Jul 9, 2018
    Configuration menu
    Copy the full SHA
    25de525 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2018

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

Commits on Jul 11, 2018

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

Commits on Jul 12, 2018

  1. Configuration menu
    Copy the full SHA
    54d9837 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    d8fe205 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    55ad74b View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    5c4434d View commit details
    Browse the repository at this point in the history
  5. Fix Xcode 10 / iOS 12 builds (#1510)

    * Fix Xcode 10 / iOS 12 builds
    - Temporarily remove "clean" from static builds, until Xcode 10 fixes it.
      - Here's the radar: lionheart/openradar-mirror#19856
    - Updated project and XIB deployment targets to pass `pod lib lint`
    BrianBatchelder committed Jul 12, 2018
    Configuration menu
    Copy the full SHA
    8af0492 View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2018

  1. Configuration menu
    Copy the full SHA
    658d85d View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    c432e37 View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2018

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

Commits on Jul 17, 2018

  1. Configuration menu
    Copy the full SHA
    23b096a View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    409c65e View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    1e67447 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    745b1dc View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    16591f6 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    7a9708f View commit details
    Browse the repository at this point in the history
  7. [MOBILE-225] test massage

    marc-scig committed Jul 17, 2018
    Configuration menu
    Copy the full SHA
    9b7d525 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2018

  1. Configuration menu
    Copy the full SHA
    425c038 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    020be22 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    c28987f View commit details
    Browse the repository at this point in the history
  4. Merge pull request #1503 from urbanairship/MOBILE-225

    MOBILE-225 – Support new notification options/provisional auth
    marc-scig committed Jul 18, 2018
    Configuration menu
    Copy the full SHA
    c4f4086 View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2018

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

Commits on Jul 23, 2018

  1. Configuration menu
    Copy the full SHA
    55b2eed View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    a121d48 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #1517 from urbanairship/encodingings

    [encodingings] re-encode UAPushUI.strings as UTF-8
    marc-scig committed Jul 23, 2018
    Configuration menu
    Copy the full SHA
    ce39077 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2018

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

Commits on Jul 27, 2018

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

Commits on Jul 30, 2018

  1. [MOBILE-236] Wait for remote-data refresh to finish before calling co…

    …mpletion handler in content-available push (#1514)
    BrianBatchelder committed Jul 30, 2018
    Configuration menu
    Copy the full SHA
    cced3c2 View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2018

  1. [MOBILE-207p] Allow disabling modules with app version (#1495)

    * [MOBILE-207p] Allow disabling modules with app version
    
    * [MOBILE-207p] comments
    crow authored and rlepinski committed Aug 13, 2018
    Configuration menu
    Copy the full SHA
    78241fd View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    f40c330 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    b6f9dcc View commit details
    Browse the repository at this point in the history
  4. Get logs from Bitrise.

    BrianBatchelder authored and rlepinski committed Aug 13, 2018
    Configuration menu
    Copy the full SHA
    bdf6684 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    6e15457 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    d1802cb View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    c19d305 View commit details
    Browse the repository at this point in the history
  8. [MOBILE-236] Wait for remote-data refresh to finish before calling co…

    …mpletion handler in content-available push (#1514)
    BrianBatchelder authored and rlepinski committed Aug 13, 2018
    Configuration menu
    Copy the full SHA
    959ac23 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    9a3d0ac View commit details
    Browse the repository at this point in the history
  10. Fix merge

    rlepinski committed Aug 13, 2018
    Configuration menu
    Copy the full SHA
    478d73b View commit details
    Browse the repository at this point in the history
  11. Fix duplicate test

    rlepinski committed Aug 13, 2018
    Configuration menu
    Copy the full SHA
    ba0a1d4 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    b50ac4c View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    f32569a View commit details
    Browse the repository at this point in the history
  14. Merge pull request #1523 from urbanairship/MOBILE-264

    [MOBILE-264] refactor tag groups registrar with type enum
    marc-scig committed Aug 13, 2018
    Configuration menu
    Copy the full SHA
    fd580bd View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    4594c48 View commit details
    Browse the repository at this point in the history
  16. [MOBILE-264] PR feedback

    marc-scig committed Aug 13, 2018
    Configuration menu
    Copy the full SHA
    99a297e View commit details
    Browse the repository at this point in the history
  17. Configuration menu
    Copy the full SHA
    aa92361 View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    3a4a1af View commit details
    Browse the repository at this point in the history
  19. [MOBILE-263] docs

    marc-scig committed Aug 13, 2018
    Configuration menu
    Copy the full SHA
    ad5cd0f View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2018

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

Commits on Aug 15, 2018

  1. Configuration menu
    Copy the full SHA
    bf6c9a8 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    48b8f9a View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    cca346d View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    aa3a180 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    c97ae46 View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2018

  1. [MOBILE-287] Prepare next for iOS 12 beta release. (#1528)

    * [MOBILE-287] Prepare next for iOS 12 beta release.
    Note: This "fixes" some things in next. These changes should flow through to iOS 12 release. Other changes that will not flow through to actual release will be made in the beta release branch.
    
    * Update project files to Xcode 10.
    BrianBatchelder committed Aug 16, 2018
    Configuration menu
    Copy the full SHA
    8233b4d View commit details
    Browse the repository at this point in the history
  2. [MOBILE-284] Add prepareSchedule to automationEngine (#1529)

    * [MOBILE-284] Add prepareSchedule to automationEngine
    
    * Feedback
    
    * Add base test methods to wait for test expecations with a default timeout
    
    * Feedback
    rlepinski committed Aug 16, 2018
    Configuration menu
    Copy the full SHA
    68dcabb View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2018

  1. Configuration menu
    Copy the full SHA
    fa44e37 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #1527 from urbanairship/MOBILE-263

    [MOBILE-263] server-side tag groups
    marc-scig committed Aug 17, 2018
    Configuration menu
    Copy the full SHA
    3b9ab64 View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2018

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

Commits on Aug 22, 2018

  1. Configuration menu
    Copy the full SHA
    b5cbb1c View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    a5c7df9 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    cd6e975 View commit details
    Browse the repository at this point in the history
  4. [MOBILE-261] docs

    marc-scig committed Aug 22, 2018
    Configuration menu
    Copy the full SHA
    9da648f View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    b677bf9 View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2018

  1. Merge pull request #1532 from urbanairship/MOBILE-261

    MOBILE-261 Remote config for server side tag fetching
    marc-scig committed Aug 23, 2018
    Configuration menu
    Copy the full SHA
    daa0803 View commit details
    Browse the repository at this point in the history
  2. [MOBILE-301] Add back display lock tests (#1534)

    * [MOBILE-301] Add back display lock tests
    
    * Feedback
    
    * Typo
    
    * Feedback
    rlepinski committed Aug 23, 2018
    Configuration menu
    Copy the full SHA
    95df04a View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2018

  1. Fix tests

    rlepinski committed Aug 27, 2018
    Configuration menu
    Copy the full SHA
    f59e2af View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    223723b View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2018

  1. [MOBILE-283] make HTML view act like a Modal (#1535)

    * [MOBILE-283] make HTML view act like a Modal, rebase
    
    * Improve project validation test failure messages.
    
    * fix tests
    
    * comments
    crow committed Aug 28, 2018
    Configuration menu
    Copy the full SHA
    da3f2eb View commit details
    Browse the repository at this point in the history
  2. soothe pod lib lint comment warning

    David Crow committed Aug 28, 2018
    Configuration menu
    Copy the full SHA
    4eb4ce0 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    c69dd3d View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    5678802 View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2018

  1. Fix crash (#1541)

    rlepinski committed Aug 29, 2018
    Configuration menu
    Copy the full SHA
    a3ad452 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    92a0076 View commit details
    Browse the repository at this point in the history
  3. Merge remote-tracking branch 'origin/patch' into iam-server-side-tags

    # Conflicts:
    #	AirshipKit/AirshipKit.xcodeproj/project.pbxproj
    rlepinski committed Aug 29, 2018
    Configuration menu
    Copy the full SHA
    5982210 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    255723e View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    775313a View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    0a1e639 View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2018

  1. Configuration menu
    Copy the full SHA
    07e22aa View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b42d59c View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    02ef684 View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2018

  1. Configuration menu
    Copy the full SHA
    6bf00f6 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b9b262f View commit details
    Browse the repository at this point in the history
  3. Merge pull request #1551 from urbanairship/release-9.4.0

    [release-9.4.0] release 9.4.0
    marc-scig committed Sep 4, 2018
    Configuration menu
    Copy the full SHA
    ad9c88f View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    fdac31b View commit details
    Browse the repository at this point in the history
  5. Fix merge CI errors (#1548)

    - AirshipDebugKit needs a weak link to AirshipKit framework to get sample app to build. IDE builds are fine, but command-line builds fail.
    - `pod lib lint` fails because the lint is using released version of SDK, rather than version in working directory.
    BrianBatchelder authored and rlepinski committed Sep 4, 2018
    Configuration menu
    Copy the full SHA
    57b1690 View commit details
    Browse the repository at this point in the history
  6. Merge remote-tracking branch 'origin/patch' into next

    # Conflicts:
    #	AirshipKit/AirshipKit.xcodeproj/project.pbxproj
    #	AirshipKit/AirshipKitTests/UARemoteDataAPIClientTest.m
    rlepinski committed Sep 4, 2018
    Configuration menu
    Copy the full SHA
    6b1d78a View commit details
    Browse the repository at this point in the history
  7. [MOBILE-307]: Add notification_authorization to foreground and app in…

    …it events (#1549)
    
    * [MOBILE-307]: Add notification_authorization to foreground and app init events
    
    * Change "none" to "not_determined", and make it the default.
    BrianBatchelder authored and rlepinski committed Sep 4, 2018
    Configuration menu
    Copy the full SHA
    8cf5c73 View commit details
    Browse the repository at this point in the history
  8. [next-merge] fix pbxproj

    marc-scig committed Sep 4, 2018
    Configuration menu
    Copy the full SHA
    70e7505 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    c1ff6b4 View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2018

  1. Configuration menu
    Copy the full SHA
    0fb21df View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    335e669 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    fa3897f View commit details
    Browse the repository at this point in the history
  4. [MOBILE-297] React Native: Provide a way to enable notifications and …

    …get the prompt result (#1536)
    
    * [MOBILE-297] add push enablement function with completion handler
    crow committed Sep 5, 2018
    Configuration menu
    Copy the full SHA
    0ef9f3a View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2018

  1. Configuration menu
    Copy the full SHA
    4b6ece0 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    e666bf7 View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2018

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

Commits on Sep 13, 2018

  1. Configuration menu
    Copy the full SHA
    aa6576b View commit details
    Browse the repository at this point in the history
  2. Merge pull request #1557 from urbanairship/MOBILE-63

    MOBILE-63 Revisit log levels
    marc-scig committed Sep 13, 2018
    Configuration menu
    Copy the full SHA
    1fcf0f0 View commit details
    Browse the repository at this point in the history
  3. [MOBILE-310] doSync

    marc-scig committed Sep 13, 2018
    Configuration menu
    Copy the full SHA
    673eedb View commit details
    Browse the repository at this point in the history
  4. Merge pull request #1558 from urbanairship/MOBILE-310

    [MOBILE-310] fix UIApplication thread warnings in UAPush
    marc-scig committed Sep 13, 2018
    Configuration menu
    Copy the full SHA
    6b3c4ca View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    28edb4a View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    401cb5e View commit details
    Browse the repository at this point in the history
  7. Merge pull request #1559 from urbanairship/tvOS-background-fix

    [tvOS background fix] fix background refresh status warning
    marc-scig committed Sep 13, 2018
    Configuration menu
    Copy the full SHA
    d361be9 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    144158d View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2018

  1. Configuration menu
    Copy the full SHA
    0c82ec4 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b90a295 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    346096d View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    4b093ff View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2018

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

Commits on Sep 17, 2018

  1. Configuration menu
    Copy the full SHA
    0d162f5 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    bc56053 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #1563 from urbanairship/MOBILE-324

    [MOBILE-324] update migration guide
    marc-scig committed Sep 17, 2018
    Configuration menu
    Copy the full SHA
    d69821b View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    dff8b32 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    bbf77e1 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    2842e4b View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    51449e2 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    04ad46b View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    72f36b3 View commit details
    Browse the repository at this point in the history
  10. Merge pull request #1568 from urbanairship/default-to-collapsed-state

    [default-to-collapsed-state] default to collapsed state
    marc-scig committed Sep 17, 2018
    Configuration menu
    Copy the full SHA
    0b1bd85 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    492bda9 View commit details
    Browse the repository at this point in the history