Commit graph

4,752 commits

Author SHA1 Message Date
nightwing
71d382d43b Merge remote-tracking branch 'remotes/dp/htmlcompleter'
Conflicts:
	lib/ace/ext/language_tools.js
2013-07-19 03:16:28 +04:00
nightwing
a406b853f3 Merge branch 'highlighting/xml' 2013-07-19 03:04:34 +04:00
nightwing
ee74fe5a52 make doctype less bright 2013-07-19 03:02:59 +04:00
nightwing
e5ce9e7aee Merge pull request #1517: Update links 2013-07-14 13:41:13 +04:00
Adrian L Lange
24f6640f89 Update links
Files changed: index.html
2013-07-14 13:38:55 +04:00
nightwing
2270bd8c4b fix failing tests 2013-07-14 08:58:29 +04:00
nightwing
c7abff1856 use meta.tag.punctuation 2013-07-14 08:49:45 +04:00
nightwing
386f1ecade Merge branch 'highlighting/xmlrefactor' into master
Conflicts:
	lib/ace/ext/modelist.js
	lib/ace/mode/_test/tokens_luapage.json
2013-07-14 06:24:23 +04:00
Lennart Kats
aded11265f Merge pull request #1489 from ajaxorg/undo_merge
Undo merging
2013-07-12 00:04:40 -07:00
Ruben Daniels
6783f921c9 Merge pull request #1512 from ajaxorg/indent
fix #549 enter on start of indented line should keep indentation
2013-07-11 08:17:05 -07:00
nightwing
920031b877 fix #549 enter on start of indented line should keep indentation 2013-07-11 18:41:40 +04:00
nightwing
09d0044e1e fix undo selection range after delete 2013-07-11 17:35:29 +04:00
nightwing
ba0e17fd0d fix #1510 ace_invalid appears on correct diff 2013-07-11 16:50:02 +04:00
DanyaPostfactum
3c046d2ada Update highlighting tests 2013-07-11 00:31:39 +10:00
DanyaPostfactum
88d9a61dc2 Fix xml_highlight_rules qstring_inner state name 2013-07-10 14:35:24 +10:00
Lennart Kats
3009163083 Merge pull request #1509 from ajaxorg/hotfix/build
fix #1508: jshint is broken in build
2013-07-09 08:23:07 -07:00
nightwing
a41a06ff33 escape . in regexp 2013-07-09 19:20:53 +04:00
nightwing
49967c139a fix typo in noworker detection 2013-07-09 18:22:35 +04:00
nightwing
38dc22b421 fix tests 2013-07-08 15:02:29 +04:00
nightwing
c5378b54e1 fix #1508: jshint is broken in build 2013-07-08 13:58:57 +04:00
nightwing
e3d14ab620 turn scrollPastEnd off by default 2013-07-07 14:40:53 +04:00
Ruben Daniels
a25a685d11 Merge pull request #1507 from ajaxorg/scroll_past_end
[WIP] scrollPastEnd
2013-07-07 02:31:37 -07:00
nightwing
1ad2602f8b add scrollPastEnd to demo 2013-07-07 13:02:57 +04:00
nightwing
8a6320bfd1 resize scrollbar for scrollPastEnd only when needed 2013-07-07 12:50:24 +04:00
nightwing
b97496009b scrollPastEnd 2013-07-07 12:48:53 +04:00
Lennart Kats
5585535d98 Merge pull request #1504 from ajaxorg/fix/build
Fix snippet loading in build
2013-07-07 01:03:44 -07:00
Lennart Kats
b1439f2bf8 Merge pull request #1487 from ajaxorg/highlighting/update
update sh and go highlighting
2013-07-07 01:00:56 -07:00
Ruben Daniels
65713e974b Merge pull request #1502 from ajaxorg/scrolling_issues
fix several small issues on mac
2013-07-06 03:48:01 -07:00
Ruben Daniels
62653ea5ba Merge pull request #1473 from ajaxorg/bgTokenizer
bgTokenizer worker should not redraw unnecessarily
2013-07-06 03:47:30 -07:00
Ruben Daniels
95e0f2fffd Merge pull request #1467 from ajaxorg/jshint
update jshint and coffee
2013-07-06 03:47:08 -07:00
nightwing
bbe87e41fa update tests 2013-07-04 14:42:40 +04:00
nightwing
d2be8aefc0 fix snippet loading in build 2013-07-04 14:31:42 +04:00
nightwing
3139b3964d fix #1500 too enthusiastic String replace in config.moduleUrl 2013-07-04 14:30:35 +04:00
nightwing
dd0880afb6 fix typo 2013-07-03 17:42:46 +04:00
nightwing
a8ac1b1e9a fix horizontal scrolling 2013-07-02 15:25:36 +04:00
DanyaPostfactum
98d6fac8fa Move html completion logic to html_completions.js 2013-07-02 19:42:43 +10:00
nightwing
1400d82d34 pull back changes from cloud9 2013-07-02 12:13:30 +04:00
Lennart Kats
cc0b6386aa Merge pull request #1496 from ajaxorg/fix/build
Fix build
2013-07-01 02:24:03 -07:00
nightwing
403e45a5dd fix vim folding commands 2013-07-01 00:09:15 +04:00
Tenor Biel
5f1a69a38e Add vim commands for folding 2013-07-01 00:01:30 +04:00
nightwing
4b8ab8eab9 fix ^ in vim mode on swedish keyboard on mac 2013-06-30 23:45:47 +04:00
nightwing
f6f3425cce use wheel event on new versions of Firefox
fixes #1466
2013-06-30 22:07:23 +04:00
DanyaPostfactum
297dbe63db Append empty value to inserted html attribute on completion 2013-07-01 04:05:22 +10:00
Harutyun Amirjanyan
6a87d9782b Merge pull request #1494 from danyaPostfactum/snippetcompleter
Show snippets in suggestion list
2013-06-30 10:07:24 -07:00
DanyaPostfactum
e1c86f453f add html completion 2013-07-01 01:43:05 +10:00
DanyaPostfactum
a5f4ecf597 add .getCompletions method to text mode 2013-07-01 01:42:40 +10:00
DanyaPostfactum
7ce86e24f1 use data.snippet in completions for snippet insertion 2013-07-01 01:23:14 +10:00
Harutyun Amirjanyan
2a40b37590 Merge pull request #1493 from buildersbrewery/master
Updates to LSL mode
2013-06-30 07:45:36 -07:00
Harutyun Amirjanyan
b860c2293c Merge pull request #1495 from ajaxorg/static_highlighter
fix #1492 $' breaks static-highligher
2013-06-30 07:44:33 -07:00
DanyaPostfactum
d276f10bcd add snippet completer 2013-06-30 04:07:24 +10:00