Skip to content
Permalink
d484a34bd1
Switch branches/tags

Commits on Aug 30, 2021

  1. Merge pull request #9793 from rstudio/feature/update-electron-forge-t… 

    …ype-catch

update Electron-Forge to latest
    @gtritchie
    gtritchie committed Aug 30, 2021
    d484a34

  2. unit tests for safeError function

    @gtritchie
    gtritchie committed Aug 30, 2021
    ee30402

  3. require specifying type of catch clause variable

    @gtritchie
    gtritchie committed Aug 30, 2021
    43246a0

  4. Merge pull request #9791 from shannonpileggi/whitelist-words 

    add bivariate to whitelist spelling
    @jmcphers
    jmcphers committed Aug 30, 2021
    a212435

  5. Merge remote-tracking branch 'origin/release-ghost-orchid'

    @gtritchie
    gtritchie committed Aug 30, 2021
    2eea449

  6. add bivariate to whitelist spelling

    @shannonpileggi
    shannonpileggi committed Aug 30, 2021
    f45ed7f

Commits on Aug 29, 2021

  1. eliminate unused imports

    @jjallaire
    jjallaire committed Aug 29, 2021
    2f0d60d

Commits on Aug 27, 2021

  1. Merge pull request #9784 from rstudio/bugfix/rs-csrf-take-2 

    Use rs-csrf-token consistently
    @jmcphers
    jmcphers committed Aug 27, 2021
    d9fef95

  2. better CSRF logging

    @jmcphers
    jmcphers committed Aug 27, 2021
    9dabd97

  3. use rs-csrf-token consistently

    @jmcphers
    jmcphers committed Aug 27, 2021
    0e7186f

  4. Merge pull request #9780 from rstudio/feature/update-node-electron 

    Merging; I did successful desktop package builds on Windows, Mac, and Linux (Bionic) with this change. If it does cause a problem, say on another distro, easy enough to backout.
    @gtritchie
    gtritchie committed Aug 27, 2021
    07349e0

  5. Merge pull request #9781 from rstudio/bugfix/rm-old-db-files 

    Remove Unnecessary rm
    @MariaSemple
    MariaSemple committed Aug 27, 2021
    8aea4f3

Commits on Aug 26, 2021

  1. remove unecessary rm

    @MariaSemple
    MariaSemple committed Aug 26, 2021
    4c3b78f

  2. update from node 10.19.0 to 14.17.5

    @gtritchie
    gtritchie committed Aug 26, 2021
    8188a86

  3. update electron dependencies

    @gtritchie
    gtritchie committed Aug 26, 2021
    b938fa5

  4. Merge pull request #9779 from rstudio/feature/electron-app-icon-win-mac 

    set app icon for mac and windows package build (Electron)
    @gtritchie
    gtritchie committed Aug 26, 2021
    2d93666

  5. open source companion to rstudio/rstudio-pro#2953

    @jmcphers
    jmcphers committed Aug 26, 2021
    dd5e374

  6. set app icon for mac and windows package build

    @gtritchie
    gtritchie committed Aug 26, 2021
    5554e3d

Commits on Aug 25, 2021

  1. Merge remote-tracking branch 'origin/release-ghost-orchid' into main

    @jmcphers
    jmcphers committed Aug 25, 2021
    3a60b86

  2. Merge pull request #9774 from rstudio/bugfix/custom-handler-path-escape 

    Escape paths in custom HTTP handler
    @jmcphers
    jmcphers committed Aug 25, 2021
    8e8365a

  3. escape paths in custom HTTP handler

    @jmcphers
    jmcphers committed Aug 25, 2021
    22d35ff

Commits on Aug 24, 2021

  1. open source companion to rstudio/rstudio-pro#2876

    @jmcphers
    jmcphers committed Aug 24, 2021
    787d2e2

  2. Merge pull request #9770 from rstudio/feature/electron-forge-webpack 

    Integrate electron-forge and webpack (Electron)
    @gtritchie
    gtritchie committed Aug 24, 2021
    3a27922

  3. remove debugging code from test

    @gtritchie
    gtritchie committed Aug 24, 2021
    53cfee5

  4. Merge branch 'feature/electron-forge-webpack' of github.com:rstudio/r… 

    …studio into feature/electron-forge-webpack
    @gtritchie
    gtritchie committed Aug 24, 2021
    d5a6b60

  5. remove WIP from int test

    @gtritchie
    gtritchie committed Aug 24, 2021
    62f882f

  6. fix path to Windows package for integration tests

    @gtritchie
    gtritchie committed Aug 24, 2021
    dbf3b1d

  7. remove unused copy-files script

    @gtritchie
    gtritchie committed Aug 24, 2021
    6964923

  8. Merge branch 'main' into feature/electron-forge-webpack

    @gtritchie
    gtritchie committed Aug 24, 2021
    cf34d22

  9. Merge remote-tracking branch 'origin/release-ghost-orchid' into main 

    Merging build changes - kept main's version of RStudio.gwt.xml
    @jeffvroom
    jeffvroom committed Aug 24, 2021
    9f67c84

Commits on Aug 23, 2021

  1. fix windows packaging script

    @gtritchie
    gtritchie committed Aug 23, 2021
    b34d985

  2. tweak choose_r code to work with webpack

    @gtritchie
    gtritchie committed Aug 23, 2021
    cd9c16c

  3. update deps, remove obsolete targets

    @gtritchie
    gtritchie committed Aug 23, 2021
    5c45c45

  4. remove 'rstudio.electron' changes for GO release

    @kevinushey
    kevinushey committed Aug 23, 2021
    802a021

  5. Merge remote-tracking branch 'origin/main' into feature/electron-forg… 

    …e-webpack
    @gtritchie
    gtritchie committed Aug 23, 2021
    60a91e0
Older