mirror
/
c9-core
kopia lustrzana https://github.com/c9/core
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność
4 799 Commity
10 Gałęzie
0 Tagi
38 MiB
Wykres commitów

456 Commity (aca360d6bbcf5ae316c08596b5fe33d22c49e10b)

Autor SHA1 Wiadomość Data
nightwing caea61a57e fix workspace list in local version 2015-10-05 13:22:56 +04:00
Ruben Daniels 9b17d0e88e Merge branch 'master' of github.com:c9/newclient into fix/testpanel 2015-10-01 15:30:59 -07:00
nightwing 304819f37e fix regression in handling right command key on mac 2015-10-01 23:26:24 +04:00
nightwing c3714fb7a8 fix debugger not working with misconfigured localhost 2015-10-01 19:27:08 +04:00
Tim Robinson 4054d149b2 oberr is just a function 2015-10-01 10:42:51 +00:00
Tim Robinson 54fa807ed2 Turned oberr into a seperate module so we can use it client side 2015-10-01 10:40:17 +00:00
nightwing 241e14da31 fix issue with stale line widgets 2015-10-01 02:53:35 +04:00
Ruben Daniels bca8b3196b Merge branch 'master' of github.com:c9/newclient into fix/testpanel 2015-09-29 11:22:45 -07:00
nightwing 8d6487f819 use javascript mode for jsx files 2015-09-28 17:15:58 +04:00
nightwing 2e1b33cb33 update ace 2015-09-28 17:10:05 +04:00
nightwing 721cb0d8f3 add scrollbar min width 2015-09-25 20:49:23 +00:00
nightwing f15df7e58a fix diff for added/removed files 2015-09-20 19:22:54 +04:00
nightwing 0b5343e8c2 code style 2015-09-16 13:21:58 +04:00
nightwing e5de2372c3 add recursive require.undef for sdk 2015-09-16 01:22:30 +04:00
nightwing bd520032ad show line widget for debugger exceptions 2015-09-13 17:28:53 +04:00
nightwing 6a6fdd6940 fix broken bashspawn on windows 2015-09-13 17:28:50 +04:00
Lennart kats d3178c59a6 Propagate err.stdout and err.stderr from localfs.execFile() 2015-09-12 15:06:54 +00:00
nightwing 1de84e810d allow whitespace after define( 2015-09-08 20:50:53 +04:00
Matthijs van Henten b447e9ee6b fixes +9103 constructor is a special key... 2015-09-07 08:40:19 +00:00
Harutyun Amirjanyan 6b38a82a15 Merge pull request +8895 from c9/testpanel 
Generic test panel with mocha plugin
 2015-09-04 15:56:59 +04:00
nightwing 372ea62033 fix test=1 flag 2015-09-04 15:49:01 +04:00
Harutyun Amirjanyan 2ee3cbf307 Revert "Revert "Fix various sdk issues"" 2015-09-04 12:24:07 +04:00
Alex Brausewetter 1fa1c01ddd Revert "Fix various sdk issues" 2015-09-03 15:59:24 -07:00
Alex Brausewetter 3977deb02a Merge pull request +9109 from c9/fix/various 
Fix various sdk issues
 2015-09-03 14:09:23 -07:00
Fabian Jakobs 107176d67f Merge remote-tracking branch 'origin/master' into fix-vfs-cpu 
Conflicts:
	npm-shrinkwrap.json
	package.json
 2015-09-03 12:09:52 +00:00
nightwing 220c267e44 fix loading pty.js in local version 2015-09-03 12:42:40 +04:00
Fabian Jakobs 021716bcde bump protocol version 2015-09-02 10:26:06 +00:00
Fabian Jakobs 70cb7b1d5d add debugging code 2015-09-02 10:14:17 +00:00
Fabian Jakobs 7ac14a89a2 add support for pausing and resuming streams and PTYs 2015-09-02 10:13:42 +00:00
nightwing 0b14bcf31e fix ejs highlighting 2015-08-31 14:33:21 +04:00
nightwing 2962ff6e9e fix line widgets added to same line getting stuck 2015-08-28 19:25:51 +04:00
nightwing 137c2731fe include padding in fullWidth widget width 2015-08-28 04:25:47 +04:00
nightwing e29543adfb fix horizontal scrolling with line widgets 2015-08-28 04:17:20 +04:00
nightwing 1ca8dbdd31 fix linewidgets interaction with folding 2015-08-28 04:17:19 +04:00
Ruben Daniels cf22a3db2a Added sorting to the tree 2015-08-25 10:11:07 -07:00
Ruben Daniels aa6b132249 Merge branch 'master' of github.com:c9/newclient into testpanel 2015-08-21 08:53:07 -07:00
Lennart Kats ae6e89f36b Merge pull request +8808 from c9/fix-sdk 
Fix missing node_module error in sdk and add test
 2015-08-21 13:56:44 +02:00
Ruben Daniels 2362b34eb3 Merge branch 'master' of github.com:c9/newclient into testpanel 2015-08-20 17:00:49 -07:00
Fabian Jakobs f60be9609c Merge pull request +8772 from c9/revert-8771-revert-8737-use-open-for-repos 
Revert "Revert "Use open for repos""
 2015-08-20 16:27:18 +02:00
Nikolai Onken bc56c35800 Fix signout for IDE 2015-08-20 13:56:38 +00:00
nightwing 31dbc16d90 ensure we never use node_modules outside of root dir 2015-08-19 20:14:52 +04:00
Fabian Jakobs 24748e5f53 link to github 2015-08-19 12:02:36 +00:00
Fabian Jakobs 8c86f46c25 Revert "Use open for repos" 2015-08-18 12:21:10 +02:00
Ruben Daniels 8240d2bc65 Basic features of the result panel are working 2015-08-17 14:59:35 -07:00
Fabian Jakobs 6dfec5299b fix ssh check 2015-08-17 09:15:08 +00:00
Ruben Daniels d3bd74e33d The first tests are running 2015-08-16 17:28:36 -07:00
Lennart Kats 7b9b71ac2e Revert "Revert "ctags for user defined extensions"" 2015-08-14 11:09:18 +02:00
Matthijs van Henten b1dc9f22a2 Revert "ctags for user defined extensions" 
This reverts commit 40c8ae24cf.
 2015-08-14 09:00:36 +00:00
Harutyun Amirjanyan c970587003 Merge pull request +8618 from c9/ctags 
ctags for user defined extensions
 2015-08-14 12:07:57 +04:00
Fabian Jakobs 2d95dd16c9 fix error handling for the restful API 2015-08-13 09:11:36 +00:00
nightwing 40c8ae24cf ctags for user defined extensions 2015-08-10 19:52:22 +04:00
Harutyun Amirjanyan 3d99de215c Merge pull request +8617 from c9/pull/core/124 
Added column.getHTML method to acetree
 2015-08-10 17:06:29 +04:00
Serkan Serttop 852979979f Added column.getHTML method to acetree https://groups.google.com/forum/#!topic/cloud9-sdk/k_O1-1HOb3s 2015-08-10 01:04:32 +03:00
nightwing 8e48f77a13 fix jade mode 2015-08-09 14:41:22 +04:00
Harutyun Amirjanyan d73b3ef3dc Merge pull request +7734 from c9/git-ui 
[WIP] Git ui first iteration
 2015-08-07 14:25:50 +04:00
nightwing 5d57d94da4 fix long broken tests 2015-08-07 01:50:44 +04:00
nightwing 7ef3f3ef32 add simple git ui 2015-08-05 21:17:16 +04:00
Lennart Kats 7431dee3de Only show git login/signup for supported domains 2015-08-01 12:55:23 +00:00
Fabian Jakobs 9741cb63b1 Merge pull request +8504 from c9/fix/collab-tree 
remove unused code from tree renderer
 2015-07-31 09:43:05 +02:00
nightwing ad9da97952 remove unused code from tree renderer (fixes +8489) 2015-07-31 07:15:26 +04:00
nightwing 184987ec53 load less into architect-build lazily to allow building ace without less 2015-07-29 16:04:29 +04:00
Lennart Kats 31218bbc1d Fix vfs-child/parent error handling 
Fixes crash when child prints to stdout/stderr,
triggering unhandled EPIPE error
 2015-07-26 20:51:10 +02:00
nightwing 4f4a78d6ed fix ace not getting focus on mousedown when iframe is focused 2015-07-26 00:04:31 +04:00
nightwing 5037041a51 call removeLicenceComments only for js and css files 2015-07-26 00:03:26 +04:00
Ruben Daniels eda61cfd08 Merge pull request +8316 from c9/update-ace 
update ace
 2015-07-22 17:47:27 -07:00
Fabian Jakobs 9fca7a6cd3 rewrite URL and let proxy listen on port 80 2015-07-21 14:12:47 +00:00
nightwing 5d2bb09104 allow expand_abbreviation emmet command for all modes 2015-07-20 17:42:59 +04:00
nightwing a31962ca7b update c9 cli 2015-07-20 15:43:27 +04:00
nightwing aa45d67600 update ace 2015-07-19 18:52:18 +04:00
nightwing 30c615eca8 update acorn 2015-07-18 09:04:19 +04:00
nightwing b551071cdc fix infinite loop in acorn_loose when parsing broken import 2015-07-17 11:00:04 +00:00
nightwing 533071ff05 update acorn 2015-07-14 01:06:58 +04:00
nightwing ef11557828 use -ww instead of COLUMNS 1000 2015-07-08 17:32:56 +04:00
nightwing fa7496364c fix debugger not working on on FreeBSD 2015-07-08 16:12:17 +04:00
Nikolai Onken a00eef3fec Merge branch 'master' of github.com:c9/newclient into profile-005-5-page-cache-project-page 2015-07-07 15:53:38 +00:00
Harutyun Amirjanyan e48310adfd Merge pull request +7862 from c9/parallel-requests 
More parallel requests + caching for unpacked (online)dev
 2015-07-07 17:30:52 +04:00
Nikolai Onken 7fabaaa51f Simplify routing 2015-07-07 09:45:22 +00:00
Nikolai Onken 37286ec012 Fix login / error handling 2015-07-07 08:50:06 +00:00
Nikolai Onken bf2d7fec2f Simplify util and config 2015-07-05 07:17:52 +00:00
Nikolai Onken 9d5904e9ba Simplify 2015-07-04 22:07:10 +00:00
Lennart Kats f1c1575302 Revert "Revert "Escape only invalid character sequences in reliable socket"" 2015-07-03 16:59:39 +02:00
Lennart Kats 2aac81b7e7 Revert "Escape only invalid character sequences in reliable socket" 2015-07-03 16:59:18 +02:00
Ruben Daniels 8e68e8c7e1 Merge pull request +8063 from c9/fix/firefox 
Fix firefox styling issues
 2015-07-02 17:24:31 -07:00
nightwing bc0b8e02d7 do not add sourceURL in architect-build 2015-07-03 04:00:29 +04:00
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 6462fcb107 Merge remote-tracking branch 'origin/master' into parallel-requests 2015-07-02 17:30:52 +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
nightwing 7054f0b675 remove dead code 2015-07-01 15:03:05 +04: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
nightwing 06f3ad3760 make debugging css easier 2015-07-01 06:34:36 +04: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 2c656ebb3a Also do lib requests in parallel 2015-06-25 16:50:57 +02:00
Lennart kats 52b5e370fb Get unpacked (o)dev content in parallel from ide.c9.io and c9.io 2015-06-25 16:50:57 +02: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
Matthijs van Henten 4ffa8c0e8e adds a global handler to frontdoor: allow injection of global middlewares 2015-05-21 23:42:00 +00:00
Matthijs van Henten 5bd78f5ecc adds a mount feature to frontdoor: mount sections into the existing chain 2015-05-21 23:41:09 +00:00
nightwing a9c489b131 fix highlighting of line-height:1.5 in less mode 2015-05-18 16:24:10 +04:00
nightwing 9a865df0ec do not load pty.js when testing connection since that can crash node process 2015-05-16 03:09:24 +04:00
nightwing 6f7184c56b fix publish hanging because of not reading from tar stdout 2015-05-16 03:09:24 +04:00
Lennart Kats e131f6ca66 Merge pull request +7291 from c9/fix/restore-workspaces 
Misc restore fixes to fix large restores failing
 2015-05-15 09:03:12 +02:00
nightwing 8a6d9ac4b9 send more errors from worker to raygun 2015-05-13 18:40:23 +04:00
nightwing 8091c4b789 use runInThisContext instead of runInNewContext 2015-05-12 17:57:09 +04:00
Tim Robinson ee44507ced Misc restore fixes to fix large restores failing 2015-05-12 10:11:14 +00:00
nightwing 2c273b97a9 fsOptions.homeDir is missing on ssh workspaces 2015-05-11 07:52:10 +04:00
Harutyun Amirjanyan d7ab6da51f Merge pull request +7252 from c9/sdk 
More tweaking of sdk
 2015-05-10 22:46:22 +04:00
Harutyun Amirjanyan bacef4fd52 Merge pull request +7244 from c9/fix/tree-pagedown 
fix +7206 pressing pagedown screws up the layout of ace trees
 2015-05-10 19:28:15 +04:00
nightwing 84a371f9d9 fix regression in sdk 2015-05-10 18:52:26 +04:00
nightwing bf92cc54e7 remove stray console.log 2015-05-10 04:26:22 +04:00
nightwing 9e1bb472c6 use node from c9 dir 2015-05-10 04:26:21 +04:00
nightwing 0b8cc06019 fix +7206 pressing pagedown screws up the layout of ace trees 2015-05-08 17:31:08 +04:00
Lennart kats 28b561fa22 Merge remote-tracking branch 'origin/master' into clone-workspaces 
Conflicts:
	server.js
 2015-05-06 14:42:51 +00:00
nightwing a2db60bed8 fix escaping of uppercase script tags in JSONToJS 2015-05-04 17:27:15 +04:00
nightwing 8a88de1656 revert changes to getUndoSelection for now 2015-05-04 06:55:22 +04:00
nightwing e7c56ee45c fix failing tests 2015-05-04 02:29:17 +04:00
nightwing ce06798521 fix inconsistency between getState and setState 2015-05-04 02:28:03 +04:00
nightwing 3644d203c2 use same undo manager for multiple sessions 2015-05-04 02:27:59 +04:00
nightwing 873143a725 fix metadata tests 2015-05-04 02:27:52 +04:00
nightwing caad98e5d2 use the new undoManager in ace.js 2015-05-04 02:27:51 +04:00
nightwing c9f492a916 make sure edit ids are always unique 2015-05-04 02:27:49 +04:00
nightwing f04f22076c allow redoing after changing the document 2015-05-04 02:27:47 +04:00
nightwing cc252235b0 do not undo edits of other users 2015-05-04 02:27:38 +04:00
nightwing a7033da975 convert paste into command 2015-05-03 20:34:41 +04:00
Tim Robinson 3ef354bc71 Merge remote-tracking branch 'origin/master' into clone-workspaces 2015-05-03 15:01:36 +00:00
Ruben Daniels 8ce9aa9d61 Fix pty processes 2015-05-01 16:43:15 +00:00
Ruben Daniels d499d6c198 Merge branch 'master' of github.com:c9/newclient into fix/bridge 
Conflicts:
	package.json
 2015-05-01 16:32:54 +00:00
Ruben Daniels 71f2d769d9 Fixed tests 2015-05-01 16:31:49 +00:00
Ruben Daniels bde9054f84 Fixes adding c9 cli to the installer 2015-05-01 15:17:29 +00:00
Ruben Daniels 836fd9222f fix vfs bug when sending streams/processes more than once. add fetching home for tests 2015-05-01 14:19:15 +00:00
Tim Robinson e7703a4690 Merge remote-tracking branch 'origin/master' into clone-workspaces 
Conflicts:
	scripts/build-server.js
 2015-05-01 13:16:11 +00:00
nightwing 0075a1df3e fix node 0.12 warning about customFds 2015-05-01 12:14:25 +04:00
Ruben Daniels dd8ed52b4f Add setting for the default editor 2015-05-01 01:53:12 +00:00
Ruben Daniels 21b75cb86b Add editor to the terminal 2015-05-01 01:44:12 +00:00
nightwing 2fd7a8b619 include collab in main vfs build 2015-04-30 13:12:00 +04:00
nightwing 9bc6190ad0 fix color of bracket highlight in katzenmilch theme 2015-04-30 04:14:01 +04:00
nightwing 499c8976b9 better invisible tabs 2015-04-30 04:10:09 +04:00
nightwing b4c643c9ab fix toggle comments in handlebars mode 2015-04-30 03:55:39 +04:00
Ruben Daniels 9fea731052 Merge pull request +7078 from c9/fix/install-cli 
Installer fixes
 2015-04-29 15:23:21 -07:00
nightwing cc9f039843 include modules required from config in dependency list 2015-04-30 00:27:57 +04:00
Lennart Kats d6d19ff38e Fix test 2015-04-29 12:05:28 +02:00
Lennart Kats 58afdf088c Allow optional parameters to be falsy 2015-04-29 11:39:28 +02:00
nightwing 35175d40ca add more php extensions 2015-04-27 19:59:07 +04:00
Tim Robinson 31cc967b57 Merge remote-tracking branch 'origin/master' into clone-workspaces 2015-04-27 12:55:35 +00:00
nightwing 182577009f do not automatically create tag from publish 2015-04-25 03:24:10 +04:00
nightwing 3962a9c04f fix quote pairing for "\n" 2015-04-25 03:02:08 +04:00
Tim Robinson e592c05f74 Adding error logging to raygun for failed cloning. Fixed bugs with registering project api functions 2015-04-24 13:52:40 +00:00
Tim Robinson ef53c82186 Merge remote-tracking branch 'origin/master' into newclient-dockerlike-deploy 2015-04-22 14:33:31 +00:00
Tim Robinson 527ed2277d Merge remote-tracking branch 'origin/master' into newclient-dockerlike-deploy 2015-04-22 14:33:21 +00:00
nightwing 71029a4300 fix typo 2015-04-22 13:35:25 +04:00
nightwing 8ec0d8e5fe fix scrollbar regression 2015-04-21 23:59:39 +04:00
Ruben Daniels f9520fa811 Fixes +6095. Only see kaefer output with debug=3 2015-04-20 17:50:52 +00:00
Lennart Kats 4e2778e49c Merge pull request +6936 from c9/update-ace 
Update ace
 2015-04-20 15:07:34 +02:00
Tim Robinson d0efc05e9c Merge remote-tracking branch 'origin/master' into newclient-dockerlike-deploy 2015-04-20 12:32:47 +00:00
nightwing 83bda0cf59 update ace 2015-04-19 16:16:45 +04:00
nightwing 68b133fa61 include modules required via require.resolve in npm_build 2015-04-18 22:35:46 +04:00
Tim Robinson c8ed575dfd Merge remote-tracking branch 'origin/master' into newclient-dockerlike-deploy 
Conflicts:
	scripts/makestatic.sh
 2015-04-17 11:02:10 +00:00