Wykres commitów

672 Commity (181b61e5b65a92e423cafceb638a3b51d6ea9e99)

Autor SHA1 Wiadomość Data
Lennart Kats ad5659498f Merge remote-tracking branch 'origin/master' into revert-13177-revert-13004-all-fix-vfs-activate 2016-04-12 12:18:31 +00:00
Fabian Jakobs 43f0decaab fix: response has no method render
fixes https://github.com/c9/newclient/issues/13346
2016-04-12 09:28:27 +00:00
nightwing c1af528b87 use proxy command 2016-04-12 00:46:39 +00:00
nightwing 48502343da add support for ssh proxy command 2016-04-08 23:49:27 +04:00
Harutyun Amirjanyan f06d5124b4 Merge pull request +13301 from c9/update
Update smartface
2016-04-07 20:44:17 +04:00
nightwing d7a3fe4c69 fix typescript mode 2016-04-07 16:30:11 +00:00
Tim Robinson 1c6b35d299 Merge pull request +13268 from c9/all-4096bit-ssh-keys
Use 4096bit SSH Keys
2016-04-07 12:25:25 -04:00
Tim Robinson de35808462 Create 4096 bit keys 2016-04-06 16:34:34 +00:00
nightwing dc328420b4 update ace 2016-04-05 18:50:29 +04:00
Harutyun Amirjanyan effccd1d60 Merge pull request +13152 from c9/vfs-empty-strings
fix issue with vfs worker not passing falsy values
2016-04-04 17:00:29 +04:00
nightwing 49fb42964c fix resizing of output panes on windows 2016-04-04 03:29:43 +04:00
nightwing d3f65148fe fix regression in env popup 2016-04-04 02:13:38 +04:00
Matthijs van Henten 6a33969bd9 Revert "Revert "Fix VFS container activation timeout behavior"" 2016-04-01 15:46:49 +02:00
Matthijs van Henten c03bcb9530 Revert "Fix VFS container activation timeout behavior" 2016-04-01 15:45:53 +02:00
Fabian Jakobs d975f5577b Merge pull request +13004 from c9/all-fix-vfs-activate
Fix VFS container activation timeout behavior
2016-04-01 09:55:31 +02:00
Lennart kats 3a25d80444 Merge remote-tracking branch 'origin/master' into all-fix-vfs-activate
Conflicts:
	node_modules/c9/rest_client.js
2016-04-01 07:13:37 +00:00
nightwing 525d3e5b99 fix issue with vfs worker not passing falsy values 2016-03-31 15:36:32 +00:00
Fabian Jakobs 8fa3f769c5 add unit test 2016-03-31 09:22:39 +00:00
Fabian Jakobs d0a2dfddd6 when strange unicode characters are in the string then content length is not correct 2016-03-31 09:21:43 +00:00
nightwing 2ed10b1b26 fix terminal resize on windows 2016-03-30 21:23:00 +04:00
nightwing 9c2d444b73 fix cli.bridge 2016-03-30 19:49:09 +04:00
nightwing 23cbb33833 fix regression in stripws 2016-03-30 19:31:23 +04:00
Harutyun Amirjanyan 7eb38be6c6 Merge pull request +13073 from c9/ide-file-tree
fix issues with file tree
2016-03-30 11:55:16 +04:00
Harutyun Amirjanyan f59a6b4fbc Merge pull request +10765 from c9/feature/scm
[WIP] Refactor of SCM Panel
2016-03-30 11:55:09 +04:00
nightwing 6b9391d293 fix issue with broken cache always rebuilding the main css 2016-03-29 23:43:39 +04:00
nightwing 0a7655ee4d fix render issues in unified diff viewer 2016-03-29 20:35:03 +04:00
nightwing ade862df24 more style tweaks + folding 2016-03-29 20:34:59 +04:00
nightwing 710db81ce6 add simple unified diff viewer
# Conflicts:
#	.eslintrc
2016-03-29 20:34:50 +04:00
nightwing 294bbf6934 fix empty message in tree 2016-03-29 20:31:54 +04:00
nightwing cb9466ae62 Revert "Revert "Merge branch 'master' of github.com:c9/newclient""
This reverts commit 223b4dfcc4.
2016-03-29 20:31:52 +04:00
Lennart C. L. Kats e47b3120a5 Revert "Revert "Fix, help debug workspace creation issues"" 2016-03-29 15:24:44 +02:00
Lennart C. L. Kats 40cc1c7d06 Revert "Fix, help debug workspace creation issues" 2016-03-29 15:22:56 +02:00
Lennart C. L. Kats bef4db70fd Merge pull request +13046 from c9/multi-api-docker-create-issues
Fix, help debug workspace creation issues
2016-03-29 14:57:47 +02:00
nightwing ee57e15889 fix tests 2016-03-28 03:47:52 +04:00
nightwing 19e5f7a8aa automatically expand single child directory chains 2016-03-28 03:26:10 +04:00
nightwing 498a9b072f make file rename in the tree more robust 2016-03-27 04:49:15 +04:00
nightwing 6862b66d21 fix trimTrailingSpace on save with multiple cursors 2016-03-26 16:19:19 +04:00
Harutyun Amirjanyan 57bc5bcd8d Merge pull request +12973 from c9/fix-raygun
Fix minor raygun error
2016-03-25 18:50:04 +04:00
Lennart Kats 78f2824cc3 Port rest_client extension
from +13004
2016-03-24 19:51:21 +00:00
Matthijs van Henten b20bc293c4 Merge remote-tracking branch 'origin/wf-create-test' into refactor-create-api
Conflicts:
	plugins/c9.api.project/create_test.js
2016-03-24 14:13:15 +00:00
Lennart Kats 94d2b280df Improve rest_client timeout behavior 2016-03-23 10:27:53 +00:00
Nikolai Onken bf9209d5c1 Merge pull request +12868 from c9/usertypes
Send usertype on all analytics events
2016-03-22 20:05:16 +01:00
Matthijs van Henten 4304c32540 Revert "Revert "Refactor clone api"" 2016-03-22 14:40:52 +01:00
Matthijs van Henten d9ec3482d1 Revert "Refactor clone api" 2016-03-22 14:36:53 +01:00
Lennart Kats ddbe64046c Fix +12972 meta.stream is falsy 2016-03-22 11:49:55 +00:00
Matthijs van Henten 79adede130 Merge remote-tracking branch 'origin/master' into refactor-clone-api 2016-03-22 08:58:27 +00:00
nightwing 92a7b39300 make exit code logging more robust 2016-03-22 01:55:44 +04:00
Matthijs van Henten 28d1868d38 creates a not-found util 2016-03-21 14:49:41 +00:00
Harutyun Amirjanyan 11d73b7b72 Merge pull request +12703 from c9/c9-cli
fix c9 cli not working with npm 3
2016-03-16 22:50:34 +04:00
Lennart Kats 6dfb4c5445 Propagate usertype & purpose on all events 2016-03-16 16:40:31 +00:00
nightwing 4dad81677d move npm freeze logic into standalone module 2016-03-16 17:43:18 +04:00
nightwing 50640cbeef load worker from c9.io to fix loading on ie and firefox 2016-03-16 01:19:48 +04:00
Matthijs van Henten 1cef467279 fix the order
;
2016-03-08 12:42:12 +00:00
Matthijs van Henten 91c5898ccc move the null check up 2016-03-08 11:30:56 +00:00
nightwing 172dba514e fix emmet in ejs mode 2016-03-07 19:17:22 +04:00
Fabian Jakobs 46568ffae6 Merge pull request +12434 from c9/docker-providers
Docker server providers for free / premium hosts
2016-02-29 14:28:54 +01:00
nightwing c4d6b7f6cd keep cursor position when removing trailing space on save 2016-02-27 23:42:57 +04:00
Harutyun Amirjanyan 9e1cdc11bb Merge pull request +12375 from c9/fix-find-in-files
Fix find in files issues
2016-02-26 23:27:31 +04:00
Fabian Jakobs 26e1a7be83 Merge pull request +12410 from c9/stats-via-extension
Stats via vfs extension
2016-02-26 11:31:35 +01:00
Tim Robinson f9dee978e0 Cache test doesn't need c9 2016-02-25 21:46:29 +00:00
Tim Robinson 8f44901397 Add cachign of container stats so they can't overload the server 2016-02-25 21:37:48 +00:00
Tim Robinson f0075ccab1 Added logicblox as a custom provider and make logicblox projects only go to it 2016-02-25 16:25:18 +00:00
nightwing 0c416f5385 update acorn 2016-02-23 13:39:06 +04:00
nightwing 002235f6dc save files before running Replace in Files 2016-02-23 13:14:09 +04:00
Nikolai Onken 04ea27f8ff fix build 2016-02-18 15:21:35 +00:00
Harutyun Amirjanyan 5d5269e872 Merge pull request +12170 from c9/sdk
fix custom theme loading
2016-02-15 16:36:50 +04:00
Harutyun Amirjanyan cacd46e15c Merge pull request +12151 from c9/update-ace
update ace
2016-02-15 16:36:34 +04:00
nightwing 863fc77198 fix loading themes from bundles 2016-02-15 16:01:10 +04:00
nightwing 28e2ee832e update ace 2016-02-12 02:52:29 +04:00
nightwing 3645173678 update treehugger 2016-02-11 15:55:51 +04:00
Tim Robinson a1cf7290c3 Merge pull request +11952 from c9/automatic-saucelabs-keys
Automatic saucelabs key creator
2016-02-10 08:14:45 -05:00
nightwing c38403b703 fix regression in worker package 2016-02-06 03:33:15 +04:00
nightwing c3bbab2051 handle jquery umd wrapper in packager 2016-02-05 22:38:09 +00:00
Fabian Jakobs df687ee807 support windows line endings 2016-02-05 20:42:53 +00:00
Tim Robinson 594ca0fd59 Const should be capital 2016-02-04 03:49:42 +00:00
Tim Robinson 5f7d2e5880 Add randomchars lib 2016-02-03 21:32:18 +00:00
Tim Robinson 3d9ff2408b Fixes to make wsmonitor work in prod 2016-02-03 21:32:00 +00:00
Tim Robinson fd50d42a12 Merge remote-tracking branch 'origin/master' into wsmonitor-pipeline 2016-02-03 19:06:23 +00:00
Tim Robinson 3109cd6f3b Turned saucelabs into its own plugin with all functionality contained in it 2016-02-03 18:01:01 +00:00
Tim Robinson 2131536c8e Turning saucelabs into an actual database object and fixing bugs 2016-02-02 17:26:48 +00:00
Dana Ivan 9c16247f92 Merge pull request +11880 from c9/speed-up-flush
Make funnels more reliable
2016-02-02 09:06:27 +01:00
nightwing 7f8a13720b reenable terminal tests 2016-02-02 03:06:24 +04:00
Tim Robinson 51b667363c Adding saucelabs check to monitor 2016-02-01 19:37:48 +00:00
Tim Robinson cf77f4f121 Merge remote-tracking branch 'origin/master' into wsmonitor-pipeline 2016-02-01 16:45:04 +00:00
Matthijs van Henten 37808abb93 Merge remote-tracking branch 'origin/master' into speed-up-flush 2016-02-01 13:41:46 +00:00
Dana 316a41676f More fixes 2016-02-01 13:31:36 +00:00
Dana cf886767a4 Refactor sign up analytics 2016-01-29 12:30:58 +00:00
Lennart Kats 1286993eaa Fix workspaceDir during tests 2016-01-29 12:16:37 +01:00
Tim Robinson 71e2261a0a Fix getting container details when a container has a underscore in it 2016-01-28 22:52:37 +00:00
Dana 11d5c8f463 Pretend we send auth events anonymously to give Mixpanel time to consume the aliasing 2016-01-28 16:10:39 +00:00
Tim Robinson 6da1d01339 Merge pull request +11424 from c9/monitor-workspaces
Workspace monitor & autofixer
2016-01-27 17:25:20 -05:00
Lennart C. L. Kats d24552a3cc Merge pull request +11812 from c9/fix/various
Fix terminal monitor issues for google
2016-01-27 13:29:06 +01:00
Fabian Jakobs 833528f12c Merge remote-tracking branch 'origin/master' into revert-11498-revert-11413-fix-xss
Conflicts:
	npm-shrinkwrap.json
2016-01-26 11:48:26 +00:00
Dana Ivan f52c209a3e Merge pull request +11806 from c9/fix-analytics-ext-services
Fix analytics ext services
2016-01-26 09:04:23 +01:00
nightwing 351af82d49 fix silent flag for tree expand 2016-01-25 17:53:28 +04:00
Dana 2e3b4512b2 Force skip of analytics if no id 2016-01-25 13:30:55 +00:00
Dana 57fd9954a9 Cleanup and small fixes 2016-01-25 13:27:38 +00:00
Dana e0fd2d17fb Further refactoring 2016-01-25 10:24:23 +00:00
Nikolai Onken ab197b0a4d Merge pull request +11792 from c9/webpack
Use webpack instead of browserify
2016-01-25 10:26:35 +01:00
Nikolai Onken 514dd154e7 Add define again 2016-01-25 09:01:41 +00:00
Nikolai Onken 101cfb6f98 Remove define definitions 2016-01-24 21:57:28 +00:00
Lennart Kats 8ddda4806f Don't trigger watcher on local analysis temp files 2016-01-23 11:58:24 +00:00
Tim Robinson e4314c97d2 Merge remote-tracking branch 'origin/master' into monitor-workspaces 2016-01-22 16:19:40 +00:00
Dana 8e61380009 [WIP] Make passing user id explicit 2016-01-22 15:59:35 +00:00
nightwing 9cde7eb0f2 fix +11728 Preview on tree selection reopens randomly 2016-01-22 16:24:04 +04:00
Tim Robinson 9319cace3e Merge remote-tracking branch 'origin/master' into monitor-workspaces 2016-01-21 15:09:30 +00:00
Dana 7aa84e3fa8 Add extra guards for users without id or with old uid 2016-01-21 09:18:25 +00:00
Fabian Jakobs 53c3a2dcd1 Merge pull request +11685 from c9/prepare-load-balancing
Prepare load balancing
2016-01-20 16:54:19 +01:00
Fabian Jakobs 6113cb8b58 remove warning. this matches valid mbed url 2016-01-20 10:39:44 +00:00
Fabian Jakobs 06bc14b9af add unit test 2016-01-19 14:33:12 +00:00
Fabian Jakobs b6c0d9fd06 support both nameing schemes 2016-01-19 13:27:29 +00:00
Fabian Jakobs 1300bff8ab minor fixes 2016-01-19 10:50:19 +00:00
Fabian Jakobs 04e5a9511a Merge pull request +11622 from c9/fix-m9-security-issue
Fix m8 and m9 security issues
2016-01-19 09:24:49 +01:00
Matthijs van Henten 8ba4144d63 circumvent silly amd 2016-01-18 09:40:14 +00:00
Fabian Jakobs e8dcd182f8 add unit tests 2016-01-15 15:40:59 +00:00
Fabian Jakobs 6d8530e05e was fixed in localfs 2016-01-15 11:38:52 +00:00
Fabian Jakobs d3a94f748d fix M8: Files Outside of Workspace Can Be Accessed via Directory Traversal
fixes https://github.com/c9/newclient/issues/11380
2016-01-15 11:05:08 +00:00
Fabian Jakobs 588e142fba update ejs 2016-01-14 15:13:12 +00:00
Matthijs van Henten e789828e22 Merge pull request +11586 from c9/force-reload-vfs
Force reload vfs
2016-01-14 12:28:30 +01:00
matthijs 886f825a6f Bump vfs version 2016-01-14 11:17:12 +00:00
Tim Robinson d39cc36b36 Changed block port retriving to get every project and display them instead 2016-01-13 22:53:19 +00:00
Nikolai Onken b16bc97546 Add referrefBy to identify 2016-01-13 14:15:05 +00:00
Harutyun Amirjanyan 39911319b1 Merge pull request +11504 from c9/fix/various
Fix several small issues
2016-01-11 21:26:27 +04:00
nightwing 16cc9e55d2 add shim for es6 string methods and Object.assign 2016-01-11 20:35:21 +04:00
nightwing ac11de256d another fix for error handling in mini_require 2016-01-09 03:42:15 +04:00
Lennart Kats 0b52a17e78 Merge pull request +11473 from c9/require-cache-error
improve error handlidng of cached require
2016-01-08 13:19:07 +01:00
nightwing dd9c07f5e9 improve error handlidng of cached require 2016-01-07 23:13:17 +04:00
nightwing 1a344413e7 fix es6 test 2016-01-07 02:59:42 +04:00
nightwing 12c9e768ed update eslint 2016-01-07 01:40:36 +04:00
nightwing cdfc8147e6 fix regression in undomanager 2016-01-07 01:03:55 +04:00
Harutyun Amirjanyan f61e7c06a5 Merge pull request +11407 from c9/fix/various
Fix several small issues related to run/preview
2016-01-06 21:16:48 +04:00
nightwing df521f0171 fix error when undoing deletion of fold 2016-01-06 15:52:14 +04:00
Matthijs van Henten 017e7630ed Merge pull request +11427 from c9/fix-issue-11379-git-urls
fixes +11379 we dont allow dangerous shell chars in scm urls ever
2016-01-06 12:02:25 +01:00
Matthijs van Henten ad867d45c1 fixes +11379 we dont allow dangerous shell chars in scm urls ever 2016-01-06 10:13:28 +00:00
Tim Robinson c4af4bdfc0 Adding frontend for monitor workspace 2016-01-06 01:15:54 +00:00
Tim Robinson 07626193fd Merge pull request +11401 from c9/delete-branches-containers
Don't backup branches containers
2016-01-05 12:43:11 -05:00
Tim Robinson 40430bf58a Using nc -z as portScanner fails in parallel. Moving gce script 2016-01-05 01:11:28 +00:00
Tim Robinson 16cea99a2c Add ci-helpers 2016-01-04 16:47:27 +00:00
Dana Ivan 7fb73c9c74 Standardizes user traits sent to analytics 2016-01-04 15:13:32 +00:00
Lennart Kats 5ef25b5bd6 Merge pull request +11019 from c9/error-html5
Show error when html5.js can't be loaded
2016-01-04 09:43:03 +01:00
nightwing a53be54f56 fix raygun error trying to clone Date 2015-12-30 20:40:04 +04:00
nightwing f0aca9fe2a reset scrollbar position when changing session 2015-12-30 20:40:04 +04:00
nightwing f5fe64d1f2 fix matching bracket highlighting in js templates 2015-12-30 20:40:03 +04:00
Lennart kats 3b0c9f0151 Improve warning 2015-12-29 12:31:22 +00:00
Alex Brausewetter 32bfa5dc11 Add Google OAuth authentication 2015-12-28 08:08:04 -08:00
Alex Brausewetter e8ee1210b9 Fix AMD loader arguments for define() 2015-12-28 07:29:03 -08:00
Harutyun Amirjanyan a73991528a Merge pull request +11255 from c9/hotfix/ace
Fix ace scrollbar regression
2015-12-23 17:37:09 +04:00
nightwing 907e2a8ad9 fix scrollbar regression 2015-12-23 01:27:47 +04:00
nightwing a12f51fe33 fix ctrl-arrow in terminal vim 2015-12-22 19:54:51 +04:00
Lennart Kats 2dd58bb8a7 Merge pull request +11230 from c9/update-ace
update ace
2015-12-22 11:14:21 +01:00