github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-25 14:59:03 -05:00
Code Issues Packages Projects Releases Wiki Activity
24,811 Commits 140 Branches 571 Tags
fac979f71d2cd2396ffb8d1246d70d466f074909
Commit Graph

24811 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maxim Sokolov
fac979f71d 📝 Update docs for TextEditor::addGutter 
TextEditor::addGutter should be called directly.
 2015-08-28 16:54:14 +03:00
simurai
ff93fdf617 Merge pull request #8537 from atom/as-gutter-z-index 
Gutter z-index
 2015-08-28 17:31:58 +09:00
Antonio Scandurra
340fe7e534 📝 Fix wording on specs 
Thanks, @maxbrunsfeld! 🎆
 2015-08-28 09:45:55 +02:00
Nathan Sobo
a5c0cd2030 Merge pull request #8547 from atom/ns-clean-up-max-scroll-margin 
Clean up max scroll margin code
 2015-08-27 18:58:09 -06:00
Kevin Sawicki
b61a450170 Prepare 1.0.9 2015-08-27 16:48:21 -07:00
Nathan Sobo
314e082f1d Clean up max scroll margin code 
Previously we were attempting the same computation twice, once
incorrectly when returning the scroll margins as integers and then doing
the same thing in terms of pixels. This just cleans up the original
calculation. It’s *slightly* different because it takes the floor to
continue returning integers, but the behavior is extremely close.
 2015-08-27 17:40:01 -06:00
Max Brunsfeld
9cb70ffa46 Revert "⬆️ language-javascript@0.91.0" 
This reverts commit 2d28be38d8.
v1.0.8 		2015-08-27 10:28:31 -07:00
Max Brunsfeld
653680c297 Revert "⬆️ language-html@0.41.1" 
This reverts commit 465aceadfc.
 2015-08-27 10:28:10 -07:00
Wliu
465aceadfc ⬆️ language-html@0.41.1 
Fixes failing specs due to a recent language-javascript change
 2015-08-27 12:52:39 -04:00
Nathan Sobo
cd4726bb27 Merge pull request #8536 from atom/as-redundant-screen-range-calls 
Remove redundant calls to buffer-to-screen conversion methods
 2015-08-27 10:20:25 -06:00
Wliu
2d28be38d8 ⬆️ language-javascript@0.91.0 2015-08-27 11:36:23 -04:00
Wliu
707fbf2552 ⬆️ language-c@0.47.1 2015-08-27 11:26:22 -04:00
Antonio Scandurra
fa28aef2b5 Put a decreasing z-index on line numbers 2015-08-27 12:47:43 +02:00
Antonio Scandurra
9ea62673d2 Put a decreasing z-index on line-numbers tiles 2015-08-27 12:15:55 +02:00
Antonio Scandurra
ca285d3fe3 💚 Correct typo in container's height specs 2015-08-27 12:12:45 +02:00
Antonio Scandurra
423c3d945e 🐎 Remove redundant calls to screen conversion methods 2015-08-27 11:37:23 +02:00
Max Brunsfeld
b15b103ba0 ⬆️ grunt-download-atom-shell 2015-08-26 17:41:57 -07:00
Nathan Sobo
e65a7580e7 Merge pull request #8531 from atom/ns-auto-create-last-selection 
Create a selection automatically as needed if the last one was destroyed
 2015-08-26 18:40:05 -06:00
Max Brunsfeld
ae238b02f6 ⬆️ tree-view 2015-08-26 17:10:34 -07:00
Nathan Sobo
4bbc1d806e Create a selection automatically as needed if the last one was destroyed 
Fixes atom/bracket-matcher#102
 2015-08-26 17:59:33 -06:00
Nathan Sobo
6bfa228060 Merge pull request #8520 from atom/as-lines-height 
Change lines container height based on `TextEditorElement` dimensions
 2015-08-26 17:21:52 -06:00
Kevin Sawicki
91dfedf489 Merge pull request #8530 from atom/ks-upgrade-apm-for-windows-build-path-length-issues 
Upgrade apm for Windows path length issues
 2015-08-26 16:05:07 -07:00
Max Brunsfeld
4f397af758 ⬆️ fuzzy-finder 2015-08-26 16:02:48 -07:00
Max Brunsfeld
014243637b Merge pull request #8527 from atom/mb-add-child-root-folder 
Allow adding a root folder that's within another root folder
 2015-08-26 15:44:30 -07:00
Kevin Sawicki
2e46599855 ⬆️ apm@1.0.4 2015-08-26 15:28:26 -07:00
Max Brunsfeld
6df058c7f3 Allow adding a root folder that's within another root folder 2015-08-26 15:26:02 -07:00
Max Brunsfeld
24b4979dda Merge pull request #8526 from jacekkopecky/fix-8486 
use undo in IME composition
 2015-08-26 14:42:53 -07:00
Jacek Kopecky
3a81414155 🔥 redundant old tests 2015-08-26 21:52:01 +01:00
Max Brunsfeld
d5e4c01e0a ⬆️ tree-view 2015-08-26 13:21:02 -07:00
Jacek Kopecky
e4b189c6c0 add tests 2015-08-26 21:04:09 +01:00
Max Brunsfeld
0310ccb6e5 ⬆️ grunt-download-atom-shell 
Fixes https://github.com/atom/atom/issues/8525
 2015-08-26 12:35:18 -07:00
Jacek Kopecky
763d871470 use undo in IME composition 2015-08-26 20:28:23 +01:00
Wliu
fb7c62fd05 ⬆️ language-javascript@0.90.0 2015-08-26 12:51:15 -04:00
Nathan Sobo
1827aebc4b Merge pull request #8497 from ssorallen/menu-item-doc 
Document MenuItem `enabled` and `visible`
 2015-08-26 10:40:41 -06:00
Max Brunsfeld
f602a6b726 ⬆️ event-kit 
Refs atom/event-kit#16
 2015-08-26 09:21:32 -07:00
Ross Allen
28f157acd9 Document MenuItem enabled and visible 
The Electron MenuItem[1] `enabled` and `visible` options are exposed to
Atom context menus in menu_helpers.coffee[2] but are not yet documented.
Both options are passed through to Electron.

[1] http://electron.atom.io/docs/v0.31.0/api/menu-item/
[2] https://github.com/atom/atom/blob/v1.0.7/src/menu-helpers.coffee#L49
 2015-08-26 09:00:23 -07:00
Antonio Scandurra
b5c0f5ac0b Change lines container height based on boundingClientRect 2015-08-26 16:21:51 +02:00
simurai
a2a1f0c660 ⬆️ notifications@v0.59.0 2015-08-26 13:40:07 +09:00
Max Brunsfeld
f0e4da68af Merge pull request #8397 from jonathandelgado/master 2015-08-25 15:08:22 -07:00
Max Brunsfeld
b9ca563c3c Don't use fixture file in openEmptyEditorOnStart spec 2015-08-25 14:24:11 -07:00
Max Brunsfeld
73ae26bfb6 Merge pull request #8507 from atom/tj-bump-symbols-view 
Bump symbols-view to v0.103.0
 2015-08-25 12:50:32 -07:00
Thomas Johansen
499f920638 Rename .ctags file to ctags-config in unpack list 
Necessary since the file was renamed in symbols-view@0.103.0.
 2015-08-25 21:45:39 +02:00
Thomas Johansen
3f49d9aa00 ⬆️ symbols-view@0.103.0 2015-08-25 21:44:34 +02:00
Max Brunsfeld
6c73f5eda7 Merge branch 'master' of https://github.com/jonathandelgado/atom into jonathandelgado-master 2015-08-25 12:36:58 -07:00
Max Brunsfeld
67fd9cf246 Merge pull request #8506 from atom/mb-fix-multi-cursor-undo 
Fix multi cursor undo
 2015-08-25 12:09:55 -07:00
Max Brunsfeld
4180c81706 ⬆️ text-buffer 2015-08-25 11:13:00 -07:00
Max Brunsfeld
f57da0c6f8 Suppress merging selections during undo/redo 
Now, during undo/redo overlapping selections will be temporarily
created as markers are created via snapshots. Old selections will
immediately be destroyed though, since undo/redo now completely
replace all historied markers w/ those in the snapshot, so there
is no need to merge selections.
 2015-08-25 10:51:45 -07:00
Max Brunsfeld
b8aec9db7c Fix display buffer spec for new historied marker behavior 2015-08-25 10:50:05 -07:00
Max Brunsfeld
bf20370f52 ⬆️ text-buffer (pre-release) version 2015-08-25 10:49:30 -07:00
Max Brunsfeld
5f7a0a32aa Merge pull request #8480 from jeremyramin/fix-config-get 
Fix config.get for schemas with objects
 2015-08-25 09:15:43 -07:00