Commit graph

3,357 commits

Author SHA1 Message Date
Garen Torikian
9df3e44f8e Merge branch 'gh-pages' of github.com:ajaxorg/ace into gh-pages 2012-09-28 07:59:56 -07:00
Garen Torikian
badc8bc58c Merge branch 'master' into gh-pages 2012-09-28 07:21:02 -07:00
Garen Torikian
e2d4b6c296 Merge branch 'master' of github.com:ajaxorg/ace 2012-09-28 07:20:48 -07:00
Garen Torikian
ae0ab0c7aa Show URL as protocol independent; fix #981 2012-09-28 07:20:34 -07:00
Fabian Jakobs
36685c4f8a don't build on install 2012-09-28 12:17:19 +03:00
matt
d425e509d1 Merge branch 'gh-pages' of git://github.com/ajaxorg/ace into gh-pages 2012-09-27 20:30:18 -07:00
Matt
ea42f40ae3 Merge pull request #980 from c9developer/master
Added zorba image to prod page
2012-09-27 20:29:41 -07:00
C9
73a8f49dda added zorba 2012-09-27 23:28:44 -04:00
Garen Torikian
03cf554530 Merge branch 'gh-pages' of github.com:ajaxorg/ace into gh-pages 2012-09-27 10:59:52 -07:00
Garen Torikian
ff5b55e09d Merge pull request #957 from ajaxorg/themes
Theme update
2012-09-26 12:13:37 -07:00
Fabian Jakobs
0dd73feac0 don't call install.js on 'npm install' 2012-09-26 08:30:26 -04:00
Matt
6f3299ae90 Merge pull request #977 from c9developer/master
Moar in prod updates
2012-09-25 13:31:53 -07:00
C9
a93e175c9a More in prod updates 2012-09-25 16:31:12 -04:00
Matt
a021ace670 Merge pull request #976 from c9developer/master
Added new site to prod list
2012-09-25 13:22:18 -07:00
C9
3f0ecdbbdf Added codiad 2012-09-25 16:21:22 -04:00
Matt
d70297123e Merge pull request #975 from c9developer/master
Updated image sources to cloudfront
2012-09-25 11:06:36 -07:00
C9
45dc43d112 Put images on cloudfront 2012-09-25 14:04:40 -04:00
Harutyun Amirjanyan
36a043c5be Merge pull request #974 from ajaxorg/mode/jsp
[Liskov] Add JSP mixed mode highlighter
2012-09-25 10:37:34 -07:00
Mostafa Eweda
2f59389bd7 Add JSP mixed mode highlighter 2012-09-25 19:07:40 +02:00
Matt
80bdd449ed Merge pull request #971 from c9developer/master
Missing image fix
2012-09-24 15:50:33 -07:00
C9
28bc4137e7 Missing image fix 2012-09-24 18:48:34 -04:00
Matt
80d1d80ffc Merge pull request #970 from c9developer/master
Updated in prod page
2012-09-24 15:47:07 -07:00
C9
1c2ea79f01 Updated in production page 2012-09-24 18:46:14 -04:00
Matt
abd88ed381 Merge pull request #966 from c9developer/master
ShareJS
2012-09-23 01:40:52 -07:00
C9
69ba9d9ef9 Added sharejs 2012-09-23 04:40:10 -04:00
Matt
2100dbb6f5 Merge pull request #965 from c9developer/master
New site
2012-09-23 01:08:44 -07:00
C9
ac471606eb New site 2012-09-23 04:07:37 -04:00
Garen Torikian
aa73ac3fae Fix border radius on API 2012-09-21 11:38:09 -07:00
Matt
43817efd82 Merge pull request #962 from c9developer/master
line-height and text shadow
2012-09-21 11:27:56 -07:00
C9
b47b88e83c line-height and text shadow 2012-09-21 14:27:16 -04:00
Matt
53ca5f1413 Merge pull request #961 from c9developer/master
Moved gh buttons down a notch
2012-09-21 08:22:51 -07:00
C9
bc4709be61 Moved gh buttons down a notch 2012-09-21 11:21:40 -04:00
Garen Torikian
20a6bdd42b Add GitHub social to logo 2012-09-20 13:52:55 -07:00
Harutyun Amirjanyan
d65fabedb5 Merge pull request #959 from danyaPostfactum/mousewheel
Fix ctrl+wheel issue
2012-09-20 12:12:52 -07:00
C9
45a8be55b6 Merge branch 'master' of git://github.com/ajaxorg/ace 2012-09-20 12:31:54 -04:00
C9
e5544b7114 Many updates to the site, content and design 2012-09-20 12:31:48 -04:00
DanyaPostfactum
10296a87a5 Fix ctrl+- issue 2012-09-20 05:10:58 +10:00
Garen Torikian
dd0bbc7d8d fix my name's spelling 2012-09-19 11:06:42 -07:00
nightwing
3aca398f1d fix active line color for solarized_dark theme 2012-09-19 21:32:40 +04:00
Lennart Kats
94ef091a47 Merge pull request #958 from ajaxorg/update_version
update ChangeLog for v1
2012-09-19 09:15:04 -07:00
nightwing
1513ad99e5 update ChangeLog and package.json 2012-09-19 19:34:07 +04:00
nightwing
a6ce721d92 add indent guides for ambiance and xcode 2012-09-19 18:39:29 +04:00
Garen Torikian
ecfdc5fbc4 Update themes some more 2012-09-19 18:39:29 +04:00
nightwing
021d169fbe remove redundant rules from themes 2012-09-19 18:39:29 +04:00
nightwing
2e55b85a97 regenerate all themes 2012-09-19 18:39:28 +04:00
Garen Torikian
4017abd825 Make updates to theme parser logic and tool 2012-09-19 18:39:07 +04:00
Lennart Kats
1ff5571bb7 Merge pull request #942 from ajaxorg/tmp
fix miscellaneous small bugs
2012-09-19 07:02:41 -07:00
Harutyun Amirjanyan
859c753507 Merge pull request #913 from quexer/patch-2
Update lib/ace/mode/markdown_highlight_rules.js
2012-09-18 00:58:22 -07:00
quexer
a68ec0b346 update license block 2012-09-18 15:46:36 +08:00
Matt
62ac96db52 Merge pull request #955 from c9developer/master
Content and style updates
2012-09-17 15:32:19 -07:00