Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
This comparison is big! We’re only showing the most recent 250 commits
Commits on Sep 26, 2012
@gruehle gruehle Cleanup. 7d97275
@gruehle gruehle Comment out code that was throwing an exception. 3291e05
@peterflynn peterflynn Merge pull request #1714 from adobe/jasonsanjose/sprint15
update version for sprint 15 0.15.0-0
88883c7
@jbalsas jbalsas Use outerHeight() for toolbars height to account for paddings and mar…
…gins

Fixed missing toolbar.outerHeight() in _setHeight for jsLint
9e25576
Commits on Sep 27, 2012
@peterflynn peterflynn Fix bug #1243 (Input fields don't work in dialogs). Improves on an ea…
…rlier

fix that let keystrokes through to the textfield, but auto-closed the
dialog when certain chars were typed. Now we only close the dialog if the
char typed could not have been intended as text input.
811d18e
@njx njx Update src/nls/README.md cacfef0
@njx njx Update src/nls/README.md 7d6a238
@RaymondLim RaymondLim Merge pull request #1722 from adobe/pflynn/issue-1243
Fix bug #1243 (Input fields don't work in dialogs)
5fa9cd3
Commits on Sep 28, 2012
@jbalsas jbalsas Resize behavior refactored in utils/Resizer e853066
@gruehle gruehle Refactor renaming. Fix bugs. 5db70c8
@jbalsas jbalsas Generalization for both resize directions ea3354c
Commits on Sep 29, 2012
Chetan Karande Merge remote-tracking branch 'upstream/master' into issue1561 9539c42
Chetan Karande Changes to add checkmark only for STATUS_ACTIVE 03bb814
Chetan Karande Unnecessary whitespace cleanup 563117b
@jbalsas jbalsas Added position selection for future resizer position implementations 6a933a3
@jbalsas jbalsas Comments and clean up 5559cd3
Commits on Oct 01, 2012
@redmunds redmunds initial commit for url hinting 3d213fd
@jasonsanjose jasonsanjose update about dialog sprint 15 3c4aa82
@jasonsanjose jasonsanjose omit change to french 3c313b1
@njx njx Merge pull request #1735 from adobe/jasonsanjose/sprint15
update about dialog sprint 15
3afe8a1
@antonellopasella antonellopasella Update src/nls/it/strings.js
Fixed some typos and some missing lines
6d40aab
@antonellopasella antonellopasella Update src/nls/urls.js
Reverted. I'll try to fix the italian translation of the "welcome page" tomorrow.
6bbdf57
@redmunds redmunds Merge pull request #1710 from adobe/pflynn/quick-open-dupes
Fix bug #1109 (Quick Open JS: can't access second function with same name)
119e1c1
@jasonsanjose jasonsanjose Merge pull request #1711 from antonellopasella/master
Added italian translation
eef438a
Commits on Oct 02, 2012
@redmunds redmunds fix race condition, handle ../ paths d76d76f
@gruehle gruehle Respond to review comments. cd0199c
@njx njx Merge pull request #1449 from thomasandersen/quick-open-legibility
Quick Open view: Improve legibility of the path text for the currently focused item
1bb66d0
@njx njx Merge pull request #1599 from sagarsane/sagarsane/search_results_label
For Review Issue#1598: Added search query in search results label for 'Find In Files'
a7ee191
@RaymondLim RaymondLim Map key code for digit keys to the corresponding digits so that short…
…cut with digit keys and Shift key will function correctly.
cb7bd79
@RaymondLim RaymondLim Merge pull request #1454 from deemeetar/closeTag
Close html tags
b610dba
@redmunds redmunds use Tab key to 'select and continue hinting' b21c2f1
@RaymondLim RaymondLim Explicitly return the digit as a string. 65fc3da
@RaymondLim RaymondLim Using Peter's suggestion to convert the digit to a string. e9fbf60
@RaymondLim RaymondLim Revert my testing code that I accidently committed. 40fe9a1
@jasonsanjose jasonsanjose Merge pull request #1746 from adobe/rlim/digit-key-issue
Map key code for digit keys to the corresponding digits.
b2f32e0
@DennisKehrig DennisKehrig Bugfix: If characters in URLs are encoded (e.g. space as %20), it nee…
…ds to be decoded before turning it into a file system path
c5170f2
Commits on Oct 03, 2012
@walfgithub walfgithub Updated by ALF automation. 85f71df
Chetan Karande Merge remote-tracking branch 'upstream/master' into issue1561 2d4d641
Chetan Karande Refined condition for adding checkmark 7306f52
@gruehle gruehle More review comments. c16e87c
@DennisKehrig DennisKehrig Use decodeURI instead of decodeURIComponent e41de4a
@njx njx Merge pull request #1707 from ckarande/issue1561
Fix for issue #1561
238f3ec
@DennisKehrig DennisKehrig Fixes #1606 - Inline CSS editor UI breaks if menu bar height changes …
…when switching files
d574dee
@jbalsas jbalsas Cleanup changes for pull request review e331203
@jbalsas jbalsas Merge branch 'master' of https://github.com/adobe/brackets into statu…
…sbar

Conflicts:
	src/search/FindInFiles.js
87ab246
@DennisKehrig DennisKehrig Fixes #510: Middle-click in inline editor's chrome scrolls view & bre…
…aks editor
b07a892
@jbalsas jbalsas Hides the statusbar when there is no focused editor 5ae895c
@jbalsas jbalsas Move gift notification back up in the toolbar f5d977a
@gruehle gruehle Merge pull request #1717 from jbalsas/statusbar
Statusbar for Brackets
4c7b775
@peterflynn peterflynn Fix bug #1724 (Reset Find in Files / JSLint scroll position to top when
list contents are refreshed)

Even though the entire table is getting blown away, webkit is smart and
keeps the scroll position by default. Need to explicitly reset it.
cd2ad39
@jbalsas jbalsas Cleanup changes for pull request review c561ef0
@jbalsas jbalsas Merge branch 'master' of https://github.com/adobe/brackets into jslin…
…t-panel-resize

Conflicts:
	src/brackets.js
	src/language/JSLintUtils.js
	src/search/FindInFiles.js
2044846
@jbalsas jbalsas Final comments cleanup 8f1cfb2
@njx njx Factor out generic token-navigation routines from HTMLUtils 0285579
@redmunds redmunds Merge pull request #1748 from DennisKehrig/dk/url-decode
Bugfix: GotoAgent did not work with paths containing spaces (like "Brackets Sprint 14")
943433f
@peterflynn peterflynn Merge pull request #1753 from adobe/nj/factor-token-utils
Factor out generic token-navigation routines from HTMLUtils
04bcf56
Adam Lehman Added a button to remove projects from the recent project dropdown. d676ae6
@peterflynn peterflynn Incremental search while typing in the Find bar
Although highlighting matches is turned off in our CSS, the changes here
were tested & should work when/if highlights are made visible again.

Also includes some docs improvements.
b337028
@gruehle gruehle Select after sorting. edda6b5
@jasonsanjose jasonsanjose Merge pull request #1719 from adobe/glenn/new-features
Add "New Folder" and "Rename" features
1c3c822
@jasonsanjose jasonsanjose Merge pull request #1750 from DennisKehrig/dk/issue-1606
Fixes #1606
83c3a46
@jasonsanjose jasonsanjose Merge pull request #1752 from adobe/pflynn/issue-1724
Fix bug #1724 (Reset Find in Files / JSLint scroll position to top when list contents are refreshed)
ef083b4
@RaymondLim RaymondLim Auto reload an HTML page in live preview when saving it in Brackets. 0cb917d
@RaymondLim RaymondLim Change name to _onDocumentSaved and limit reloading to non-css files. 3d5be63
@redmunds redmunds make clicking About dialog links go to Live Preview browser 8fc280d
@jasonsanjose jasonsanjose Merge pull request #1761 from adobe/rlim/auto-reload-live-preview
Auto reload an HTML page in live preview when saving it in Brackets.
efbb7c7
Commits on Oct 04, 2012
@mcorlan mcorlan Delete current line/selection including end of line char 36cb45e
@walfgithub walfgithub Updated by ALF automation. 815566c
@jasonsanjose jasonsanjose Fix bugs with focusedEditorChanged. Fire this event async to allow Co…
…deMirror to update it's internal state.
a82cfde
@jasonsanjose jasonsanjose Refactor StatusBar. Implement Garth's UI
Move EditorManager statusbar indicators from StatusBar module to EditorManager. Refactor HTML and LESS for statusbar styles. Note that indentation controls do not work yet.
691ed98
@jasonsanjose jasonsanjose Implement statusbar indentation controls f7581c2
@DennisKehrig DennisKehrig Fixes #1256: Deleting a file should remove entry from inline editor efd050a
@jasonsanjose jasonsanjose fix styles on statusbar indent, add tooltip 9480d70
@redmunds redmunds Merge pull request #1751 from DennisKehrig/dk/issue-510
Fixes #510
a29dfd4
@jasonsanjose jasonsanjose fix indent size impl 75e4e90
@massimiliano-giroldi massimiliano-giroldi Fixed typos and GETTING_STARTED path ea9cf4d
@jasonsanjose jasonsanjose Merge pull request #1660 from massimiliano-giroldi/max/pt-br
Added Brazilian Portuguese translation
b2ca146
@jasonsanjose jasonsanjose UI review comments c5f005e
@jasonsanjose jasonsanjose code review comments f6e700b
@redmunds redmunds Merge pull request #1765 from adobe/jasonsanjose/issue-1257
Fix bugs with focusedEditorChanged
d2cbe88
@RaymondLim RaymondLim Merge branch 'master', remote-tracking branch 'origin' into rlim/auto…
…-reload-live-preview
5a673ea
@jasonsanjose jasonsanjose Merge remote-tracking branch 'origin/master' into jasonsanjose/statusbar
Conflicts:
	src/editor/EditorManager.js
	src/widgets/StatusBar.js
6a9046b
@jasonsanjose jasonsanjose use tabSize instead of indentUnit 31b2d38
@redmunds redmunds Merge pull request #1766 from adobe/jasonsanjose/statusbar
Implement statusbar UI and indentation controls
f1147ac
@jasonsanjose jasonsanjose save _currentEditor synchronously to fix #1774 2bddeca
@redmunds redmunds intermediate fix for encoding 3dba737
@jasonsanjose jasonsanjose add getter/setter and prefs for tabSizee ac31db2
@walfgithub walfgithub Updated by ALF automation. f23450c
Commits on Oct 05, 2012
@jasonsanjose jasonsanjose always resize the current editor when focus changes 162da5c
@redmunds redmunds Merge pull request #1775 from adobe/jasonsanjose/issue-1774
Fix for #1774 - _currentEditor is saved synchronously
d344dd0
@redmunds redmunds encode url hints 199899a
@RaymondLim RaymondLim Merge branch 'master', remote-tracking branch 'origin' into rlim/auto…
…-reload-live-preview
903c5f0
@DennisKehrig DennisKehrig Added a space between "function" and "(event)" (JSLint) 57cc31c
@redmunds redmunds Merge pull request #1777 from DennisKehrig/dk/issue-510
Added a space between "function" and "(event)" (JSLint)
851e758
@redmunds redmunds do not list hidden files 7e6c3e4
@RaymondLim RaymondLim Add out-of-sync state to Live Preview icons and toggle it based on di…
…rty flag.
2cbda47
@redmunds redmunds other code review changes fefe7bd
@redmunds redmunds fix whitespace f3d0f84
@RaymondLim RaymondLim Merge pull request #1762 from adobe/randy/issue-1455
make clicking About dialog links go to Live Preview browser
431f63c
@redmunds redmunds code cleanup 8295aac
@RaymondLim RaymondLim Merge pull request #1747 from adobe/randy/code-hint-url
url hinting support
a856faa
Commits on Oct 06, 2012
@walfgithub walfgithub Updated by ALF automation. fbc2aab
@gruehle gruehle When running in dev mode (as opposed to installed mode), don't show u…
…pdate notification unless explictily calling 'Check for Updates'
9ab99e4
Commits on Oct 07, 2012
@JakeStoeffler JakeStoeffler Make URLs breakable
See issue #1604
55c8c9f
@gruehle gruehle Use sort instead of refresh if rename fails. ab6d0d3
@redmunds redmunds Merge pull request #1790 from JakeStoeffler/issue-1604
Make URLs breakable in certain cases
82ef833
Commits on Oct 08, 2012
@redmunds redmunds reload unsaved changes to related files b156121
@redmunds redmunds cleanup agents 2bf1f1e
@GarthDB GarthDB Merge branch 'rlim/auto-reload-live-preview' of github.com:adobe/brac…
…kets into rlim/auto-reload-live-preview
29efd02
@RaymondLim RaymondLim Update tooltip with Randy's suggestion.
Add a couple of cases where we need to show out-of -sync icon.
ba2b315
@GarthDB GarthDB added new live development (html) icons 222385b
@jasonsanjose jasonsanjose change focusedEditorChange to by synchronous. change implementation o…
…f Editor.hasFocus()
d891637
@jbalsas jbalsas Merge branch 'master' of https://github.com/adobe/brackets into jslin…
…t-panel-resize

Conflicts:
	src/search/FindInFiles.js
aab262d
@jbalsas jbalsas Rename "ver" and "hor" for easier to remember "vert" and "horz". ab2645a
@jasonsanjose jasonsanjose Merge pull request #1784 from adobe/glenn/update-notification
Don't show update notification when running from GitHub source
1e0bbe7
@jasonsanjose jasonsanjose Merge remote-tracking branch 'origin/master' into jasonsanjose/statusbar 6f38c6a
@redmunds redmunds Merge pull request #1661 from jbalsas/jslint-panel-resize
Fix for issue #1122
9de1238
@jasonsanjose jasonsanjose save indentation preferences. add new default prefs when missing 03b949b
@redmunds redmunds Merge pull request #1800 from adobe/jasonsanjose/issue-1774
Restore focusedEditorChange to be synchronous
be014e9
@DennisKehrig DennisKehrig Fixed a typo: thought => though ff4200f
@DennisKehrig DennisKehrig Use double quotes instead of single quotes d021778
@RaymondLim RaymondLim Merge pull request #1797 from adobe/randy/live-preview-unsaved-css
reload unsaved changes to related files
1d15df2
@RaymondLim RaymondLim Limit the project context menu to the project tree only. f81c1cd
@jasonsanjose jasonsanjose add VERSION, VERSION_MAJOR, VERSION_MINOR, and VERSION_PATCH string c…
…onstants
160456c
@RaymondLim RaymondLim Merge pull request #1799 from adobe/garthdb/auto-reload-live-preview
Garthdb/auto reload live preview
0f02c4a
@jasonsanjose jasonsanjose update translations to use VERSION_MINOR 5c30c20
@jasonsanjose jasonsanjose fix indentation 5651e28
Commits on Oct 09, 2012
@RaymondLim RaymondLim merge from master 65fce57
@RaymondLim RaymondLim Merge branch 'rlim/auto-reload-live-preview' of https://github.com/ad…
…obe/brackets into rlim/auto-reload-live-preview
8066bc4
@jasonsanjose jasonsanjose separate tab width and indentUnit settings 8b807aa
@redmunds redmunds decrease nav bar responsive breakpoint 590681a
@RaymondLim RaymondLim Add a new context menu for working set list with two menu items -- Cl…
…ose and Save.
40a9b3d
@redmunds redmunds Merge pull request #1802 from adobe/rlim/side-bar-context-menu
Limit the project context menu to the project tree only.
6f7d0ed
@redmunds redmunds remove comment c2ec521
@redmunds redmunds Merge pull request #1801 from adobe/jasonsanjose/statusbar
Implement indentation type and size preferences
1c2b989
@RaymondLim RaymondLim merge from master 1160a52
@redmunds redmunds Merge pull request #1778 from adobe/rlim/auto-reload-live-preview
Add out-of-sync state icons to LIve Preview and toggle it based on dirty flag.
d1bb847
@redmunds redmunds improve test window layout at default size b0ceb12
@RaymondLim RaymondLim Merge pull request #1791 from adobe/glenn/issue-1786
Don't collapse project folders if a rename fails
73c92ff
@jasonsanjose jasonsanjose refactor StatusManager to allow EditorManager to control initializati…
…on. Fixes unit test failures
ef215ef
@jasonsanjose jasonsanjose Revert "refactor StatusManager to allow EditorManager to control init…
…ialization. Fixes unit test failures"

This reverts commit ef215ef.
8988d70
@jasonsanjose jasonsanjose refactor StatusManager to allow EditorManager to control initializati…
…on. Fixes unit test failures
c72657f
@jasonsanjose jasonsanjose refactor mock editors into SpecRunnerUtils 3acc237
Commits on Oct 10, 2012
@redmunds redmunds Merge pull request #1807 from adobe/jasonsanjose/statusbar-refactor
Fix unit tests. Refactor StatusManager and EditorManager init
ae3fc3f
@walfgithub walfgithub Updated by ALF automation. 26d7178
@DennisKehrig DennisKehrig Improved comments 4b9a6ed
@RaymondLim RaymondLim Merge pull request #1769 from DennisKehrig/dk/issue-1256
Fixes #1256
444ae4d
@jasonsanjose jasonsanjose Move {VERSION} constant into ABOUT_TEXT_LINE1 for all languages a2427a1
@redmunds redmunds Merge pull request #1803 from adobe/jasonsanjose/issue-1734
Add VERSION_MINOR string constant
a684326
@jasonsanjose jasonsanjose count columns, account for tab size 5b0aaa9
@redmunds redmunds Merge pull request #1810 from adobe/jasonsanjose/issue-1773
count columns, account for tab size
21ea45d
Commits on Oct 11, 2012
@peterflynn peterflynn "Show in Tree" command:
- General purpose showInTree() API (any file/folder)
- "Show in Tree" command (current file)
- Utility for searching arrays (new CollectionUtils module): used in new
  code plus cleans up a DocumentManager method
0e701a1
@gruehle gruehle Merge pull request #1804 from adobe/randy/test-window-nav
Improve test window layout at default size on Mac
8475ebe
@walfgithub walfgithub Updated by ALF automation. a2ad4fb
@mcorlan mcorlan Merge remote-tracking branch 'upstream/master' aa97ba1
@mcorlan mcorlan Exposing the delete selected line(s) through menu
Changed the code to be exposed in the Edit Menu;
Shortcut chaged to Cmd-Shift-D (Ctrl-Shift-D);
97395a7
@jdiehl jdiehl several bugfixes from in-browser branch 86e391d
@jasonsanjose jasonsanjose Merge pull request #1813 from jdiehl/bugfixes-from-in-browser
Here are the bugfixes from the in-browser branch
36a8a03
@njx njx Fix exception if document has no extension 304e2c6
@jasonsanjose jasonsanjose Merge pull request #1816 from adobe/nj/fix-exception
Fix exception if document has no extension
73c850b
@RaymondLim RaymondLim Update live preview icon for any document that does not have .css ext…
…ension.

Also update it only if live preview is on.
6c67f9c
@njx njx Update hidden lines when syncing a change from the current editor int…
…o the document
301289b
@jasonsanjose jasonsanjose change indent width UI b5494e2
@jasonsanjose jasonsanjose fix indentation in brackets.less a464e44
@jasonsanjose jasonsanjose add tooltip to indent width d0f214f
Commits on Oct 12, 2012
@jasonsanjose jasonsanjose code review comments 7f10739
@redmunds redmunds Merge pull request #1818 from adobe/jasonsanjose/statusbar
Change indent width UI
c54b102
@RaymondLim RaymondLim Simplify the logic that checks for non-css document. a6ad852
@walfgithub walfgithub Updated by ALF automation. 7ef4f2f
@jbalsas jbalsas Creates a resizing div on top to avoid cursor overrides while resizing 9adf432
@redmunds redmunds Merge pull request #1763 from mcorlan/master
Adding support for delete entire line/lines
5eddb2a
@gruehle gruehle Merge pull request #1819 from adobe/rlim/live-development-issues
Update live preview icon for any document that does not have .css extens...
ec7a30c
@redmunds redmunds Merge pull request #1820 from jbalsas/jbalsas/resizing-styles
Fix for mouse cursor overrides while resizing panels
9f3237f
@brucardoso2 brucardoso2 Fixed pt-br to be included in nls/strings.js.
Also added new strings and fixed some minor typos.
104014c
@redmunds redmunds Merge pull request #1781 from adobe/pflynn/incremental-search
Incremental search while typing in the Find bar
a5c0f96
@njx njx Move call to _updateHiddenLines() out of _duringSync guard. Code clea…
…nup.
87ccfbe
@peterflynn peterflynn Merge pull request #1817 from adobe/nj/issue-1031
Update hidden lines when syncing a change from the current editor into the document
f30d143
@RaymondLim RaymondLim Add a new unit test for syncing html changes and reapplying css chang…
…es after saving html document.
72f8985
@njx njx Add animated spinner to status bar d1e4284
@redmunds redmunds Merge pull request #1828 from adobe/nj/issue-1758
Add animated spinner to status bar
0f7bce3
@peterflynn peterflynn - Make 'show in tree' label / command name less generic
- Fix bug in _findTreeNode(): return rejected Promise instead of null when
  path lies outside project tree
1a33aa5
@redmunds redmunds Merge pull request #1823 from adobe/pflynn/show-in-tree
"Show in Tree" command
b1d87a6
Commits on Oct 13, 2012
@njx njx Fix Document unit test by avoiding creation of master editor if focus…
… is in an inline editor when the status bar requests the cursor position.
ed23146
@njx njx Use absolute positioning for status bar areas so they clip rather tha…
…n wrapping when window size is small horizontally
356defe
@walfgithub walfgithub Updated by ALF automation. 3158bc9
@peterflynn peterflynn Merge pull request #1830 from adobe/nj/fix-document-unit-test
Fix Document unit test by avoiding creation of master editor if focus is...
5bfdca5
@redmunds redmunds missed a case when I added a new param f63c0fc
@RaymondLim RaymondLim Shorten timeouts from 15 seconds to 3 seconds 3f855b3
Commits on Oct 14, 2012
@jbalsas jbalsas Sprint15 strings c33b0c9
@jbalsas jbalsas Fix typos 85e071a
Commits on Oct 15, 2012
@redmunds redmunds Merge pull request #1834 from adobe/nj/issue-1832
Use absolute positioning for status bar areas so they clip rather than...
c0a7d31
@gruehle gruehle Remove CSS hacks for fixing gradient drawing on retina screens. 0026618
@GarthDB GarthDB adjusted styles for input on the tab/spaces c04af6d
@gruehle gruehle Merge pull request #1827 from adobe/rlim/html-preview-unit-test
Add a new unit test for syncing html changes and reapplying css changes ...
3a70f8d
@GarthDB GarthDB fixed sizing on the statusbar input and label so that the number does…
…nt move when switching between the two
a97fed7
@peterflynn peterflynn Merge remote-tracking branch 'origin/master' into pflynn/no-editor-fl…
…ex-box

* origin/master: (482 commits)
  ...

Conflicts:
	src/styles/brackets.less
e258103
@njx njx Merge pull request #1841 from adobe/garthdb/statusbar
Garthdb/statusbar
6a45c24
@njx njx Merge pull request #1840 from adobe/glenn/issue-1615
Remove CSS hacks for fixing gradient drawing on retina screens
2facc30
@njx njx Merge pull request #1835 from adobe/randy/fix-codehint-unit-test
fix code hints unit tests
74c3371
@redmunds redmunds stop searching a file once we reach max hits 0092d1d
Commits on Oct 16, 2012
@peterflynn peterflynn Fixes to flex-box-free layout:
* Use margin to keep content from overlapping the floated sidebar, which
broke the sidebar (toolbars drew on top of it and CodeMirror blocked all
mouse events on it).
* Fix bugs where window resize didn't kick layout enough. Now uses same
codepath as other things that resize the editor area.
* Correctly resize the "no-editor" placeholder
* Generalize _calcEditorHeight() so ALL sibling panels/toolbars are taken
into account, including those that extensions might add.
* Clarify docs in a few places
2caf138
@gruehle gruehle Disable horizontal scrolling in working set view. a060175
@redmunds redmunds remove console.log debug statement 9bd7ae8
@redmunds redmunds hide status bar when ther is no editor b14ea46
@redmunds redmunds changes for code review 6493f0e
@gruehle gruehle Merge pull request #1844 from adobe/randy/issue-1829
Find In Files: stop searching a file once we reach max hits
9712991
@redmunds redmunds code review changes 976083c
@jasonsanjose jasonsanjose Merge pull request #1824 from brucardoso2/master
Fixed pt-br Translation option.
b2b20fd
@gruehle gruehle Merge pull request #1848 from adobe/randy/issue-1843
hide status bar when there is no editor
46ee013
@jasonsanjose jasonsanjose Merge pull request #1839 from jbalsas/jbalsas/spanish-loc-sprint15
Spanish sprint15 translation
b24ea3e
@DennisKehrig DennisKehrig Improved error message when trying to overwrite an existing key binding e14182f
@gruehle gruehle Merge pull request #1851 from DennisKehrig/dk/key-bindings
Improved error message when trying to overwrite an existing key binding
22f5ff9
@jasonsanjose jasonsanjose Fix indent in nls/fr/strings.js. Fix merge conflicts from ALF.
Merge remote-tracking branch 'origin/alf' into jasonsanjose/sprint-15-french

Conflicts:
	src/nls/fr/strings.js
9937d13
@jasonsanjose jasonsanjose Merge pull request #1853 from adobe/jasonsanjose/sprint-15-french
Manual merge of sprint 15 french translation
bbc221d
@DennisKehrig DennisKehrig Bugfix: run AppInit._dispatchReady AFTER loading the extensions, as i…
…ntended
5d57b51
@peterflynn peterflynn Fixes to flexbox-less editor layout:
* Fix bug where hiding sidebar entirely didn't update .content left/width
(SidebarView change).
* Fix bug where no-editor placeholder didn't appear on launch if no open
files were restored (EditorManager change).
* Remove unused EditorManager._resizeTimeout & rename _updateEditorSize()
for clarity
* Add note in main-view.html about assumptions/requirements imposed on
.content children's layout
8a3bac9
@jasonsanjose jasonsanjose Merge pull request #1854 from DennisKehrig/dk/issue-1526
Bugfix: run AppInit._dispatchReady AFTER loading the extensions
b8fd540
@RaymondLim RaymondLim Merge pull request #1845 from adobe/glenn/issue-1789
Disable horizontal scrolling in working set view.
0beaa9f
@DennisKehrig DennisKehrig Improved error message when trying to use a modifier twice in a shortcut 9d204d7
Commits on Oct 17, 2012
@peterflynn peterflynn Clarify comment in main-view re requirements for .content's children addb846
@redmunds redmunds Merge pull request #1847 from adobe/pflynn/no-editor-flex-box
Stop using flexbox in editor's parent hierarchy
afe3456
Adam Lehman Switch to spaces instead of tabs. Cleaned up JSLint errors. Removed r…
…edundant style properties.
ae4c3db
Adam Lehman Merge branch 'master' of https://github.com/adobe/brackets into adroc…
…k/recent-delete
e0f2674
@redmunds redmunds Merge pull request #1757 from adobe/adrock/recent-delete
Added button to remove projects from the recent project dropdown.
772fec1
@RaymondLim RaymondLim Merge pull request #1856 from DennisKehrig/dk/key-bindings
Improved error message when trying to use a modifier twice in a shortcut
6f11840
@peterflynn peterflynn Fix bug #1627 ("Go to Definition" prepopulated text doesn't work when
activated via menu) -- There are two problems at play. First, smart-autocomplete
only listens for key events, not programmatic or other textfield changes,
so we need to kick it to generate results for the prepopulated text.

Second, the results are generated asynchronously while QuickOpen's auto-"focus"
is synchronous. That bug is not fixed here since it's related to a whole
tangle of async issues in #1855.

Fixing the first bug alone means that hitting Enter now goes to the correct
result (instead of doing nothing), but that the editor doesn't auto-scroll
to that result as soon as the search bar is opened.

This commit also cleans up QuickOpen to use KeyEvent consts for key codes.
4114555
@peterflynn peterflynn Fix bug #1849 (Incremental Find doesn't clear highlight when search c…
…hanges

to no results)

Clear selection when no results found in file. Leave cursor where selection
used to be, which typically was the location of an earlier matching result
from before the query was done being typed. (This seems consistent with how
incremental search works in other editors & browsers).
56ad4c7
@peterflynn peterflynn * Simplify command name:
  Delete Selected Line(s)  ->  Delete Line(s)
* Fix several bugs in JSDoc type annotations
* Add WinXP instructions as a comment inside setup_for_hacking.bat
e92773e
@RaymondLim RaymondLim Return an empty tag info for an empty space entered inside plain text. 9294758
@gruehle gruehle Merge pull request #1865 from adobe/pflynn/issue-1849
Fix bug #1849 (Incremental Find doesn't clear highlight when search changes to no results)
9a2f572
@RaymondLim RaymondLim Fixed a typo. coment --> comment f9e11a4
Commits on Oct 18, 2012
@gruehle gruehle Fix unit tests. aae946d
@redmunds redmunds Merge pull request #1871 from adobe/glenn/fix-unit-tests
Fix unit tests.
4425b9b
@redmunds redmunds Merge pull request #1867 from adobe/rlim/hint-issue-1519
Return an empty tag info for an empty space entered inside plain text.
99e247c
@gruehle gruehle Fix problem where _currentDocument.file.fullPath was being updated tw…
…ice.
8d32f56
@RaymondLim RaymondLim Merge pull request #1872 from adobe/glenn/issue-1870
Fix problem where _currentDocument.file.fullPath was being updated twice...
6a034b2
@RaymondLim RaymondLim Get the html tag name from token.state.html for php documents, not fr…
…om token.state.htmlState.
182f5b8
@peterflynn peterflynn Safer focusedEditorChanged event:
* Revert main-editor-swapping codepath back to how it used to work, mostly
disentangled from focus events.
* Don't fire focusedEditorChanged on the many times focus returns to the
same Editor that had it last (due to window reactivation, closing a dialog,
closing a search bar, etc.). All the current use cases for this event don't
care about those cases. Add more detailed docs on event cases.
* Simplify how Editor signals focus: trigger only from "onFocus" (a superset
of the other case), and remove _internalFocus flag that was guarding against
the overlap.
* Don't call resizeEditor() on every editor swap just because statusbar
*might* have been shown/hidden: only call when statusbar actually did
change (going to/from no editor). Fixes scrolling issue in #1864.

#1257 still isn't 100% fixed: there are at least two cases where getFocusedEditor()
lags behind the focusedEditorChanged event: opening an inline editor; and
moving focus from open inline editor to its host editor. These same cases -
and a number of others - were broken before this change, however.
4a34b88
@RaymondLim RaymondLim Update CodeMirror SHA 40e427f
@peterflynn peterflynn Code review fix: focusedEditorChange was passing wrong last arg to its
listeners.
And add a couple more docs.
9a2c59c
@peterflynn peterflynn Code review fix: move XP-specific setup_for_hacking instructions into XP
error message that the script prints, and move check for missing argument
before XP check to ensure that XP message doesn't print misleading paths.
6f8a981
@jasonsanjose jasonsanjose Merge pull request #1877 from adobe/refs/heads/pflynn/focusedEditorCh…
…ange

Safer focusedEditorChanged event
453b199
@redmunds redmunds Merge pull request #1875 from adobe/rlim/code-hints-for-php
Get the html tag name from token.state.html for php documents
2838cb9
@redmunds redmunds Merge pull request #1864 from adobe/pflynn/issue-1627
Fix bug #1627 ("Go to Definition" prepopulated text doesn't work via menu)
285bd6b
@gruehle gruehle Merge pull request #1866 from adobe/pflynn/cleanups
Tweak label, plus small docs fixes
fcd8716
@RaymondLim RaymondLim Fix the live preview unit test failure on Mac 10.6 c493e8d
@peterflynn peterflynn Revert "Fixes #510: Middle-click in inline editor's chrome scrolls vi…
…ew & breaks editor"

This reverts commits b07a892 & its follow-up 57cc31c.

This was causing bugs with focusing/clicking in input fields: #1883 and #1794.
152a754
@gruehle gruehle Merge pull request #1884 from adobe/pflynn/fix-click-focus
Fix #1883 (Can't type into text input fields in extentions)
fbfd13c
Commits on Oct 19, 2012
@jasonsanjose jasonsanjose Comment out failing unit test due to possible async issues with DOMAgent 0892232
@redmunds redmunds Merge pull request #1882 from adobe/rlim/live-preview-unit-test
Fix the live preview unit test failure on Mac 10.6
7e25465