Skip to content
This repository has been archived by the owner on Sep 6, 2021. It is now read-only.

Merge master into release for 1.10 release #13503

Merged
merged 160 commits into from
Jul 3, 2017
Merged

Merge master into release for 1.10 release #13503

merged 160 commits into from
Jul 3, 2017

Conversation

swmitra
Copy link
Collaborator

@swmitra swmitra commented Jul 3, 2017

Merge master into release for 1.10 release

zaggino and others added 30 commits March 2, 2017 11:52
…he search history using key up and key down in search bar
* Updated by ALF automation.

* Updated by ALF automation.

* Updated by ALF automation.
…not appear as collapsible in html mixed mode.
Add no-unsafe-negation rule and upgrade grunt-eslint to 19.0.0
…hide-information-inside-tags

Makes the content of script and style tags collapsible
…eName

Added a check of Untitled doc in _getNormalizedFilename and _getDenormalizedFilename
* Updated by ALF automation.

* Updated by ALF automation.

* Updated by ALF automation.

* Updated by ALF automation.

* Updated by ALF automation.
Now search history is stored in state and can be traversed using arrow keys while focus is on search text
Jaseem and others added 28 commits June 18, 2017 18:50
Added strings for translation for 1.10 Release
* Updated by ALF automation.

* Updated by ALF automation.
Fixes translation error in Simplified Chinese
Changed WebPlatform License to MDN License and respective strings
* Now encoding is passed as parameter on file read and it is used by writefile in order to preserve encoding

* UI wiring

* Code Cleanup

* Fixed failing tests

* Added warning Dialog while changing encoding

* Added some Linux specific changes

* Fixed some linting errors

* Reverted last commit

* Minor changes

* Now selected encoding is stored in state

* Fixed lint error

* Added some more encodings

* Added some more encodings

* Fixed lint errors

* Removed duplicate encodings

* Fixed failing tests

* Used externalized strings

* Addressed review comments

* Added supported encodings file

* Addressed review comments

* Addressed review comments
* More efficient UUID Handling: We need to backing up existing uuid so that we can accurately get the new user count, as the uuid is changed now and will effect the existing users as well. Also added robust checking for shell API availability before calling the shell API and if not present handling olderUUID in a different way.

* Addressed review comments.
* Now BOM is preserved for UTF-8 files

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

* Removed utf-16 from encodings list

* Addressed review comments
…on (#12752)

* New File and New Folder execute in project root if there's no selection

* Add ProjectManager.getSelectedFileTreeItem

* Add function to get file tree context instead
* Polish translation update for brackets 1.10

* Corrected some strings in pl translation

* Added basic translation for core preferences section

* Transform some polish strings in core preferences section
* Update urls.js

* Create Getting Started

* Delete Getting Started

* Create index.html

* Create main.css

* Add files via upload

quick-edit.png
* First commit - sequential navigation in edit history

* Fix lint errors

* Handle undefined history entries

* Added comments and some additional edge case handling

* Update code review comments

* Put a max navigation frame capture limit and control overflow once reached. Fix all bugs found in unit testing.

* Fix indentation issues

* Change spaces to tabs for indentation

* Fix mixed tabs and spaces

* Convert spaces to tab

* resolve mixed tabs and spaces

* Initialize variables

* Handle external file changes and discard stale frames

* Additional checks to validate the navigation frames

* Address review comments
* Updated by ALF automation.

* Updated by ALF automation.

* Updated by ALF automation.

* Updated by ALF automation.

* Updated by ALF automation.
…n encoding of file should not be changed (#13497)

* After changing encoding of a dirty file if user cancels the popup then encoding of file should not be changed

* Removed popup for dirty file encoding change

* Now doc is reloaded if the path of the file being saved is same
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.