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
|
0b69b42ade
|
more support for relative module ids
|
2011-11-09 16:51:35 +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 |
|
Fabian Jakobs
|
606963f424
|
move kitchen-sink demo into a separate directory
|
2011-10-13 11:22:19 +02:00 |
|