Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
...
Checking mergeability… Don’t worry, you can still create the pull request.
Commits on Jan 05, 2011
Eddy Bruel APF update b32e602
Eddy Bruel Fixed search in files issues 55cbf09
Eddy Bruel Merge branch 'master' into devel d63ed82
@mikedeboer mikedeboer new apf_release.js 86580db
@fjakobs fjakobs update socket.io timeouts fd3c929
@fjakobs fjakobs Merge branch 'devel' of github.com:ajaxorg/cloud9 into devel 43b7144
Commits on Jan 06, 2011
@giannis giannis * add new apf c29e50f
@giannis giannis Merge branch 'devel' of github.com:ajaxorg/cloud9 into devel dcd7140
@giannis giannis * fix for console open button 609f0e3
@giannis giannis * update apf 7d1a32b
@mikedeboer mikedeboer Merge branch 'devel' of github.com:ajaxorg/cloud9 into devel
Conflicts:
	client/js/apf_release.js
19c42a3
@mikedeboer mikedeboer updated apf aa2b742
@fjakobs fjakobs Merge branch 'devel' of github.com:ajaxorg/cloud9 into devel 87c146d
@fjakobs fjakobs update apf 66ad83e
@fjakobs fjakobs update socket.io f6897b0
@giannis giannis * update apf a4ef6b6
@giannis giannis Merge branch 'devel' of github.com:ajaxorg/cloud9 into devel d091bc3
@mikedeboer mikedeboer updated apf f18396b
@fjakobs fjakobs new apf release 6f0cb26
@fjakobs fjakobs Merge branch 'devel' of github.com:ajaxorg/cloud9 into devel
Conflicts:
	client/js/apf_release.js
e03a09b
@fjakobs fjakobs update apf release 573a838
@mikedeboer mikedeboer enabled flashsocket transport again, but at lower prio c8be486
@linh81 linh81 fix for c9auth 4eacab0
@giannis giannis * update apf c5b1117
@giannis giannis Merge branch 'devel' of github.com:ajaxorg/cloud9 into devel 44cf5a0
Eddy Bruel Fixed an issue that caused search and quicksearch
to interfere with each other.
e437715
Eddy Bruel Fixed a circulare dependency between quickwatch
and console.
ba0aa55
Eddy Bruel Made the title of the (search &) replace window
dependent on its mode.
f8f0a01
Eddy Bruel Submodule update 68b22b2
Eddy Bruel Merge branch 'devel' of github.com:ajaxorg/cloud9 into devel fb95886
Eddy Bruel Submodule update aacab5b
Commits on Jan 07, 2011
@fjakobs fjakobs move v8 debugger test files to test 6dddb3d
@fjakobs fjakobs update debugger ec38232
@giannis giannis * add events to different extensions f26f391
@fjakobs fjakobs fix goto file 5723c23
@linh81 linh81 added errorpage for internal server errors 61ddd4a
@linh81 linh81 Merge branch 'devel' of github.com:ajaxorg/cloud9 into devel f968d2e
Commits on Jan 10, 2011
@mikedeboer mikedeboer fixed default error message 430d561
@mikedeboer mikedeboer made error message a bit friendlier 6ff4501
@mikedeboer mikedeboer made error message a bit friendlier a9f7b9b
@mikedeboer mikedeboer Merge branch 'devel' of github.com:ajaxorg/cloud9 into devel
Conflicts:
	server/cloud9/ide.js
4ce1956
bone * add new apf f263826
Eddy Bruel Fixed copying via the clipboard in the tree 2373611
Commits on Jan 13, 2011
@linh81 linh81 fixed errorpage bug f4edf7d
@linh81 linh81 Merge branch 'devel' of github.com:ajaxorg/cloud9 into devel 8c11432
@mikedeboer mikedeboer updated apf 27d29cc
@fjakobs fjakobs update apf b74a38b
@fjakobs fjakobs Merge branch 'devel' of github.com:ajaxorg/cloud9 into devel 388018a
Commits on Jan 14, 2011
@mikedeboer mikedeboer removed apf temporarily 6f23050
@mikedeboer mikedeboer Merge branch 'devel' of github.com:ajaxorg/cloud9 into devel b3af9cd
@mikedeboer mikedeboer added apf back to the repo 2e997ad
@linh81 linh81 changed path to stylesheets/images on errorpages from relative to abs…
…olute
5d95443
@linh81 linh81 Merge branch 'devel' of github.com:ajaxorg/cloud9 into devel 3d72c16
@rikarends rikarends safepush 1d5d8a7
@linh81 linh81 added error page template to cloud9 7f9f2ba
@rikarends rikarends safepush 9662202
@rikarends rikarends Merge branch 'devel' of github.com:ajaxorg/cloud9 into devel 28f0a21
@linh81 linh81 Merge branch 'devel' of github.com:ajaxorg/cloud9 into devel 2de863a
Commits on Jan 17, 2011
@fjakobs fjakobs adapt cloud9 to ACE changes 6e247e0
@fjakobs fjakobs update async.js 136f4bb
bone * update apf 977a6d9
@fjakobs fjakobs proper dispose if ide plugins
Conflicts:

	server/cloud9/ide.js
e91b299
@fjakobs fjakobs fix bug in keyhandler c277a96
Commits on Jan 18, 2011
@fjakobs fjakobs Merge branch 'tmp' into devel
Conflicts:
	server/cloud9/ide.js
b94fc4c
@fjakobs fjakobs update ace 607842e
Commits on Jan 19, 2011
@fjakobs fjakobs adapt to Ace changes cb11daa
@fjakobs fjakobs fix watcher b296a4e
@fjakobs fjakobs update ace 487b756
Mike fixed builds of apf edf1f4f
@mikedeboer mikedeboer New apf_release 870351a
Commits on Jan 20, 2011
@fjakobs fjakobs add function to detect whether a port is open fa07664
@fjakobs fjakobs Merge branch 'devel' of github.com:ajaxorg/cloud9 into devel 721b447
Commits on Jan 21, 2011
@fjakobs fjakobs add getHostName 606c138
@fjakobs fjakobs separate mount dir from ws dir d35dbc1
Commits on Jan 25, 2011
@mikedeboer mikedeboer this commit makes cloud9 work in Chromeless ca26818
Commits on Jan 31, 2011
@mattpardee mattpardee Collaboration 44148d7
Commits on Feb 01, 2011
@mattpardee mattpardee Return of the splitters 73f89cb
@mattpardee mattpardee Resizing just the file tree e5cf139
@mattpardee mattpardee Tabs background image fix 796580a
@mattpardee mattpardee Disabling panels when hidden, splitters hide" 4be68d8
@mattpardee mattpardee Reverting disabling of panels on hide 713c445
@mattpardee mattpardee winFilesViewer hide/show events hide/show splitter c719735
Commits on Feb 02, 2011
@mattpardee mattpardee Changes to dockpanel 8ba3af9
@mattpardee mattpardee Extension Template 4dbf348
@mattpardee mattpardee Extension Template update 582c425
@mattpardee mattpardee Extension Template update 27cd023
@mattpardee mattpardee Extension Template update 17f6d6e
@mattpardee mattpardee Extension Template update d6bc535
@mattpardee mattpardee Extension Template update 609d4d5
@mattpardee mattpardee Extension Template update 42306a1
@mattpardee mattpardee Reverting console splitter 1c86449
@fjakobs fjakobs update ace 609c014
@fjakobs fjakobs Merge branch 'devel' of github.com:ajaxorg/cloud9 into devel 0938eaf
Commits on Feb 03, 2011
@mattpardee mattpardee Dock panel functional with plugins 658ada3
@fjakobs fjakobs general code cleanup to make jslint happy b01dafe
@fjakobs fjakobs create abstraction for a connected user d83f636
@fjakobs fjakobs update ace 393893d
Commits on Feb 04, 2011
@mattpardee mattpardee Dock panel upgrades and collaboration UI ef7c0b5
@fjakobs fjakobs remove dependency to the run plugin 7353393
@fjakobs fjakobs update persmissions 7159728
@fjakobs fjakobs enforce read only mode on the webdav side ab6a51f
@fjakobs fjakobs the "user" and "username" is now stored in a session 0dd50ef
@fjakobs fjakobs update ace 6f4df2b
@fjakobs fjakobs update ace 162322b
@mattpardee mattpardee Updated chat interface 5bbba0b
@fjakobs fjakobs store permissions per workspace 08d978d
@fjakobs fjakobs rename git plugin a4da879
@fjakobs fjakobs turn editor in readonly mode 613cb4b
@fjakobs fjakobs reorder plugin arguments b11cce4
@fjakobs fjakobs update viewer permissions f7cb2de
Commits on Feb 07, 2011
@fjakobs fjakobs fix wording 37deedf
@fjakobs fjakobs give server plugins names 1fbcf39
@fjakobs fjakobs filter server responses based on plugin names c164405
@fjakobs fjakobs add "hasPermission" function 4c0c786
@mattpardee mattpardee Updates to dock, collaboration 6f80f4a
@mattpardee mattpardee Smart textarea chat input 89471a6
@fjakobs fjakobs don't save settings in readonly mode 67619f1
@fjakobs fjakobs no need to store permissions in the session 369968e
@fjakobs fjakobs use destroy otherwise we may run out of file descriptors 233c510
@fjakobs fjakobs init exclude list 255ffb1
@fjakobs fjakobs add option to add additional client side plugins 07b9b8f
Commits on Feb 08, 2011
@mattpardee mattpardee Smart chat window and chat objects ea8b387
@fjakobs fjakobs Merge branch 'master' of github.com:ajaxorg/cloud9 into devel 922b54e
@fjakobs fjakobs Merge branch 'devel' into uxteam bed6903
@fjakobs fjakobs extract default plugins into a static field 6b431d4
@mattpardee mattpardee Separated collaboration ext 25ba83d
@fjakobs fjakobs Merge branch 'uxteam' of github.com:ajaxorg/cloud9 into uxteam
Conflicts:
	server/cloud9/ide.js
695c737
@fjakobs fjakobs move plugins to c9 2ef0f27
@fjakobs fjakobs update ace b954059
@fjakobs fjakobs update apf 9033ba0