Commit graph

118 commits

Author SHA1 Message Date
nightwing
a1f79bb2e2 update readme and demo 2012-05-31 23:40:11 +04:00
nightwing
28d4807d09 update makefile 2012-05-31 23:10:54 +04:00
Garen Torikian
da94ecdb42 Fix building of themes 2012-05-30 14:34:32 -07:00
nightwing
34f3cac4a8 reorganize build and demo
Conflicts:

	Makefile.dryice.js
2012-05-24 23:10:50 +04:00
nightwing
0f0d12a709 remove remnants of pilot 2012-05-24 23:09:46 +04:00
nightwing
8a3e7b0f00 split themes into css and js files 2012-05-24 23:02:17 +04:00
William Candillon
f718f2c4b8 Merge https://github.com/ajaxorg/ace 2012-05-24 17:35:11 +02:00
nightwing
d50f526495 Merge remote-tracking branch 'remotes/megshark/master'
Conflicts:
	Makefile.dryice.js
	demo/kitchen-sink/demo.js
2012-05-23 22:08:18 +04:00
William Candillon
c3e9bff83a Merge https://github.com/ajaxorg/ace 2012-05-21 20:38:27 +02:00
Garen Torikian
2fdb6378a3 merge c9mode changes 2012-05-08 23:34:09 -07:00
nightwing
3ce8d4a8a9 add npm install script 2012-05-04 19:16:47 +04:00
nightwing
6bb805b40f simplify config 2012-05-04 19:11:19 +04:00
nightwing
f67fc8c9eb change directory structure of keybindings 2012-05-04 19:08:42 +04:00
William Candillon
031e72c3e3 Merge https://github.com/ajaxorg/ace
Conflicts:
	build/kitchen-sink.html
	build/src/ace-noconflict.js
	build/src/ace.js
2012-04-23 12:42:15 +02:00
Davide Saurino
7df563169a Go mode added 2012-04-16 16:19:17 +02:00
William Candillon
b63d2c178b Merge https://github.com/ajaxorg/ace
Conflicts:
	build/demo/kitchen-sink/mode-coldfusion-uncompressed.js
	build/demo/kitchen-sink/mode-css-uncompressed.js
	build/demo/kitchen-sink/mode-groovy-uncompressed.js
	build/demo/kitchen-sink/mode-html-uncompressed.js
	build/demo/kitchen-sink/mode-java-uncompressed.js
	build/demo/kitchen-sink/mode-javascript-uncompressed.js
	build/demo/kitchen-sink/mode-markdown-uncompressed.js
	build/demo/kitchen-sink/mode-php-uncompressed.js
	build/demo/kitchen-sink/mode-scala-uncompressed.js
	build/demo/kitchen-sink/mode-svg-uncompressed.js
	build/demo/kitchen-sink/mode-xquery-uncompressed.js
	build/demo/kitchen-sink/theme-cobalt-uncompressed.js
	build/demo/kitchen-sink/theme-dawn-uncompressed.js
	build/demo/kitchen-sink/theme-idle_fingers-uncompressed.js
	build/demo/kitchen-sink/theme-kr_theme-uncompressed.js
	build/demo/kitchen-sink/theme-merbivore-uncompressed.js
	build/demo/kitchen-sink/theme-merbivore_soft-uncompressed.js
	build/demo/kitchen-sink/theme-mono_industrial-uncompressed.js
	build/demo/kitchen-sink/theme-pastel_on_dark-uncompressed.js
	build/demo/kitchen-sink/theme-twilight-uncompressed.js
	build/demo/kitchen-sink/theme-vibrant_ink-uncompressed.js
	build/kitchen-sink.html
	build/src/mode-coldfusion-noconflict.js
	build/src/mode-coldfusion-uncompressed-noconflict.js
	build/src/mode-coldfusion-uncompressed.js
	build/src/mode-coldfusion.js
	build/src/mode-css-noconflict.js
	build/src/mode-css-uncompressed-noconflict.js
	build/src/mode-css-uncompressed.js
	build/src/mode-css.js
	build/src/mode-groovy-noconflict.js
	build/src/mode-groovy-uncompressed-noconflict.js
	build/src/mode-groovy-uncompressed.js
	build/src/mode-groovy.js
	build/src/mode-html-noconflict.js
	build/src/mode-html-uncompressed-noconflict.js
	build/src/mode-html-uncompressed.js
	build/src/mode-html.js
	build/src/mode-java-noconflict.js
	build/src/mode-java-uncompressed-noconflict.js
	build/src/mode-java-uncompressed.js
	build/src/mode-java.js
	build/src/mode-javascript-noconflict.js
	build/src/mode-javascript-uncompressed-noconflict.js
	build/src/mode-javascript-uncompressed.js
	build/src/mode-javascript.js
	build/src/mode-markdown-noconflict.js
	build/src/mode-markdown-uncompressed-noconflict.js
	build/src/mode-markdown-uncompressed.js
	build/src/mode-markdown.js
	build/src/mode-php-noconflict.js
	build/src/mode-php-uncompressed-noconflict.js
	build/src/mode-php-uncompressed.js
	build/src/mode-php.js
	build/src/mode-scala-noconflict.js
	build/src/mode-scala-uncompressed-noconflict.js
	build/src/mode-scala-uncompressed.js
	build/src/mode-scala.js
	build/src/mode-svg-noconflict.js
	build/src/mode-svg-uncompressed-noconflict.js
	build/src/mode-svg-uncompressed.js
	build/src/mode-svg.js
	build/src/mode-xquery-noconflict.js
	build/src/mode-xquery.js
	build/src/theme-clouds-noconflict.js
	build/src/theme-clouds.js
	build/src/theme-clouds_midnight-noconflict.js
	build/src/theme-clouds_midnight.js
	build/src/theme-cobalt-noconflict.js
	build/src/theme-cobalt-uncompressed-noconflict.js
	build/src/theme-cobalt-uncompressed.js
	build/src/theme-cobalt.js
	build/src/theme-dawn-noconflict.js
	build/src/theme-dawn-uncompressed-noconflict.js
	build/src/theme-dawn-uncompressed.js
	build/src/theme-dawn.js
	build/src/theme-idle_fingers-noconflict.js
	build/src/theme-idle_fingers-uncompressed-noconflict.js
	build/src/theme-idle_fingers-uncompressed.js
	build/src/theme-idle_fingers.js
	build/src/theme-kr_theme-noconflict.js
	build/src/theme-kr_theme-uncompressed-noconflict.js
	build/src/theme-kr_theme-uncompressed.js
	build/src/theme-kr_theme.js
	build/src/theme-merbivore-noconflict.js
	build/src/theme-merbivore-uncompressed-noconflict.js
	build/src/theme-merbivore-uncompressed.js
	build/src/theme-merbivore.js
	build/src/theme-merbivore_soft-noconflict.js
	build/src/theme-merbivore_soft-uncompressed-noconflict.js
	build/src/theme-merbivore_soft-uncompressed.js
	build/src/theme-merbivore_soft.js
	build/src/theme-mono_industrial-noconflict.js
	build/src/theme-mono_industrial-uncompressed-noconflict.js
	build/src/theme-mono_industrial-uncompressed.js
	build/src/theme-mono_industrial.js
	build/src/theme-monokai-noconflict.js
	build/src/theme-monokai.js
	build/src/theme-pastel_on_dark-noconflict.js
	build/src/theme-pastel_on_dark-uncompressed-noconflict.js
	build/src/theme-pastel_on_dark-uncompressed.js
	build/src/theme-pastel_on_dark.js
	build/src/theme-solarized_dark-noconflict.js
	build/src/theme-solarized_dark.js
	build/src/theme-solarized_light-noconflict.js
	build/src/theme-solarized_light.js
	build/src/theme-tomorrow-noconflict.js
	build/src/theme-tomorrow.js
	build/src/theme-tomorrow_night-noconflict.js
	build/src/theme-tomorrow_night.js
	build/src/theme-tomorrow_night_blue-noconflict.js
	build/src/theme-tomorrow_night_blue.js
	build/src/theme-tomorrow_night_bright-noconflict.js
	build/src/theme-tomorrow_night_bright.js
	build/src/theme-tomorrow_night_eighties-noconflict.js
	build/src/theme-tomorrow_night_eighties.js
	build/src/theme-twilight-noconflict.js
	build/src/theme-twilight-uncompressed-noconflict.js
	build/src/theme-twilight-uncompressed.js
	build/src/theme-twilight.js
	build/src/theme-vibrant_ink-noconflict.js
	build/src/theme-vibrant_ink-uncompressed-noconflict.js
	build/src/theme-vibrant_ink-uncompressed.js
	build/src/theme-vibrant_ink.js
2012-04-14 11:54:32 +02:00
Fabian Jakobs
4230052da9 add less mode to the build script 2012-04-12 14:21:30 +02:00
Bernie Telles
5e87f9b60a Add liquid parser. 2012-04-04 16:50:08 -07:00
William Candillon
08a604aad1 Add live XQuery syntax checking. 2012-04-02 10:01:52 +02: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
richo
d6a21166fc Add sh editing mode based on the python mode 2012-03-26 11:26:10 +02:00
Meg Sharkey
9d33a06633 added yaml syntax highlighter 2012-03-12 15:47:01 -07:00
Fabian Jakobs
099f1541fd add json worker 2012-03-02 11:40:25 +01:00
Fabian Jakobs
3b23a7ac1a also generate text mode 2012-02-22 12:14:42 +01:00
Fabian Jakobs
0c258e615a package 2012-02-22 11:07:21 +01:00
William Candillon
9355bbeba5 Add xquery mode. 2012-02-13 10:03:33 +01:00
Joe Walker
deffa824da Fix broken clone function 2012-02-06 14:12:26 +00:00
Joe Walker
71e6e8894b Use of copy.source.commonjs() is deprecated 2012-02-06 14:09:29 +00: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
f3cd1d1f7e kitchen sink gets its own set of themes 2011-12-20 12:18:02 +01:00
Fabian Jakobs
5b6872b702 fix tests 2011-12-19 13:29:16 +01:00
Fabian Jakobs
1f40a1d21d give kitchen sink its own build target 2011-12-19 13:18:44 +01:00
Fabian Jakobs
3771ae8545 completely refactor and cleanup build script 2011-12-19 13:05:34 +01:00
Fabian Jakobs
a40c6a9211 Cleanup build system
* create no conflict packed version of ace
* move text area code into the normal code base
* remote special cased code for textarea
2011-12-16 16:32:07 +01:00
Fabian Jakobs
6b80c3581e add dreamweaver theme to the build script 2011-12-14 17:04:51 +01:00
Fabian Jakobs
5057b7be7b Merge pull request #559 from wildfireapp/add_chrome_theme
Add chrome theme.
2011-12-06 02:18:03 -08:00
Bernie Telles
b229566f3c Add chrome theme to compile settings. 2011-12-05 11:29:43 -08:00
Fabian Jakobs
c97fc93a71 Merge branch 'haxesyntax'
Conflicts:
	demo/kitchen-sink/demo.js
2011-11-15 11:38:43 +01:00
Fabian Jakobs
129ac7eb0a split off compat files as separate build file 2011-11-11 12:27:41 +01:00
Fabian Jakobs
95b72633a0 Chrome doesn't like the uglified version 2011-11-09 16:54:43 +01:00
Fabian Jakobs
0b69b42ade more support for relative module ids 2011-11-09 16:51:35 +01:00
Fabian Jakobs
c043d14b8b use relative module ids to please node.js 2011-11-09 15:38:53 +01:00
Fabian Jakobs
688e669361 use dry ice from npm 2011-11-09 11:33:17 +01:00
Jason O'Neil
dbd5d3fa01 Added haxe mode to Makefile.dryice.js 2011-11-03 13:43:48 +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
Fabian Jakobs
2ecef49e39 move deps into node_modules and make better use
of npm
2011-11-02 13:15:04 +01:00
Fabian Jakobs
606963f424 move kitchen-sink demo into a separate directory 2011-10-13 11:22:19 +02:00