This repository was archived by the owner on Sep 6, 2021. It is now read-only.

Merge master into release for 1.10 release#13503

Merged

saurabh95 merged 160 commits intoreleasefrom

Jul 3, 2017

Commits on Mar 16, 2017

Commits on Mar 17, 2017

Now search history is stored in preferences and user can go through the search history using key up and key down in search bar
saurabh95
committed

Commits on Mar 21, 2017

Added a check of Untitled doc in _getNormalizedFilename and _getDenormalizedFilename
saurabh95
committed
Merge pull request #13201 from adobe/saurabh95/TernWorkerNormalizeFileName
swmitra
authored

Commits on Mar 22, 2017

Merge branch 'master' of https://github.com/adobe/brackets into saurabh95/SearchHistory
saurabh95
committed

Commits on Mar 23, 2017

ALF Automation (#13204)

walfgithub
authored and
ficristo
committed

Commits on Mar 27, 2017

Replaced .border-radius with border-radius css in brackets_patterns_override.less
parthsharma2
authored

Commits on Mar 29, 2017

Commits on Mar 30, 2017

Merge pull request #13243 from justinrusso/feature/jsx_code_hints
zaggino
authored

Commits on Apr 3, 2017

Merge pull request #13245 from justinrusso/bugfix/extension_manager_responsive_fix
zaggino
authored

Commits on Apr 4, 2017

Commits on Apr 5, 2017

Commits on Apr 6, 2017

Commits on Apr 9, 2017

Commits on Apr 12, 2017

Commits on Apr 13, 2017

Commits on Apr 15, 2017

Use a single preference
ficristo
committed

Commits on Apr 17, 2017

Removed filtering in search dropdown
saurabh95
committed

Commits on Apr 20, 2017

Return 0 from _firstNotWs
ficristo
committed

Commits on Apr 21, 2017

Changed url to access Japanese translated page (#13321)

Blackweda
authored and
ficristo
committed

Commits on Apr 24, 2017

Commits on Apr 25, 2017

Changed Global.js to enable Native Menus for Linux
saurabh95
committed

Commits on May 5, 2017

Merge pull request #13342 from adobe/saurabh95/SearchHistory
zaggino
authored

Commits on May 9, 2017

Fixed Project Manager failing tests
saurabh95
committed

Commits on May 10, 2017

Merge pull request #13368 from adobe/saurabh95/Fixed-ProjectManager-tests
swmitra
authored

Commits on May 22, 2017

Brackets 1.10 Pre-release 2
saurabh95
authored

Commits on May 24, 2017

Fix box model regression (transform) (#13357)

Worie
authored and
petetnt
committed

Commits on Jun 8, 2017

Various additions and changes to Swedish interface strings (#13404)

Philip Eriksson
authored and
petetnt
committed

Commits on Jun 12, 2017

Externalize Live preview hightlight settings string
saurabh95
committed

Commits on Jun 13, 2017

ALF Automation (#13293)

walfgithub
authored and
saurabh95
committed
Merge pull request #13431 from adobe/saurabh95/ExternalizeString
swmitra
authored
Fix root strings (#13435)

Marcel Gerber
authored and
petetnt
committed

Commits on Jun 14, 2017

ALF Automation (#13434)

walfgithub
authored and
saurabh95
committed

Commits on Jun 15, 2017

Change in UUID fetching for first launches (#13419)

nethip
authored and
saurabh95
committed
Add option for first highlight index in Quick Open and Search History (#13444)

saurabh95
authored and
Marcel Gerber
committed
Changed WebPlatform License to MDN License and respective strings
saurabh95
committed
Use the correct border color in multifile Replace in Files bar with dark theme
Marcel Gerber
committed

Commits on Jun 16, 2017

Merge pull request #13449 from adobe/marcel/replace-batch-border
swmitra
authored

Commits on Jun 17, 2017

Updated by ALF automation. (#13454)

walfgithub
authored and
ficristo
committed

Commits on Jun 18, 2017

In writeJSON (grunt), use CRLF on Windows (#13458)

Marcel Gerber
authored and
ficristo
committed
Fixes translation error in Simplified Chinese
Jaseem
authored
Enable no-redeclare to eslint (#13452)

horiaradu
authored and
ficristo
committed

Commits on Jun 20, 2017

ALF Automation (#13471)

walfgithub
authored and
saurabh95
committed

Commits on Jun 21, 2017

Merge pull request #13463 from mjaseem/jaseemumar-patch-1
ficristo
authored

Commits on Jun 23, 2017

Commits on Jun 27, 2017

Now BOM is preserved for UTF-8 files (#13477)

saurabh95
authored and
swmitra
committed
fix JP translation in comment tags (#13363)

ArturOledzki
authored and
ficristo
committed
New File and New Folder execute in project root if there's no selection (#12752)

Marcel Gerber
authored and
ficristo
committed
Polish translation update for brackets 1.10 (#13398)

karmatys
authored and
ficristo
committed
German translation (#13436)

Marcel Gerber
authored and
ficristo
committed
zh-cn (#13473)

rex nathan
authored and
ficristo
committed

Commits on Jun 28, 2017

Commits on Jun 29, 2017

ALF Automation (#13474)

walfgithub
authored and
saurabh95
committed
Adding extra check to handle null mrof list entries (#13495)

swmitra
authored and
petetnt
committed

Commits on Jun 30, 2017

After changing encoding of a dirty file if user cancels the popup then encoding of file should not be changed (#13497)

saurabh95
authored and
swmitra
committed

Commits on Jul 3, 2017

Merge branch 'release' into master
swmitra
authored