Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: brackets-cont/brackets-shell
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: release-1.9
Choose a base ref
...
head repository: brackets-cont/brackets-shell
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: release-1.10
Choose a head ref
  • 18 commits
  • 19 files changed
  • 5 contributors

Commits on Oct 2, 2016

  1. Update, and made works, build_projects.bat

    @ficristo
    ficristo committed Oct 2, 2016
    Configuration menu
    Copy the full SHA
    1a09ef3 View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2017

  1. Upgraded Version to 1.10

    @saurabh95
    saurabh95 committed Mar 16, 2017
    Configuration menu
    Copy the full SHA
    4970117 View commit details
    Browse the repository at this point in the history

  2. Merge pull request adobe#601 from adobe/saurabh95/VersionBump 

    Upgraded Version to 1.10
    @swmitra
    swmitra authored Mar 16, 2017
    Configuration menu
    Copy the full SHA
    73e1f2a View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2017

  1. Merge pull request adobe#568 from ficristo/update-build-projects 

    Update, and made works, build_projects.bat
    @saurabh95
    saurabh95 authored Jun 1, 2017
    Configuration menu
    Copy the full SHA
    9cf19d6 View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2017

  1. Getting machine hash(Win and Mac)

    @nethip
    nethip committed Jun 2, 2017
    Configuration menu
    Copy the full SHA
    9d562ec View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2017

  1. Fixing Mac compile errors and adding linux initial implementation

    @nethip
    nethip committed Jun 5, 2017
    Configuration menu
    Copy the full SHA
    311dddd View commit details
    Browse the repository at this point in the history

  2. Update appshell_extensions.js 

    Fixing the comment
    @nethip
    nethip authored Jun 5, 2017
    Configuration menu
    Copy the full SHA
    1466b80 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2017

  1. Addressing review comments.

    @nethip
    nethip committed Jun 13, 2017
    Configuration menu
    Copy the full SHA
    8c27201 View commit details
    Browse the repository at this point in the history

  2. Merging Native Menus from linux-1547 to master

    @swmitra @saurabh95
    swmitra authored and saurabh95 committed Jun 13, 2017
    Configuration menu
    Copy the full SHA
    aa03360 View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2017

  1. Merge pull request adobe#603 from adobe/nethip/GetMachineHash 

    New shell API to get the hash
    @saurabh95
    saurabh95 authored Jun 15, 2017
    Configuration menu
    Copy the full SHA
    63d098b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into saurabh95/linux-native-menus-master

    @saurabh95
    saurabh95 authored Jun 15, 2017
    Configuration menu
    Copy the full SHA
    a1e3253 View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2017

  1. Add iphlpapi to Windows linker libs

    Marcel Gerber committed Jun 16, 2017
    Configuration menu
    Copy the full SHA
    c13ea9a View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2017

  1. Merge pull request adobe#608 from adobe/marcel/win-linker-lib 

    Add iphlpapi to Windows linker libs
    @nethip
    nethip authored Jun 17, 2017
    Configuration menu
    Copy the full SHA
    2598ea9 View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2017

  1. Merge pull request adobe#606 from adobe/saurabh95/linux-native-menus-… 

    …master

Merging Native Menus from linux-1547 to master
    @nethip
    nethip authored Jun 19, 2017
    Configuration menu
    Copy the full SHA
    2a27b1b View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2017

  1. Saurabh95/windows mac encoding support (adobe#605) 

    * Detected charset of document being read and accordingly encoded/decoded the document

* Upgraded ICU version

* Now ICU is downloaded from S3

* Changed include path of ICU

* Now encoding is preserved on write also

* Minor change

* minor changes

* Added some more codepages

* minor change

* Moved check of contents.size() to try block

* Used ICU version 58

* Mac Build passing

* Added job of downloading ICU library from S3

* Read File Working

* Write File working now

* Changed Linking

* Changed Linking

* Minor changes

* Fixed VS2015 Compilation error

* Added dlls for installer

* UI wiring done

* minor change

* Removed duplication of GetCharsetMatch

* Code Cleanup

* Changed tabs to spaces

* Further cleanup

* MAC related changes

* Fixed read and writefile in MAC

* Removed unnecessary libraries

* Revert "Fixed VS2015 Compilation error"

This reverts commit ad648a0.

* Added some more encodings

* Added some more encodings

* Changed read file in MAC

* Added ISO-2022-Jp encoding

* Moved charset detection to separate file

* Addressed review comments

* Used auto_ptr

* Used auto_ptr and addressed review comments

* Used stack based class

* Addressed review comments

* Renamed CharSetConvert class to CharSetDecode

* Used stack based class for file read

* Defined DecodeContents function

* DecodeContents is defined only for MAC and Linux

* Used const ref for ReadFileHandle class

* Addressed review comments

* minor change
    @saurabh95 @swmitra
    saurabh95 authored and swmitra committed Jun 23, 2017
    Configuration menu
    Copy the full SHA
    d1c7e6f View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2017

  1. Now BOM is preserved in Win and MAC (adobe#610) 

    * Now BOM is preserved in Win and MAC

* Added error strings for failure in encode/decode and utf-16

* Mac related error string changes

* Addressed review comments

* minor change

* Addressed win review comments
    @saurabh95 @swmitra
    saurabh95 authored and swmitra committed Jun 27, 2017
    Configuration menu
    Copy the full SHA
    d1b1c3e View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2017

  1. Correct UTF8 detection which was being detected as ISO-8859-1 (adobe#612 

    )

* Correcte UTF8 detection which was being detected as ISO-8859-1

* File is read only once now in mac

* minor change

* Added back functions which are used in windows

* minor change

* minor change

* minor change

* Added some comments related to BOM

* Added some comments related to BOM
    @saurabh95 @nethip
    saurabh95 authored and nethip committed Jul 3, 2017
    Configuration menu
    Copy the full SHA
    14a0758 View commit details
    Browse the repository at this point in the history

  2. Merge pull request adobe#614 from adobe/master 

    Merge master into release branch for 1.10 release
    @saurabh95
    saurabh95 authored Jul 3, 2017
    Configuration menu
    Copy the full SHA
    21e602f View commit details
    Browse the repository at this point in the history
Loading