672 Commits

Author SHA1 Message Date
nightwing
4ec8aca648 do not split deltas in multiselct action 2016-12-15 23:29:19 +00:00
nightwing
b5d9105d06 fix order of ctrl-shift-p on mac 2016-12-15 20:49:40 +00:00
nightwing
301e424550 update ace 2016-11-28 10:58:00 +04:00
Lennart Kats
d1a563b5a4 Merge remote-tracking branch 'origin/master' into ide-code-formatting 2016-11-10 20:50:20 +00:00
Matthijs van Henten
878b3caa79 Merge remote-tracking branch 'origin/master' into release-ssoSecret-rotation 2016-11-09 22:03:11 +00:00
Matthijs van Henten
3cae944004 adds a test 2016-11-09 12:46:32 +00:00
Matthijs van Henten
ec1f3c7c2e wrap cookie signature directly 2016-11-08 16:42:56 +00:00
Lennart Kats
0f1974ab00 Respect watchers when formatting code 2016-10-27 09:28:44 +00:00
Tim Robinson
dda434d116 Merge pull request +14986 from c9/all-allow-numbers-in-provider
Allow numbers in provider so c9admin works
2016-10-26 19:43:54 -07:00
Tim Robinson
196667b625 Add test 2016-10-27 02:06:42 +00:00
Tim Robinson
9e848d39f7 Allow numbers in provider so c9admin works 2016-10-27 02:05:08 +00:00
Tim Robinson
b269bcbb33 Allow ratelimiting on keys not in req.params 2016-10-26 02:36:37 +00:00
Harutyun Amirjanyan
8fc2500d6a Merge pull request +14958 from c9/ide-ace
update mac keybindings
2016-10-24 16:57:12 +02:00
Matthijs van Henten
497893335a Revert "Revert another rotate ssso" 2016-10-21 14:39:16 +02:00
Matthijs van Henten
1dad6c0950 Revert "Revert "Revert "Rotate sso""" 2016-10-21 14:38:26 +02:00
nightwing
fd29b71a83 update mac keybindings 2016-10-20 08:19:20 +00:00
Matthijs van Henten
81392cb96e Revert "Revert "Rotate sso"" 2016-10-19 18:03:50 +02:00
Matthijs van Henten
f26ee40b41 Revert "Rotate sso" 2016-10-19 18:03:37 +02:00
Matthijs van Henten
f71b933767 retrofit c9/crypt to accept arrays of secrets 2016-10-18 13:30:25 +00:00
Tim Robinson
3a8fff44bf Merge pull request +14897 from c9/test-include-c9
Include node_modules/c9 in testing
2016-10-06 13:21:55 -07:00
Tim Robinson
9e2b79031e Merge remote-tracking branch 'origin/master' into api-ratelimit-collab
Conflicts:
	plugins/c9.api/collab.js
2016-10-06 00:32:54 +00:00
Tim Robinson
f090597c0d Delete old urls_test 2016-10-05 21:58:38 +00:00
Tim Robinson
c304afef71 Add description to function. Use sinion clock for test 2016-10-05 21:09:00 +00:00
Tim Robinson
5d7d4e3b3d git.js doesn't need amd-loader and it's causing a global variable leak which makes mocha tests fail 2016-10-05 00:39:38 +00:00
Tim Robinson
cf52ebf36a Add ratelimits to collab 2016-09-29 21:46:48 +00:00
Matthijs van Henten
94afcc2e14 test the session lib 2016-09-22 18:01:49 +00:00
Matthijs van Henten
726ac88a50 refactors for better testing 2016-09-22 18:00:38 +00:00
Matthijs van Henten
49cb025274 move encrypt/decrypt into modules 2016-09-22 17:56:41 +00:00
Matthijs van Henten
c8958c765f moved hash funciton into a module for better testings 2016-09-22 17:56:00 +00:00
Matthijs van Henten
44073851b8 adds support for multiple keys 2016-09-22 12:51:29 +00:00
Matthijs van Henten
662f32a3e9 use the forked lib 2016-09-22 12:49:05 +00:00
Matthijs van Henten
b9a5f68c2c initial fork from connect/session 2016-09-22 12:44:43 +00:00
nightwing
d5fe2173d9 add tests 2016-09-15 06:27:57 +00:00
nightwing
7a8e6cb3ad fix jumphost support for ssh workspaces 2016-09-14 17:09:25 +00:00
nightwing
b399e90e4d stop pairing bracket in the searchbox 2016-09-03 00:35:47 +04:00
nightwing
11c89b7012 highlight arrow functions similar to functions 2016-08-28 07:12:35 +04:00
nightwing
c04e78432e better error message for smith 2016-08-20 19:58:06 +00:00
nightwing
18f7963e2c workaround for node6 regression 2016-08-20 19:57:56 +00:00
nightwing
1d3c41a084 add msgpack to git 2016-08-20 18:55:41 +00:00
nightwing
9bb3848fb4 update installer 2016-07-22 07:54:45 +00:00
Justin Dray
d39e4eec62 Merge pull request +14578 from c9/docker-create-pid-ip-cache
Create JSON file of PID -> IP on docker servers
2016-07-20 20:51:53 -07:00
Tim Robinson
e469759873 Merge pull request +14157 from c9/revert-14156-revert-13838-vfs-fix-collab-code-reverting
VFS Fix collab code reverting for unsaved files
2016-07-20 17:15:45 -04:00
Tim Robinson
de0da6e853 Save out pidLookupCache to a file and implement tests 2016-07-20 17:30:46 +00:00
Harutyun Amirjanyan
c0af89ffc7 Merge pull request +14554 from c9/ide-ace-update
update ace
2016-07-19 15:53:22 +04:00
Tim Robinson
023b98c66f Don't use err status code if it's an invalid code 2016-07-17 23:08:10 +00:00
nightwing
d200fccfd6 update ace 2016-07-16 21:51:26 +04:00
Tim Robinson
82b9960977 Only load bcrypt when it's required, so vfs doesn't complain about incompatible binaries 2016-07-15 17:04:27 +00:00
nightwing
fb0a7e5a78 fix +14513 c9 open is broken in new workspaces 2016-07-12 23:31:58 +00:00
Harutyun Amirjanyan
bdc697cdc3 Merge pull request +14145 from c9/fix-client-tests-2
Fix and unblacklist several clientside unit tests
2016-07-04 14:15:01 +04:00
nightwing
c059be9ba9 workaround for tmux 2 bug 2016-07-04 01:23:20 +04:00