/rstudio

Permalink
Tree: edaa34a81b
Commits on Jun 13, 2018

  1. Fix a failing Windows-only unit test

    @gtritchie
    gtritchie committed Jun 13, 2018
    Loading status checks…
     
    - fix test by setting a known prompt ($G), aka ">" so matching is more accurate
- stop dumping expected/got text on error, that was left in from a prior debugging session
    edaa34a

  2. Minor c++ style updates in winpty.cpp/hpp

    @gtritchie
    gtritchie committed Jun 13, 2018
    Loading status checks…
     
    - switch NULL to nullptr
- replace old-style casts with modern casts
    7d970a9

  3. Tweak wording in NEWS for 64-bit Windows change

    @gtritchie
    gtritchie committed Jun 13, 2018
    Loading status checks…
    4fcbca3

  4. Fix terminal on 64-bit Windows IDE

    @gtritchie
    gtritchie committed Jun 13, 2018 
    Fixes #3006
Other minor cleanup related to dropping 32-bit Windows support
    e2821f3

  5. fix check for SuperDevMode active

    @kevinushey
    kevinushey committed Jun 13, 2018
    Loading status checks…
    63c8fbc

  6. compile async SSL client with OpenSSL 1.1

    @jmcphers
    jmcphers committed Jun 13, 2018
    Loading status checks…
    Verified
    This commit was signed with a verified signature.
    @jmcphers jmcphers Jonathan
    GPG key ID: 7557A78D6AA1C69F Learn about signing commits
    578f660

  7. Merge branch 'master' of github.com:rstudio/rstudio

    @gtritchie
    gtritchie committed Jun 13, 2018
    5b23be0

  8. Minor cmake cleanup now that Windows is 64-bit only

    @gtritchie
    gtritchie committed Jun 13, 2018
    67ba4b2

  9. Merge pull request #3005 from rstudio/bugfix/knitr-params-encoding

    @jmcphers
    jmcphers committed Jun 13, 2018
    Loading status checks…
     
    mark UTF-8 encoding when extracting params
    Verified
    This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
    GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
    eeba77e

  10. mark UTF-8 encoding when extracting params

    @kevinushey
    kevinushey committed Jun 13, 2018
    15c36db

  11. don't show 32-bit R in "Browse for R" list

    @gtritchie
    gtritchie committed Jun 13, 2018
    Loading status checks…
     
    I wasn't filtering out 32-bit R from the list shown when user browses to select a custom version of R. Now I am.

Also added note to NEWS about 64-bit RStudio on Windows
    542e528

  12. Merge pull request #2993 from rstudio/feature/win64_only

    @gtritchie
    gtritchie committed Jun 13, 2018
    Loading status checks…
     
    Switch Windows desktop to be 64-bit only
    Verified
    This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
    GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
    3d76fd0

  13. Merge pull request #2990 from rstudio/bugfix/r2d3-gitignore

    @jmcphers
    jmcphers committed Jun 13, 2018
    Loading status checks…
     
    Updated gitignore to ignore r2d3 dependencies
    Verified
    This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
    GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
    22125d4
Commits on Jun 12, 2018

  1. Merge branch 'master' into feature/win64_only

    @gtritchie
    gtritchie committed Jun 12, 2018
    67f81ca

  2. fixup legacy 32-bit shell and R session settings

    @gtritchie
    gtritchie committed Jun 12, 2018
    fcba88e

  3. Code review feedback

    @kfeinauer
    kfeinauer committed Jun 12, 2018
    b8732bc

  4. Updated gitignore to ignore r2d3 dependencies

    @kfeinauer
    kfeinauer committed Jun 12, 2018
    a776161

  5. Merge branch 'master' of https://github.com/rstudio/rstudio

    @kfeinauer
    kfeinauer committed Jun 12, 2018
    Loading status checks…
    dd895eb

  6. Open source companion commit for rstudio/rstudio-pro#484

    @kfeinauer
    kfeinauer committed Jun 12, 2018
    7cabdf4

  7. Merge pull request #2986 from rstudio/bugfix/progress-api-show

    @javierluraschi
    javierluraschi committed Jun 12, 2018
    Loading status checks…
     
    Add support for `show` parameter in jobs API to fix #2985
    Verified
    This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
    GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
    556bef4

  8. address feedback

    @javierluraschi
    javierluraschi committed Jun 12, 2018
    77b50e0

  9. Merge pull request #2988 from rstudio/bugfix/object-explorer-enter-ha…

    @jmcphers
    jmcphers committed Jun 12, 2018
    Loading status checks…
     
    …ndling

refine enter handling in object explorer
    Verified
    This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
    GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
    90ac9a1

  10. refine enter handling in object explorer

    @kevinushey
    kevinushey committed Jun 12, 2018
    5a9890b

  11. Merge pull request #2987 from rstudio/bugfix/iframe-navigation-request

    @jmcphers
    jmcphers committed Jun 12, 2018
    Loading status checks…
     
    disallow attempts to open external URLs in iframes (closes #2756)
    Verified
    This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
    GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
    3bb75b2

  12. clarify intent

    @kevinushey
    kevinushey committed Jun 12, 2018
    358ebb8

  13. avoid duplicating installer entries after odbc driver gets installed

    @javierluraschi
    javierluraschi committed Jun 12, 2018
    Loading status checks…
    c578150

  14. disallow attempts to open external URLs in iframes (closes #2756)

    @kevinushey
    kevinushey committed Jun 12, 2018
    912841a

  15. add support for show parameter in jobs api to fix #2985

    @javierluraschi
    javierluraschi committed Jun 12, 2018
    c8b1dcf

  16. Merge branch 'master' into feature/win64_only

    @gtritchie
    gtritchie committed Jun 12, 2018
    4f7d7ed

  17. Drop support for 32-bit R, 32-bit terminal shells

    @gtritchie
    gtritchie committed Jun 12, 2018
    f03bd9a
Commits on Jun 11, 2018

  1. Get 64-bit Windows package build working

    @gtritchie
    gtritchie committed Jun 11, 2018
    84e4013

  2. Merge pull request #2980 from rstudio/bugfix/package-repos-backcompat

    @jmcphers
    jmcphers committed Jun 11, 2018
    Loading status checks…
     
    Store repos in repos setting to allow rstudio 1.1 to open cran settings to fix #2978
    Verified
    This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
    GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
    e1a7252

  3. store repos in repos setting to allow rstudio 1.1 to open cran settin…

    @javierluraschi
    javierluraschi committed Jun 11, 2018 
    …gs to fix #2978
    a07815d

  4. Merge pull request #2979 from rstudio/bugfix/object-explorer-refresh

    @jmcphers
    jmcphers committed Jun 11, 2018
    Loading status checks…
     
    discover new object definitions on explorer refresh
    Verified
    This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
    GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
    8090878

  5. Merge pull request #2974 from rstudio/feature/nested-data-viewer

    @jmcphers
    jmcphers committed Jun 11, 2018
    Loading status checks…
     
    Show nested lists and frames in the data viewer
    Verified
    This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
    GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
    ab99283