13 Commits

Author SHA1 Message Date
Lennart Kats
ab5940bb9b Making basic tracing work 2015-04-10 15:42:37 +02:00
nightwing
a51f96a157 reapply 834417f734 which was accidentally reverted 2015-03-20 00:42:00 +04:00
Alex Brausewetter
f50cb5ff6c Merge pull request +6455 from c9/debugger
Fix debugger not pausing on breakpoints

- Smoke tested on local standalone
- Reviewed as per DoD Level 1
2015-03-09 14:11:21 +01:00
Matthijs van Henten
e59f86a9c7 Merge remote-tracking branch 'origin/master' into restore-profile
Conflicts:
	plugins/c9.api/project.js
2015-03-05 09:27:33 +00:00
Lennart Kats
3f2dd4cf25 Revert "Revert "Merge pull request +6023 from c9/profile-integration""
This reverts commit e6fc5d467dc6a4c8f8d962ff0c2930b805d4d2e2.
2015-03-05 09:54:49 +01:00
Lennart Kats
4a0a75adf8 Merge remote-tracking branch 'origin/master' into revert-attempt
Conflicts:
	package.json
	plugins/c9.ide.performancestats/stats.js
	plugins/c9.worker/backup.js
2015-03-03 10:25:46 +01:00
nightwing
2cff8bd15e revert watcher changes causing memory leak 2015-02-27 18:44:21 +04:00
Lennart Kats
e6fc5d467d Revert "Merge pull request +6023 from c9/profile-integration"
This reverts commit 584e691a3f8dc298eff20401cfd9a8ef23164b16, reversing
changes made to 7af49ff62b19985c3ee39df1af7a683183a3a25b.

Conflicts:
	configs/monitor.js
	scripts/makestatic.js
	scripts/makestatic.sh
2015-02-27 14:26:25 +01:00
Ruben Daniels
6718cc6e70 Merge pull request +6212 from c9/support-new-mocha
Fix running client tests with newer mocha
2015-02-26 12:27:18 -08:00
Matthijs van Henten
584e691a3f Merge pull request +6023 from c9/profile-integration
[WIP] Profile Pages milestone 1
2015-02-25 10:05:05 +01:00
Tim Robinson
3f593d81b0 Increase vfs test timeout 2015-02-24 17:11:10 +04:00
nightwing
bb7b42efb4 Fetch localfs environment variables from the login shell (fixes +6151) 2015-02-22 18:04:01 +04:00
c9bot
b0108959bc initial commit 2015-02-10 23:41:24 +04:00