Skip to content
Permalink
6cb2be8132
Switch branches/tags

Commits on Dec 3, 2021

  1. merge commit

    Merge branch 'main' of github.com:rstudio/rstudio into main
    
    # Conflicts:
    #	src/gwt/src/org/rstudio/studio/client/rmarkdown/ui/RmdTemplateOptionsDialog.java
    jjallaire committed Dec 3, 2021
  2. eliminate eclipse warnings

    jjallaire committed Dec 3, 2021

Commits on Dec 2, 2021

  1. Merge pull request #10177 from rstudio/feature/windows-pbp

    Use pullBuildPush for windows as well
    MariaSemple committed Dec 2, 2021
  2. Update Jenkinsfile

    Co-authored-by: Jeffrey Vroom <jeff.vroom@rstudio.com>
    MariaSemple and jeffvroom committed Dec 2, 2021
  3. Merge pull request #10175 from rstudio/bugfix/i18n-constants-formatti…

    …ng-cleanup
    
    Purely small source formatting cleanup (well, also removing unused imports, worst case would be an obvious build break if I messed that up somehow).
    gtritchie committed Dec 2, 2021
  4. remove unused imports

    gtritchie committed Dec 2, 2021
  5. minor formatting cleanups

    gtritchie committed Dec 2, 2021
  6. Merge pull request #10166 from StatCan/i18nify-studio-client-pckg

    feat(i18n): org.rstudio.studio.client
    gtritchie committed Dec 2, 2021
Older