900 Commits

Author SHA1 Message Date
Alex Brausewetter
cdcc61d2f4 Add PHP built-in server runner 2015-05-10 15:45:54 +00:00
Alex Brausewetter
4742318c7b Update PHP runtime, add better defaults, add xdebug 2015-05-07 12:35:07 +00:00
Matthijs van Henten
95476bf099 Revert "Profile: create project" 2015-05-07 12:03:57 +02:00
Fabian Jakobs
785acc9122 Merge remote-tracking branch 'origin/master' into profile-001-1-create-project
Conflicts:
	configs/client-profile.js
2015-05-07 08:22:05 +00:00
nightwing
22343618a6 add npm-g to default config 2015-05-06 20:31:43 +00:00
Alex Brausewetter
030a803a78 Alias npm to npm-g on win32 2015-05-06 14:12:51 +00:00
Fabian Jakobs
5e75f0cf90 Merge remote-tracking branch 'origin/master' into profile-001-1-create-project
Conflicts:
	npm-shrinkwrap.json
	server.js
2015-05-06 14:02:39 +00:00
Alex Brausewetter
b0f4dcdf63 Refactor npm/npm-g and install from empty dir 2015-05-06 13:02:20 +00:00
Lennart kats
9cc8b588c2 Remove old config 2015-05-06 10:57:38 +00:00
Harutyun Amirjanyan
787182b0aa Merge pull request +7153 from c9/fix/sfdc-installer
Install SFDC plugin dependencies
2015-05-05 20:51:39 +04:00
Alex Brausewetter
9ef0ac251d Allow installation of most recent version 2015-05-05 15:45:55 +00:00
Harutyun Amirjanyan
5231b7870a Merge pull request +7152 from c9/update-eslint
Update eslint
2015-05-05 19:42:56 +04:00
Alex Brausewetter
d9235bff30 Fix verbose tar command getting stuck 2015-05-05 15:26:57 +00:00
Lennart Kats
f3b07981f6 Cut tests some more slack
Hopefully closes +6921 ;)
2015-05-05 17:22:37 +02:00
Lennart Kats
18c03d5486 Support new eslint 0.20.0 2015-05-05 17:21:13 +02:00
Lennart Kats
8f5aa5caf6 Don't show language warning when collab is not yet installed 2015-05-05 16:49:10 +02:00
Lennart Kats
6aacc02211 Make exception explicit 2015-05-05 16:48:57 +02:00
Lennart Kats
a16f73ebc7 Don't override global require 2015-05-05 16:48:47 +02:00
Lennart Kats
a0387fe43a Fix "close all tabs" / "close other tabs"
Fixes +6011
Fixes +5764
2015-05-05 15:50:46 +02:00
Lennart Kats
1c88925601 Update browserified eslint 2015-05-05 15:30:53 +02:00
Lennart Kats
52af0d27b5 Update eslint to 0.20.0 2015-05-05 13:29:04 +00:00
nightwing
a2db60bed8 fix escaping of uppercase script tags in JSONToJS 2015-05-04 17:27:15 +04:00
Fabian Jakobs
5e358a2840 Merge remote-tracking branch 'origin/master' into profile-001-1-create-project
Conflicts:
	configs/profile.js
	npm-shrinkwrap.json
	plugins/c9.styleguide/lib/flex.less
2015-05-04 10:42:05 +00:00
Fabian Jakobs
1ebe965bd4 add profile to default server.js configs 2015-05-04 10:33:06 +00: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
cef4157eb3 revert changeSync event 2015-05-04 02:28:01 +04:00
nightwing
3644d203c2 use same undo manager for multiple sessions 2015-05-04 02:27:59 +04:00
nightwing
8312d3d5ac fix save test 2015-05-04 02:27:57 +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
9405b78dce do not group local edits with remote ones 2015-05-04 02:27:45 +04:00
nightwing
0d10299299 update tests to work with sync undomanager events 2015-05-04 02:27:40 +04:00
nightwing
cc252235b0 do not undo edits of other users 2015-05-04 02:27:38 +04:00
Ruben Daniels
47a52d8250 Fix error reporting of live update 2015-05-03 21:07:14 +00:00
Ruben Daniels
1d662c99d1 Merge branch 'master' of github.com:c9/newclient into fix/cli
Conflicts:
	package.json
2015-05-03 19:20:15 +00:00
Ruben Daniels
0fa1dae1f3 run apt-get update when install fails 2015-05-03 19:19:20 +00:00
Ruben Daniels
fd0cecaa52 Run apt-get update when needed 2015-05-03 18:51:55 +00:00
Ruben Daniels
9039709080 Some small cli fixes 2015-05-03 17:08:40 +00:00
Ruben Daniels
0f2745a33c Merge pull request +7139 from c9/fix/various
Fix several small issues
2015-05-03 09:53:57 -07:00
nightwing
d3c66bee4c fix installer on windows 2015-05-03 20:44:12 +04:00
nightwing
333dee97da fix +7113 Image width shows as 0px on image preview 2015-05-03 20:43:36 +04:00
nightwing
d614198e35 fix collab showAuthorInfo 2015-05-03 20:34:53 +04:00
nightwing
a7033da975 convert paste into command 2015-05-03 20:34:41 +04:00
Ruben Daniels
ed19e9c37b Fix typo and error reporting 2015-05-03 15:27:16 +00:00
nightwing
68a6a14d90 fix clearUndo 2015-05-03 15:06:06 +04:00
Ruben Daniels
04fec89a2f Fixes typo in debug 2015-05-03 03:08:43 +00:00