Commit graph

892 commits

Author SHA1 Message Date
CHaBou
3e632577e5
Merge branch 'master' into xterm-linted
* master:
  Fix yarn.lock (#2194)
  Fix for keymapping bug on Linux and Windows (#2189)
  Set session CWD only if there is an active session (#2191)
  Upgrade Electron to v1.7.6 (#2193)
  Fix plugin path in dev mode (#2192)
2017-09-11 23:14:13 +02:00
Albin Ekblom
48f5b6e08f Fix yarn.lock (#2194) 2017-09-11 16:06:24 +02:00
Lucas
3bca7c2891 Fix for keymapping bug on Linux and Windows (#2189)
* Fix for keymapping bug on Linux and Windows

In response to issue #2156, the keymapping conflict has been removed from linux.json and win32.json in the app/keymaps/ directory. Now the keymap for window close is ctrl+shift+q and the keymap for pane close is ctrl+shift+w.

* Fix for failed test on initial commit.
2017-09-11 15:09:17 +02:00
Harrison Harnisch
b5f06759ee Set session CWD only if there is an active session (#2191) 2017-09-11 15:06:44 +02:00
CHaBou
01f7779646 Upgrade Electron to v1.7.6 (#2193) 2017-09-11 10:08:32 +02:00
CHaBou
3b1ec4e435 Fix plugin path in dev mode (#2192)
When a dev config (<project_dir>/.hyper.js) is used, plugins should be searched/installed in <project_dir>/.hyper_plugins directory
2017-09-10 19:20:52 -04:00
CHaBou
1155bb54b1
Add prettier and resolve all lint errors 2017-09-10 16:04:13 +02:00
CHaBou
0fbf7cfc97
Merge branch 'master' into xterm
* master:
  Add default keymaps reference to documentation (#2185)
  Add category option under linux key in root package.json (#2184)
  Add vscode debug config, update readme (#2181)
  Get default config options when not specified in user config (#2126)
  Fix session cleaning (#2176)
  Delete .DS_Store file (#2171)
2017-09-10 13:53:33 +02:00
CHaBou
df68daaaba
Translate automatically hterm css class in config
Change css class name in config after plugin decoration for partial backward compatibility
2017-09-10 13:46:59 +02:00
CHaBou
a9bb9b697b
Add depreaction warning for hterm css
* Notify user when its config conatins deprecated CSS classes
* Add warning in devtools console about plugins using deprecated classes
2017-09-10 11:35:39 +02:00
CHaBou
c91c025edd
Fix horizontal split and term resize 2017-09-09 13:42:19 +02:00
Junior Oliveira
6d68278b60 Add default keymaps reference to documentation (#2185) 2017-09-08 23:05:07 +02:00
Lucas
26a9823def Add category option under linux key in root package.json (#2184)
Fix #2097
2017-09-07 14:10:04 +02:00
Chris Chou
da395a8f39 Add vscode debug config, update readme (#2181) 2017-09-07 11:06:05 +02:00
Jan Okoński
be5786ef12 Get default config options when not specified in user config (#2126) 2017-09-06 22:58:09 +02:00
CHaBou
f6bfbdf170 Fix session cleaning (#2176)
Regression introduced by #2028
2017-09-06 01:19:37 +02:00
CHaBou
b5eb437751 Use config.colors for 16 first ANSI colors 2017-09-05 18:29:37 +02:00
CHaBou
52bb0d9b3d
Fix term background and scrollbar 2017-09-04 21:42:43 +02:00
CHaBou
0174e1931a Delete .DS_Store file (#2171)
File inavertenty commited in #2114
2017-09-04 21:13:07 +02:00
CHaBou
944f9d7e89
Merge branch 'master' into xterm
* master: (62 commits)
  1.4.3
  Disable ia32 linux releases (#2164)
  Fixed writing composed characters (#2158)
  Doc: Add yarn install to contribute instructions (#2117)
  Change "Close Session" shortcut on Linux/Windows  (#2160)
  Notice for plugins (#2114)
  Updated dependencies to the latest version (#2146)
  1.4.2
  Reverted class names to as they were before (#2139)
  1.4.1
  AppVeyor environment variables are now on the platform (#2137)
  Brought back the icon for closing tabs (#2136)
  Brought back keymap documentation to the website (#2133)
  1.4.0
  Don't build on master, except for releases (#2132)
  Ensured that `async-retry` is added to the bundle (#2131)
  Ensure correct update channel is displayed in About window (#2130)
  Retry loading it if config doesn't exist in auto updater (#2129)
  Write contents of default config to hyper.js (#2128)
  Use a string for setting the update channel (#2127)
  ...
2017-09-03 22:18:43 +02:00
CHaBou
b656bba285 real xterm and keymap (#1983)
* Use real xterm and intercept shortcuts

* Update xterm.css for selection feature
2017-09-03 21:15:33 +02:00
Leo Lamprecht
af7dc1b9c4 1.4.3 2017-09-03 18:28:39 +02:00
CHaBou
e2d0f825c6 Disable ia32 linux releases (#2164)
Fix #2161
Fix #2150
2017-09-03 18:26:22 +02:00
CHaBou
a348185cc5 Fixed writing composed characters (#2158)
Fixes #2140
2017-09-03 18:06:12 +02:00
Ian
537e58ec10 Doc: Add yarn install to contribute instructions (#2117) 2017-09-03 17:48:48 +02:00
Louis Arge
843ebd2fe0 Change "Close Session" shortcut on Linux/Windows (#2160)
Fix #2156
2017-09-03 17:47:09 +02:00
Philippe Potvin
d2167073df Notice for plugins (#2114)
* add notes for plugins

* rm spaces
2017-08-31 20:24:37 -04:00
Leo Lamprecht
0ee4fb6104 Updated dependencies to the latest version (#2146)
* Bumped dependencies to the latest version

* Bumped root lockfile

* Bumped app dependencies

* Fixed linting

* No command line switch needed anymore for native async/await

* Fixed color error

* Bumped Node.js versions for CI

* Downgraded hterm-umdjs

* Try to fix the AppVeyor build

* Made colors work again
2017-08-31 15:20:39 +02:00
Leo Lamprecht
cfbae08e4f 1.4.2 2017-08-30 22:59:43 +02:00
CHaBou
e698bbc961 Reverted class names to as they were before (#2139)
This fixes #2135
2017-08-30 22:59:01 +02:00
Leo Lamprecht
4351d86144 1.4.1 2017-08-30 21:59:43 +02:00
Leo Lamprecht
3aceb14357 AppVeyor environment variables are now on the platform (#2137) 2017-08-30 21:58:28 +02:00
Leo Lamprecht
5ceca9e200 Brought back the icon for closing tabs (#2136) 2017-08-30 21:51:45 +02:00
CHaBou
df7b0df4ab Brought back keymap documentation to the website (#2133)
Revert #2103
2017-08-30 21:05:11 +02:00
Leo Lamprecht
e90ad48a05 1.4.0 2017-08-30 19:51:25 +02:00
Leo Lamprecht
f9624cc3ab Don't build on master, except for releases (#2132) 2017-08-30 19:39:04 +02:00
Leo Lamprecht
affa50343e Ensured that async-retry is added to the bundle (#2131) 2017-08-30 19:26:28 +02:00
Leo Lamprecht
356f93ff04 Ensure correct update channel is displayed in About window (#2130) 2017-08-30 19:14:28 +02:00
Leo Lamprecht
a2d4936e50 Retry loading it if config doesn't exist in auto updater (#2129)
* Made it easier

* Return the config

* Missing semicolon added

* Fixed the linting
2017-08-30 18:54:45 +02:00
Albin Ekblom
26abc6bd15 Write contents of default config to hyper.js (#2128) 2017-08-30 14:33:31 +02:00
Leo Lamprecht
6b886afc36 Use a string for setting the update channel (#2127)
* Adjusted config option

* Accept new config value
2017-08-30 14:12:59 +02:00
Philippe Potvin
300f7cbde4 Plugins revamp (#2108)
* extentions file

* plugs folder creation
2017-08-21 20:07:50 -04:00
Leo Lamprecht
5300b77813 Tell Yarn to cache dependencies (#2113)
* Tell Yarn to cache dependencies

* Updated license year
2017-08-22 01:07:48 +02:00
Leo Lamprecht
ec8bd4ef99 Only publish for tags (#2112)
* Only publish for tags

* Tell Yarn the right thing
2017-08-22 00:27:58 +02:00
CHaBou
8a3e002aa5 Made Circle CI builds work (#2110)
* Add CircleCI Badge

* Fix typo

* Replace yarn by npm

* Replace yarn by npm

* Always generate the artifacts

* Use yarn for everything

* Also pin dependencies with Yarn

* Install yarn

* Adjusted config

* Only copy ZIP file

* Only build our branches

* Prevent Travis from building on macOS
2017-08-22 00:04:15 +02:00
Philippe Potvin
b5e9496d18 Use Circle CI for macOS builds (#2105)
* base circle

* use xcode
2017-08-21 22:14:19 +02:00
Benjamin Staneck
0df4ae07cb Update node-pty to 0.7.0 (#2109)
Changelog: https://github.com/Tyriar/node-pty/releases/tag/0.7.0
2017-08-21 15:35:10 -04:00
CHaBou
b92bc1ec6f Temporarily hide keymaps from documentation (#2103) 2017-08-21 00:50:56 +02:00
Leo Lamprecht
fa1b607026 Show update channel in About window (#2102)
* Show update channel in About window

* Improved syntax
2017-08-20 13:03:13 +02:00
Leo Lamprecht
a0713f86e8 Added config switch for update channel (#2101) 2017-08-20 12:18:42 +02:00