Wykres commitów

217 Commity (fed39e681119af6b02f8032659257a7cdf759191)

Autor SHA1 Wiadomość Data
Tim Robinson fed39e6811 Merge pull request +7693 from c9/fix/socket
Escape only invalid character sequences in reliable socket
2015-07-02 20:05:55 +02:00
Lennart kats b232c0d1e8 Fix undefined.replace() 2015-07-02 12:07:50 +00:00
Lennart Kats bd76f5ab1a Merge branch 'multi-domain-part-deux' of github.com:c9/newclient into multi-domain-part-deux 2015-07-02 10:23:25 +02:00
Lennart Kats a6428848d2 Merge remote-tracking branch 'origin/master' into multi-domain-part-deux 2015-07-02 10:22:42 +02:00
Nikolai Onken dec38d9e7e Merge pull request +8038 from c9/mvh-testing-routing
Mvh testing routing
2015-07-01 15:48:08 +02:00
Lennart kats 4477a5f124 Fix circular json error 2015-07-01 08:44:44 +00:00
Lennart kats ea585fd0e8 Fix not passing host 2015-07-01 08:20:12 +00:00
Lennart kats 15742463d0 Work on multi-domain support in IDE and apps-proxy 2015-07-01 07:50:36 +00:00
Lennart kats 959d6c275d Fix broken cookie 2015-07-01 07:50:36 +00:00
Lennart kats eabf2027c5 Make ide opening flow partly aware of multiple domains 2015-07-01 07:50:36 +00:00
Lennart kats e252cb3a18 Add multi-domain support to most of the sign-in flow 2015-07-01 07:50:36 +00:00
Lennart kats aaeceb921f Make profile client multi-domain aware 2015-07-01 07:50:35 +00:00
Lennart kats 9eeccd6d05 Make profile multi-domain aware 2015-07-01 07:50:35 +00:00
Lennart kats 23f3e6e809 Extend urls.js 2015-07-01 07:50:35 +00:00
Lennart kats d19366c653 Move urls into node_modules/c9 2015-07-01 07:50:34 +00:00
Matthijs van Henten cb07546d0b adding convenient method for client-side routing 2015-06-29 23:17:28 +00:00
Matthijs van Henten 0e72c85e0f mount now allows mounting on the root 2015-06-29 23:17:04 +00:00
nightwing 5d404b50fe fix handling of root modules in setup_paths 2015-06-29 19:38:48 +04:00
Matthijs van Henten 2025a19647 Merge pull request +8012 from c9/profile-require
Allow portable paths in profile require()
2015-06-29 11:10:03 +02:00
Lennart kats a74faf23a8 Restore setup_paths.js 2015-06-28 13:12:11 +00:00
nightwing 6ec98e0a45 fix snippet loader 2015-06-28 17:06:44 +04:00
nightwing 3f15f233a4 remove recursive links 2015-06-28 17:06:43 +04:00
nightwing f7b747cb66 remove unnecessary warning 2015-06-28 17:06:42 +04:00
nightwing 0f83dcd570 allow enabling emmet from a mode 2015-06-25 19:13:35 +04:00
Lennart Kats a65656baee Merge pull request +7970 from c9/fix-javascript-token
Make sure generated tokens are never valid JavaScript
2015-06-25 14:13:45 +02:00
Lennart kats 6dd0764e91 Make sure generated tokens are never valid JavaScript 2015-06-25 10:47:30 +00:00
Matthijs van Henten be1b80294d remove amd defines so we can use it in browserify builds 2015-06-23 12:59:18 +00:00
nightwing 0c2d81350e fix +7764 Runners do not work with tmux 2.0 2015-06-22 13:46:30 +00:00
Fabian Jakobs 429814667d cleanup 2015-06-16 12:52:21 +00:00
Fabian Jakobs 999f0a08b0 Merge remote-tracking branch 'origin/master' into clone-workspaces
Conflicts:
	plugins/c9.api.project/resize.js
	plugins/c9.api.project/resize_test.js
	plugins/c9.api.project/routes.js
	plugins/c9.db.redis/user_test.js
	plugins/c9.docker/d9/archive.sh
	plugins/c9.docker/d9/backup.sh
	plugins/c9.docker/d9/check.sh
	plugins/c9.docker/d9/d9.sh
	plugins/c9.docker/daemon.js
2015-06-16 10:46:08 +00:00
Lennart Kats b717095b85 Merge remote-tracking branch 'origin/master' into improve-odev 2015-06-15 17:25:35 +02:00
Lennart Kats ef01bb068d Merge pull request +7617 from c9/fix/localfs
Set NODE_PATH via fsOptions
2015-06-12 13:59:41 +02:00
nightwing 023d0506d8 escape only invalid character sequences in reliable socket
escaping is needed to prevent disconnects on chrome
see d7fec5188600a9cff7d0e505ad680332fb6e10be
2015-06-11 10:46:20 +04:00
nightwing 265d628398 escape invalid unicode sequences in JSONToJs 2015-06-11 10:45:33 +04:00
Lennart Kats 49d88915ed Merge remote-tracking branch 'origin/master' into improve-odev
Conflicts:
	npm-shrinkwrap.json
2015-06-10 20:34:49 +00:00
Lennart kats 00f48eb9ab Store internal IP in docker host 2015-06-10 16:08:10 +00:00
nightwing 585cc8a609 better way to kill runner process 2015-06-10 11:40:40 +00:00
Fabian Jakobs 18b03b412d redirect /profile to /profile/:user 2015-06-09 08:52:21 +00:00
nightwing 6e33ccb304 fix loading non amd scripts via require 2015-06-08 01:41:07 +04:00
nightwing bb6213e203 set node_path via fsOptions 2015-06-07 21:32:53 +00:00
Lennart Kats 06efdc5cf0 Merge pull request +7544 from c9/update-ace
update ace
2015-06-05 11:21:30 +02:00
Lennart Kats 6b3bda7586 Fix stdout maxBuffer exceeded 2015-06-05 11:06:12 +02:00
nightwing 6b1a3f3d00 update ace 2015-06-02 19:29:58 +04:00
Fabian Jakobs e4087135a8 Merge remote-tracking branch 'origin/master' into better-restores 2015-06-01 12:46:57 +00:00
Fabian Jakobs 60360f8598 document req timeout 2015-05-29 08:50:49 +00:00
Fabian Jakobs aac904b65e add timeout handler to rest client 2015-05-28 12:35:12 +00:00
Nikolai Onken 6c1132bfaf Revert "Revert "Merge account"" 2015-05-27 13:19:29 +02:00
Nikolai Onken b9f8bb6aeb Revert "Merge account" 2015-05-27 13:10:23 +02:00
Nikolai Onken 7c4d170241 Fix 401 handling 2015-05-26 13:08:32 +00:00
Matthijs van Henten 8ba1a02f29 tidied 2015-05-22 10:34:11 +00:00