Commit graph

338 commits

Author SHA1 Message Date
nightwing
1254357d92 Merge remote-tracking branch 'remotes/upstream/master'
Conflicts:
	lib/ace/commands/command_manager.js
	lib/ace/test/mockrenderer.js
	lib/ace/test/all_browser.js
2012-04-07 01:00:49 +04:00
Fabian Jakobs
b096c279b3 load modes in the demo on demand 2012-04-06 15:33:25 +02:00
John Roepke
74daa182e9 Add LESS syntax highlighting. 2012-04-05 21:18:09 +00:00
Bernie Telles
0a9ff4f55d Add sample docs for liquid. 2012-04-05 09:29:45 -07:00
nightwing
b546875c1d Merge remote-tracking branch 'remotes/upstream/master'
Conflicts:
	demo/kitchen-sink/demo.js
2012-03-31 20:39:26 +04:00
William Candillon
bdb21ff646 Merge https://github.com/ajaxorg/ace
Conflicts:
	Makefile.dryice.js
	build/demo/kitchen-sink/kitchen-sink-uncompressed.js
	build/kitchen-sink.html
	build/src/ace-noconflict.js
	build/src/ace.js
	demo/kitchen-sink/demo.js
2012-03-31 10:00:21 +02:00
Fabian Jakobs
0fb6590f26 be smarter with mode and theme loading 2012-03-30 17:44:24 +02:00
William Candillon
d7015b1c08 Add xquery doc to the kitchen sink. 2012-03-30 16:18:54 +02:00
William Candillon
a84caa3600 Add XQuery mode to the kitchen sink. 2012-03-30 16:11:04 +02:00
cloud9Deploy
1340569415 Merge pull request #672 from ajaxorg/theme/update_monokai
Hella improve syntax highlighting for JS across all themes
2012-03-26 02:58:33 -07:00
richo
d6a21166fc Add sh editing mode based on the python mode 2012-03-26 11:26:10 +02:00
nightwing
2227a9bfea rename 2012-03-26 11:51:24 +04:00
nightwing
fdf9841ef9 keep option in demo across reloads 2012-03-26 11:49:54 +04:00
Garen Torikian
5a02205fc8 Update to add param colors and more JS functions 2012-03-24 02:47:25 +01:00
Garen Torikian
ee667179b3 Add a few more JS styles for escaped chars & keywords, also tests 2012-03-22 18:17:01 +01:00
nightwing
c955e33e04 first draft of multicorsor (messy but mostly works) 2012-03-22 19:41:48 +04:00
Fabian Jakobs
0ff2e3540a more interesting demos 2012-03-21 12:56:31 +01:00
Fabian Jakobs
9936be106d demot fix 2012-03-16 11:16:20 +00:00
nightwing
7f39633a5e add a little more text to js doc for testing multicursor 2012-03-13 21:56:22 +04:00
Meg Sharkey
f684fed674 added example for yaml 2012-03-12 16:39:06 -07:00
cadorn
67abf80c4e sourcemint loader support 2012-02-29 16:03:18 -08:00
Fabian Jakobs
182ba8345e minor demo fix 2012-02-22 11:07:47 +01:00
Garen Torikian
987528bfe2 Fix spelling of 'orientation' 2012-02-01 12:12:15 -08:00
Fabian Jakobs
cf6f4d88d3 Merge branch 'master' of https://github.com/desoi/ace into desoi-master
Conflicts:
	Makefile.dryice.js
2012-01-06 11:39:27 +01:00
John DeSoi
493824ca4d new mode for PostgreSQL - pgsql 2012-01-05 22:00:26 -05:00
Fabian Jakobs
307b3884b5 update require.js 2012-01-02 17:33:01 +01:00
Fabian Jakobs
f3cd1d1f7e kitchen sink gets its own set of themes 2011-12-20 12:18:02 +01:00
Fabian Jakobs
e8f80f9ca7 Merge pull request #568 from mwkaufmann/patch-1
fix: a minor typo in demo.js
2011-12-14 05:28:29 -08:00
Fabian Jakobs
b6fbe5b6bb hide fold icons in manual mode 2011-12-13 16:48:13 +01:00
mwkaufmann
57e77c590e fixed a typo 2011-12-10 00:39:51 +01:00
Fabian Jakobs
4ff215fb72 fix css sample 2011-12-05 16:01:41 +01:00
Fabian Jakobs
82a930053b Merge remote-tracking branch 'nightwing/pullreq'
Conflicts:
	lib/ace/mode/folding/cstyle.js
2011-12-05 15:56:38 +01:00
Fabian Jakobs
70cef75704 add setting to toggle fold mode 2011-12-05 15:11:36 +01:00
nightwing
ba334cae71 fix for broken paren matching in @keyframes rules 2011-12-04 20:40:46 +04:00
Fabian Jakobs
a37f9562e3 add mixed mode folding rules 2011-12-02 13:19:36 +01:00
John DeSoi
5347de55a6 Fix missing SQL sample file in demo.
Added sql.sql to the kitchen-sink demo.
2011-11-29 13:38:49 -05:00
Fabian Jakobs
cd271f1a8b add failing unit test for #510 2011-11-28 17:38:58 +01:00
Fabian Jakobs
d513838288 remove unused imports 2011-11-25 17:20:50 +01:00
Fabian Jakobs
c97fc93a71 Merge branch 'haxesyntax'
Conflicts:
	demo/kitchen-sink/demo.js
2011-11-15 11:38:43 +01:00
Fabian Jakobs
6d06b3bbd0 cleanups to the haxe mode 2011-11-15 11:21:57 +01:00
Jason O'Neil
45d3c86da6 Changed to demo, because haxe.hx was renamed to Haxe.hx
Haxe files must be uppercase to be compile-able.
2011-11-15 11:15:41 +01:00
Jason O'Neil
8f0a86639a Renamed haxe file sample and changed class so that it is a valid file that compiles. 2011-11-15 11:15:41 +01:00
Fabian Jakobs
eeb499b173 update demo 2011-11-09 17:03:00 +01:00
Fabian Jakobs
0b69b42ade more support for relative module ids 2011-11-09 16:51:35 +01:00
Fabian Jakobs
cc91bfd712 remove pilot references 2011-11-09 11:34:25 +01:00
Jason O'Neil
3b589d0d85 Changes to Kitchen Sink demo to include haxe mode and document 2011-11-03 13:44:21 +08:00
Jason O'Neil
c1337be88f Added a sample file for haxe 2011-11-03 13:42:50 +08:00
Fabian Jakobs
b063b96230 move pilot code back into Ace
Conflicts:

	.gitmodules
	Makefile.dryice.js
	build_support/editor_textarea.html
	demo/demo.js
	kitchen-sink.html
	lib/ace/edit_session_test.js
	lib/ace/mode/coffee.js
	lib/ace/mode/coffee_highlight_rules.js
	lib/ace/mode/css.js
	lib/ace/mode/javascript.js
	lib/ace/model/window.js
	lib/ace/mouse/default_handlers.js
	lib/ace/theme/clouds.js
	lib/ace/theme/clouds_midnight.js
	lib/ace/theme/cobalt.js
	lib/ace/theme/crimson_editor.js
	lib/ace/theme/dawn.js
	lib/ace/theme/eclipse.js
	lib/ace/theme/idle_fingers.js
	lib/ace/theme/kr_theme.js
	lib/ace/theme/merbivore.js
	lib/ace/theme/merbivore_soft.js
	lib/ace/theme/mono_industrial.js
	lib/ace/theme/monokai.js
	lib/ace/theme/pastel_on_dark.js
	lib/ace/theme/solarized_dark.js
	lib/ace/theme/solarized_light.js
	lib/ace/theme/textmate.js
	lib/ace/theme/twilight.js
	lib/ace/theme/vibrant_ink.js
	lib/ace/view/measure_text.js
	lib/ace/virtual_renderer.js
	package.json
	support/paths.js
2011-11-02 18:18:51 +01:00
Fabian Jakobs
62a3b4edf5 Merge commit '6808e3bb35'
Conflicts:
	.gitmodules
	Makefile.dryice.js
	demo/demo.js
	demo/kitchen-sink/boot.js
	kitchen-sink.html
	lib/ace/commands/default_commands.js
	lib/ace/test/tests.html
	package.json
	support/pilot
2011-11-02 14:43:00 +01:00
nightwing
92a3369bdb add togglefold to the list of default commands 2011-10-21 09:07:13 +05:00