Wykres commitów

538 Commity (294bbf69345a3e9a48362edd4dd095d13a4b4524)

Autor SHA1 Wiadomość Data
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
Lennart Kats 4dc67d2c40 Merge pull request +11231 from c9/fix-open-redirects3
Fix open redirects3
2015-12-22 11:10:26 +01:00
Lennart Kats 6779e7caed Merge pull request +11091 from c9/server-completion
Low-latency server-side completion
2015-12-22 09:23:44 +01:00
nightwing f11a38c2ac update ace 2015-12-21 19:25:53 +04:00
Fabian Jakobs 81419bf00f also catch wildcard protocols like //google.it 2015-12-21 15:08:48 +00:00
Fabian Jakobs 3a35b26cf5 treat optional arguments with a value of null like undefined values 2015-12-21 14:28:03 +00:00
Lennart Kats 356969b369 Improve error handling 2015-12-19 15:56:47 +00:00
Lennart Kats 8c2530b195 Merge pull request +11099 from c9/tmux-2.1
handle c0-change-trigger option being removed in tmux 2.1
2015-12-16 10:46:29 +01:00
nightwing 0f9c01289e c0-change-trigger option is removed in tmux 2.1 2015-12-13 20:08:41 +04:00
nightwing c0f9226078 update ace 2015-12-13 13:26:38 +04:00
Lennart Kats ede5509aa0 Merge pull request +10924 from c9/writeToWatchedFile
Fix Saving a file owned as root uses 100% cpu in VFS worker
2015-12-11 09:46:22 +01:00
Dana a1179a9279 Fixes tracking for unauthorized users client-side 2015-12-09 11:06:28 +00:00
Lennart Kats 17e979bf3f Show error when html5.js can't be loaded 2015-12-09 09:15:29 +00:00
Dana Ivan 8c80d7b596 Merge pull request +10964 from c9/reduce-uid-checks
[not trivial] Reduces the uid checks - less warnings
2015-12-08 18:35:09 +01:00
Dana e5e868339e some formatting changes 2015-12-08 11:56:38 +00:00
Dana e6cef5fe3b Reduces the uid checks - less warnings 2015-12-07 15:49:16 +00:00
nightwing 8ff2aa9d1f fix loop when calling writeToWatchedFile on non editable file 2015-12-03 07:47:20 +00:00
nightwing 2913ba0880 cleanup 2015-12-02 00:43:42 +04:00
nightwing 054bddd577 use caches api for faster reloading in dev mode 2015-11-30 04:57:53 +04:00
Ruben Daniels 6b6e74fd67 Merge pull request +10751 from c9/fix/various
Fix c9 open
2015-11-26 05:14:40 -08:00
Matthijs van Henten 4f5ac4a79c fix localBaseUrl for dogfood and rename it to internalBaseUrl 2015-11-25 11:28:52 +00:00
nightwing 3b1db263ff fix regression: emmet commands not working in html tags 2015-11-25 14:51:06 +04:00
DanaIv acab297580 Merge pull request +10723 from c9/revert-10722-revert-10708-refactor-addtrait
[FIXME] Refactor addtrait
2015-11-24 15:48:35 +01:00
Matthijs van Henten 5c47170a0d Merge pull request +10725 from c9/api-available
Expose available as part of user quota
2015-11-24 10:02:18 +01:00
Matthijs van Henten e806edd448 Merge pull request +10714 from c9/fix-issue-10369
fixes +10369 silence the warnings
2015-11-24 09:15:40 +01:00
Matthijs van Henten 51f7bda3ec move available; expose available as part of user quota 2015-11-23 22:18:59 +00:00
Dana 48026f4b4b Fixes +10723 and adds extra tests 2015-11-23 20:00:22 +00:00
Lennart Kats a40ad9fe17 Revert "Revert "Refactor addtrait"" 2015-11-23 19:35:15 +01:00
Lennart Kats c1fdf4906a Revert "Refactor addtrait" 2015-11-23 19:34:46 +01:00
DanaIv a8599aafe4 Merge pull request +10708 from c9/refactor-addtrait
Refactor addtrait
2015-11-23 18:13:23 +01:00
Fabian Jakobs 5a2dd867dd Merge pull request +10587 from c9/fix-vfs-headers-sent
the response might have already been sent
2015-11-23 18:03:40 +01:00
Matthijs van Henten 5572b4f101 fixes +10369 silence the warnings 2015-11-23 16:19:46 +00:00
Dana 134eeaf0fc Adds further filtering 2015-11-23 15:12:12 +00:00
Dana 94c568a532 Fixes regex and tests 2015-11-23 15:12:12 +00:00
Dana 973e6fc51d Changes signature of addTrait and adds filtering for test users 2015-11-23 15:12:01 +00:00