Skip to content
Permalink
b938fa5bf7
Switch branches/tags

Commits on Aug 26, 2021

  1. update electron dependencies

    @gtritchie
    gtritchie committed Aug 26, 2021
    b938fa5

  2. 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

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

    @jmcphers
    jmcphers committed Aug 26, 2021
    dd5e374

  4. 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

  6. use explicit true / false strings

    @kevinushey
    kevinushey committed Aug 23, 2021
    df2111c

  7. fix ad-hoc packaging for Mac, and integration tests

    @gtritchie
    gtritchie committed Aug 23, 2021
    ef32a77

  8. update required version of packrat

    @kevinushey
    kevinushey committed Aug 23, 2021
    a008dc5

  9. update required version of packrat

    @kevinushey
    kevinushey committed Aug 23, 2021
    59190e1

  10. one more try - really move the files after cpack this time

    @jeffvroom
    jeffvroom committed Aug 23, 2021
    740510c

  11. switch error.html to same technique as connect.html

    @gtritchie
    gtritchie committed Aug 23, 2021
    4b82034

  12. factor out reworked template filter helper

    @gtritchie
    gtritchie committed Aug 23, 2021
    a8a201b

  13. move logic for error var lookup to main process

    @gtritchie
    gtritchie committed Aug 23, 2021
    e52532f

Commits on Aug 22, 2021

  1. one more try to move files into the right place

    @jeffvroom
    jeffvroom committed Aug 22, 2021
    ee32c84

  2. minor refactoring

    @gtritchie
    gtritchie committed Aug 22, 2021
    a2f0d22

  3. minor cleanup

    @gtritchie
    gtritchie committed Aug 22, 2021
    d9744bd

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

    …e-webpack
    @gtritchie
    gtritchie committed Aug 22, 2021
    eb99621

  5. more changes to use c:\temp\ide-build for the cpack stage 

    the last attempt built the .exe and .zip files correctly but
then didn't find them in package/win32/build where it expected
move them and clean the directory, and look for errors in the new location
    @jeffvroom
    jeffvroom committed Aug 22, 2021
    c3b9b56

  6. update to pandoc 2.14.2

    @jjallaire
    jjallaire committed Aug 22, 2021
    de82b4f
Older