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
Fabian Jakobs
5974323cfc
also call res.end
2015-11-23 13:29:05 +00:00
nightwing
2e68e73deb
fix worker not starting up on ie edge
2015-11-19 00:19:36 +04:00
Ruben Daniels
ad3b6aa5f4
Merge branch 'master' of github.com:c9/newclient into revert-10476-revert-markdown
...
Conflicts:
.c9/project.settings
2015-11-18 16:24:48 +00:00
Fabian Jakobs
6b1a1c9ee8
the response might have already been sent
...
fixes https://github.com/c9/newclient/issues/10438
2015-11-18 16:15:35 +00:00
Lennart Kats
dd223c8d38
Merge pull request +10552 from c9/improve-dogfooding
...
Better, faster dogfooding
2015-11-18 15:46:08 +01:00
Lennart Kats
e0f8ab24d5
Add comment
2015-11-18 11:38:09 +01:00
Lennart Kats
4fdaccd3c8
Fix worker CORS errors with unpacked helper
2015-11-17 12:58:52 +00:00
nightwing
cd9a8aaf93
adapt statusbar to ace api changes
2015-11-16 23:43:06 +00:00
nightwing
3b162a1fe8
update ace
2015-11-16 23:43:06 +00:00
Dana
e43051343f
Cleans up csp and fixes +10289
2015-11-16 12:45:22 +00:00
Lennart Kats
42d069225a
Revert "Revert markdown changes"
2015-11-13 13:21:21 +01:00
Lennart Kats
093560ec8a
Revert "Merge pull request +10389 from c9/fix/small"
...
This reverts commit ace44def0d043daac4b153a72b553b5b8f6e63c9, reversing
changes made to 2f2b96a4068e91c23d0b63388d0b82aeedb2db31.
2015-11-13 13:20:08 +01:00
nightwing
700cf076d5
fix test runner
2015-11-13 04:00:40 +04:00
nightwing
b3c84e12a8
fix +10358: Object Error has no method 'indexOf'
2015-11-13 03:53:51 +04:00
Ruben Daniels
15bfbc0fae
Added syntax highlighting to markdown preview
2015-11-11 02:38:18 +00:00
Ruben Daniels
5b946753ed
Fixes c9/core+96 - metadata support for ~
2015-11-06 00:29:24 +04:00
Lennart Kats
c6421a0820
Merge pull request +10025 from c9/localfs-env
...
wait for reading env before calling spawn
2015-11-05 12:28:38 +01:00
Lennart Kats
2c0c07d357
Merge pull request +10096 from c9/revert-10090-revert-10051-fix/various
...
Revert "Revert "Fix issues with rename""
2015-11-05 12:28:07 +01:00
Fabian Jakobs
ca8cd63bc9
Merge pull request +10215 from c9/single-sign-out
...
single sign out
2015-11-05 10:58:11 +01:00
Fabian Jakobs
8212e049af
assert trustedDomainsRe option
2015-11-05 09:15:47 +00:00
Ruben Daniels
584f9ea55b
Merge pull request +10204 from c9/tmuxspawn
...
Fix tmux getting into restart loop when profile prints something
2015-11-04 09:02:38 -08:00
nightwing
bd62f168b2
fix runners on windows
2015-11-04 20:49:03 +04:00
Ruben Daniels
dd33232a0a
Merge pull request +10237 from c9/fix-vfs
...
Fix VFS not always connecting (particularly in dogfooding standalone)
2015-11-04 08:41:58 -08:00
Fabian Jakobs
0a684b889f
configure secure redirect everywhere
2015-11-04 15:26:27 +00:00
Matthijs van Henten
3d718d9e21
Merge pull request +10231 from c9/movetests
...
Move integration tests to profile dir
2015-11-04 15:51:21 +01:00
Fabian Jakobs
ddfb81c264
Merge remote-tracking branch 'origin/master' into single-sign-out
2015-11-04 14:25:05 +00:00
Lennart Kats
d3098fa2f0
Fix null.kill()
...
TypeError: Cannot call method 'kill' of null
at Parent.disconnect (/home/ubuntu/workspace/node_modules/vfs-child/parent.js:65:15)
at Parent.master.destroy (/home/ubuntu/workspace/plugins/c9.vfs.server/vfs.js:142:16) # Please
enter the commit message for your changes. Lines starting
at Vfs.destroy (/home/ubuntu/workspace/plugins/c9.vfs.server/vfs.js:109:21) # with '#' will be
ignored, and an empty message aborts the commit.
at EventEmitter.entry.destroy (/home/ubuntu/workspace/plugins/c9.vfs.server/cache.js:131:40) # On
branch fix-vfs
at remove (/home/ubuntu/workspace/plugins/c9.vfs.server/cache.js:110:23) # Changes to be
committed:
at null._onTimeout (/home/ubuntu/workspace/plugins/c9.vfs.server/cache.js:143:21) # modified:
node_modules/vfs-child/parent.js
at Timer.listOnTimeout [as ontimeout] (timers.js:112:15)
# Changes not staged for commit:
2015-11-04 13:27:12 +00:00
Lennart Kats
c1ea5744a0
Cleanup old ENOENT approach
2015-11-04 11:19:43 +00:00
Lennart Kats
4d49d34712
Fix vfs not always connecting if first node binary in list doesn't exist
...
We'd first get a EPIPE and then an ENOENT in this scenario,
breaking our retry behavior.
2015-11-04 11:19:10 +00:00
Fabian Jakobs
bcfb026450
use setHeader iso writeHead
2015-11-04 09:36:28 +00:00
nightwing
265c6576ea
fix issues with run button
2015-11-04 03:21:57 +04:00
c9bot
469dd34bdf
better fix for predict_echo test
2015-11-04 03:21:56 +04:00
nightwing
7d254794dd
remove watchfile
2015-11-04 03:21:56 +04:00
nightwing
f61269a017
more reliable tmuxspawn for output tabs
2015-11-04 03:21:55 +04:00
nightwing
75beb096d7
fix close event handling for remote processes
2015-11-04 03:21:55 +04:00
basdewachter
8cabf04221
reorder files
2015-11-03 22:33:47 +01:00
Harutyun Amirjanyan
a1b273b6e1
Revert "Revert "fix symlink loop detection""
2015-11-03 03:24:34 +04:00
