github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-23 22:08:08 -05:00
Code Issues Packages Projects Releases Wiki Activity
30,627 Commits 140 Branches 571 Tags
f9dfabfdff3bd3b47be663839b6273aebb7bdf8d
Commit Graph

30627 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nathan Sobo
f9dfabfdff Merge pull request #13194 from farnabaz/master 
fix text selection and cursor position in lines with rtl text
 2016-12-15 15:37:54 -07:00
Nathan Sobo
b087ab2734 Disable measurement tests for RTL text on Windows 
@damieng This is unlike the other tests in this file in that none of the
assertions pass. Maybe you could take a look at some point to enable at
least some coverage on Windows for this?
 2016-12-15 03:16:21 -07:00
Nathan Sobo
feb60ca0d3 Merge branch 'master' into farnabaz-master 2016-12-14 13:34:21 -07:00
Nathan Sobo
4e7d13b227 Clean up tests 2016-12-14 13:30:34 -07:00
Damien Guard
6c89706472 Update build-status.md 2016-12-14 11:11:08 -08:00
Damien Guard
f124cf2029 Match CI shield style 2016-12-14 09:53:39 -08:00
Damien Guard
1200bfe6a1 Add CircleCI, clarify Travis over macOS 2016-12-14 09:52:16 -08:00
Damien Guard
ad77c319ad Merge pull request #13431 from atom/dg-use-npm-chromedriver 
Switch to npm provided chromedriver instead of manually downloaded
 2016-12-13 13:12:03 -08:00
Damien Guard
bd6e0715c0 ⬆️ electron-winstaller 2016-12-13 12:59:21 -08:00
Damien Guard
438168e62c Do not use the chromedriver wrapper as it spews to stdout 2016-12-13 12:13:47 -08:00
Damien Guard
aa2b32e29c Ensure chromedriver matches electron version during build 2016-12-13 10:13:22 -08:00
Nathan Sobo
270b078f67 ⬆️ atom-keymap 2016-12-13 10:12:23 -07:00
Damien Guard
59dfb9e54b Merge pull request #12929 from atom/wl-use-scripts-from-apm 
Redirect apm scripts to use the actual apm ones
 2016-12-12 19:05:21 -08:00
Damien Guard
ee778dd8f9 Merge pull request #13430 from atom/dg-switch-signing-keys 
Signing key changes for Windows
 2016-12-12 16:35:25 -08:00
Damien Guard
f25a718c02 Switch electron-chromedriver from GitHub download to npm install 2016-12-12 16:31:38 -08:00
Ian Olsen
f9c96818e6 Merge pull request #13272 from atom/fb-vjeux-fix-gutter-prepend 
Fix prepending multiple gutters at once
 2016-12-12 15:55:46 -08:00
Damien Guard
b83bb95b56 Merge pull request #13426 from atom/dg-portable-enhancement 
Portable mode enhancements
 2016-12-12 15:55:17 -08:00
Damien Guard
11ec60d203 Switch master to new key, old key on old env vars for stable/beta 2016-12-12 15:52:30 -08:00
Damien Guard
85481f49d4 Merge pull request #13429 from atom/dg-upgrade-squirrel 
⬆️ electron-winstaller
 2016-12-12 15:27:08 -08:00
Damien Guard
a08967028b ⬆️ electron-winstaller (squirrel) 2016-12-12 14:56:07 -08:00
Nathan Sobo
0a5f74a1df Merge pull request #11852 from MikeInnes/overlay-scroll 
Option for avoiding overlay movements
 2016-12-12 10:51:07 -07:00
Antonio Scandurra
a17cf6e822 Lock git-utils version to 4.1.2 
Using a weaker version constraint was causing npm to install version
4.1.4 of this module and, as a result, broke some specs
(21a56b8241/spec/git-repository-spec.coffee (L34)).

/cc: @damieng

Signed-off-by: Nathan Sobo <nathan@github.com>
 2016-12-12 17:11:02 +01:00
Wliu
21a56b8241 ⬆️ language-git@0.19.0 2016-12-12 10:44:42 -05:00
Nathan Sobo
953e8eec0e Merge branch 'master' into MikeInnes-overlay-scroll 2016-12-12 08:38:38 -07:00
Antonio Scandurra
bc0666db10 Merge pull request #13421 from philwyett-hemi/rpm_dev 
Multiple fixes for RPM and in docs RPM distros.
 2016-12-12 16:01:21 +01:00
Damien Guard
5a446ff467 Clean up portable mode, try local .atom before ATOM_HOME 2016-12-11 15:59:24 -08:00
Farnabaz
95edf2f174 Handle ranges with multiple rect in LineYardstick 2016-12-11 01:13:19 +03:30
Phil Wyett
76f08a8f26 Commit... 
* Fedora 22 is End Of Life (EOL), so no instructions needed.
 2016-12-10 15:46:50 +00:00
Phil Wyett
49526593a9 Commit... 
* Split instructions for Fedora and RHEL etc. i.e. yum and dnf.
* Never use --assumeyes or -y installing packages. atom 1.12.7 shows if
  this had been done by end users it would have caused them great issue.
 2016-12-10 15:38:15 +00:00
Phil Wyett
af4da948e9 Commit... 
* Correct requires for libXss across Fedora/RedHat (and derivatives) and SUSE.
 2016-12-10 15:14:24 +00:00
Damien Guard
9efae86238 Merge branch 'as-dg-remove-spacepen-from-reopen-project-list-view' 2016-12-09 16:44:35 -08:00
Lee Dohm
1a8681355e Merge pull request #13416 from MatthiasWinkelmann/patch-1 
Fix link in macOS build instructions
 2016-12-09 10:17:15 -08:00
Matthias Winkelmann
cd591caaf1 Fixed link (issue label is mac, not os-x) 2016-12-09 19:15:22 +01:00
Damien Guard
5496797728 Merge pull request #13415 from portal-chan/master 
Add desktop.ini to ignored names
 2016-12-09 09:49:37 -08:00
portal
5301c55669 Add desktop.ini to ignored names 2016-12-09 19:00:11 +02:00
Damien Guard
cf20aef9db Merge pull request #13412 from atom/dg-mb-fix-editor-focus-issue 
Fix issue where editor fails to regain focus
 2016-12-08 17:08:14 -08:00
Max Brunsfeld
6f4a506517 Remove InputComponent.getDomNode method 
Access the dom node directly in TextEditorElement instead

Signed-off-by: Damien Guard <damieng@github.com>
 2016-12-08 16:12:26 -08:00
Max Brunsfeld
efd20774de Make each atom-text-editor keep a consistent hidden input node for its lifetime 
Signed-off-by: Damien Guard <damieng@github.com>
 2016-12-08 16:05:45 -08:00
Nathan Sobo
89e3891d82 Merge pull request #13411 from atom/jf-suppress-editor-warning 
Suppress TextEditorScrollView scrolled when it shouldn't have warning
 2016-12-08 16:13:25 -07:00
Joe Fitzgerald
9be8373930 Remove console warning 
- Per @nathansobo, we’re not sure whether it’s even helpful to know this
 2016-12-09 10:03:42 +11:00
Ian Olsen
bf4e0d35ec ⬆️ atom-keymap@7.1.14 2016-12-08 11:58:47 -08:00
Ian Olsen
bb68969956 Merge pull request #13042 from steakknife/fix-renamed-mac-app 
macOS: Let atom.sh find itself when run from an .app
 2016-12-08 10:11:35 -08:00
Wliu
078df22811 ⬆️ bracket-matcher@0.85.0 
@ungb
 2016-12-08 00:22:16 -05:00
Antonio Scandurra
e228eb87cb Merge pull request #13386 from atom/as-cross-platform-lib-xss 
Replace `libXScrnSaver` with `libXss.so.1` in RPM package spec
 2016-12-07 11:29:53 +01:00
Antonio Scandurra
e777c0de8e Fix lint errors 2016-12-07 11:29:30 +01:00
Antonio Scandurra
37d9aa5f22 Merge pull request #13353 from atom/ks-electron-1-3-12 
Upgrade to Electron 1.3.13
 2016-12-07 11:26:13 +01:00
Damien Guard
9d553d2cfa Remove errant debugger call in spec 2016-12-06 22:30:01 -08:00
Kevin Sawicki
fab21bc51b ⬆️ electron@1.3.13 2016-12-06 15:58:34 -08:00
Kevin Sawicki
027f835199 ⬆️ electron@1.3.12 2016-12-06 15:57:58 -08:00
Damien Guard
60fc36a969 Improve array path matching in history 2016-12-06 14:29:14 -08:00