fb30b39b6d4f88f5c3e5da0ff982f07faaab6271 25e06a126d4dc4508935e3978de3643e49d7e5cd Nathan Weizenbaum nex342@gmail.com http://github.com/nex3/haml/commit/ec1e894f4502044c35f8af139e2b5a081f02ce1b ec1e894f4502044c35f8af139e2b5a081f02ce1b 2009-10-08T17:10:38-07:00 2009-10-08T17:10:38-07:00 Merge branch 'stable' Conflicts: VERSION doc-src/HAML_CHANGELOG.md doc-src/SASS_CHANGELOG.md ba5b78092a27b34bbd9bdaf69084c82437aeeddc Nathan Weizenbaum nex342@gmail.com 4131bbea8d7cc6dee2186a71e48e99470fac5624 Nathan Weizenbaum nex342@gmail.com http://github.com/nex3/haml/commit/25e06a126d4dc4508935e3978de3643e49d7e5cd 25e06a126d4dc4508935e3978de3643e49d7e5cd 2009-10-08T17:09:42-07:00 2009-10-08T17:09:42-07:00 Bump the VERSION to 2.2.7. f7c63575f80776c7a011ae36ecfd48f9acce5bcb Nathan Weizenbaum nex342@gmail.com 87ecc8f71905c7857ee6bfc03c941a49e83a6867 f49cdd3b3ec9a37b321a52c7c74178192c35e35a Nathan Weizenbaum nex342@gmail.com http://github.com/nex3/haml/commit/964f37de5433c011ee6bfbf3de2b35e4cf8099b0 964f37de5433c011ee6bfbf3de2b35e4cf8099b0 2009-10-04T17:41:35-07:00 2009-10-04T17:41:35-07:00 Merge branch 'stable' 608ad0ad3826318e3b96adef65c7b718dc14d2d3 Nathan Weizenbaum nex342@gmail.com a2b3fbbf8a9d66666a9b9cc538ac06bc12c24411 855de4ac88320c9632ea8239c8d7688ab3d01377 Nathan Weizenbaum nex342@gmail.com http://github.com/nex3/haml/commit/f49cdd3b3ec9a37b321a52c7c74178192c35e35a f49cdd3b3ec9a37b321a52c7c74178192c35e35a 2009-10-04T17:41:12-07:00 2009-10-04T17:41:12-07:00 Merge branch 'stable' of git@github.com:nex3/haml into stable Conflicts: Rakefile 852e4b44acd05e4e4edeeb04afbe48df1054b986 Nathan Weizenbaum nex342@gmail.com dd250ff0793130b0f8210756d764cad8a46d598c Nathan Weizenbaum nex342@gmail.com http://github.com/nex3/haml/commit/306ccaa4eca791b27727f5e69ee88f1f6b6397df 306ccaa4eca791b27727f5e69ee88f1f6b6397df 2009-10-04T17:28:06-07:00 2009-10-04T17:28:06-07:00 [Emacs] Make sass-mode require haml-mode. 1707a5f75e7d3e34b7b3d0dcd90e59ca0e471a7b Nathan Weizenbaum nex342@gmail.com dd34d3cae73a6144cf8c1d6b027e48e83fb541b4 855de4ac88320c9632ea8239c8d7688ab3d01377 Nathan Weizenbaum nex342@gmail.com http://github.com/nex3/haml/commit/87ecc8f71905c7857ee6bfc03c941a49e83a6867 87ecc8f71905c7857ee6bfc03c941a49e83a6867 2009-09-27T22:58:20-07:00 2009-09-27T22:58:20-07:00 Merge branch 'stable' Conflicts: VERSION doc-src/HAML_CHANGELOG.md doc-src/SASS_CHANGELOG.md 81189b8fbe4ec3446c8b060346e83dc78eba2dcb Nathan Weizenbaum nex342@gmail.com f858cce34f65f67b12ce8d2f34e576087cbbaf3e Nathan Weizenbaum nex342@gmail.com http://github.com/nex3/haml/commit/855de4ac88320c9632ea8239c8d7688ab3d01377 855de4ac88320c9632ea8239c8d7688ab3d01377 2009-09-27T22:56:30-07:00 2009-09-27T22:53:15-07:00 Bump version to 2.2.6. 41f812238e45fcae556eccac20551ff713dc2f67 Nathan Weizenbaum nex342@gmail.com 04b7c84a83d62a0b1e001820091dfaa0ee94f2b4 dcc399faba3ecd677fb43faf682c8ce7d5325213 Nathan Weizenbaum nex342@gmail.com http://github.com/nex3/haml/commit/9e67aec523d9cf33f22617627d81465e957daa89 9e67aec523d9cf33f22617627d81465e957daa89 2009-09-21T14:43:13-07:00 2009-09-21T14:43:13-07:00 Merge branch 'stable' Conflicts: doc-src/HAML_CHANGELOG.md 39ab4b2357d7d93af0b09f647ae6eaa41e529469 Nathan Weizenbaum nex342@gmail.com a5235091061f3b50f3dfef6a55a1e900baab1034 Nathan Weizenbaum nex342@gmail.com http://github.com/nex3/haml/commit/50e5e52ea98dce91f0e8e603db0f79978151b1ab 50e5e52ea98dce91f0e8e603db0f79978151b1ab 2009-09-21T12:28:31-07:00 2009-09-21T12:27:47-07:00 [Emacs] Set version numbers to 2.2.5, in sync with current Haml version. dcfb4e001ccbd3bb537213ef6c832435a13242d5 Nathan Weizenbaum nex342@gmail.com 1e5c070f98d893ae80cdeeccc35a29702435ef25 Gustavo Delfino gdelfino@gmail.com http://github.com/nex3/haml/commit/a5235091061f3b50f3dfef6a55a1e900baab1034 a5235091061f3b50f3dfef6a55a1e900baab1034 2009-09-21T12:28:19-07:00 2009-04-24T15:09:59-07:00 [Emacs] Removed Last-Updated and RCS headers. 46d6e06357a3f325468a06bc98337db0f6638603 Nathan Weizenbaum nex342@gmail.com 4d2f41f45a00e69683a810e7dd29be3936dfe1cb Gustavo Delfino gdelfino@gmail.com http://github.com/nex3/haml/commit/1e5c070f98d893ae80cdeeccc35a29702435ef25 1e5c070f98d893ae80cdeeccc35a29702435ef25 2009-09-21T12:28:06-07:00 2009-04-11T07:14:37-07:00 [Emacs] Updated header info in preparation for ELPA submission. aefa2505a5da5e49ccb39c31046c574857262230 Nathan Weizenbaum nex342@gmail.com d3bdfb6f936808f3e400e38813d1f7037317e036 Nathan Weizenbaum nex342@gmail.com http://github.com/nex3/haml/commit/4d2f41f45a00e69683a810e7dd29be3936dfe1cb 4d2f41f45a00e69683a810e7dd29be3936dfe1cb 2009-09-21T12:23:12-07:00 2009-09-21T12:23:12-07:00 [Emacs] Fix up all the checkdoc errors in sass-mode. c87daa256617a377f7e0b0e154e17ea3c36645dc Nathan Weizenbaum nex342@gmail.com aa2036e71c27feb0e9b3c466562b2681868f2e41 Nathan Weizenbaum nex342@gmail.com http://github.com/nex3/haml/commit/d3bdfb6f936808f3e400e38813d1f7037317e036 d3bdfb6f936808f3e400e38813d1f7037317e036 2009-09-21T12:23:08-07:00 2009-09-21T12:18:59-07:00 [Emacs] Fix up all the checkdoc errors in haml-mode. b50053ade2d990b8b5fd401110901a4f2b9f427a Nathan Weizenbaum nex342@gmail.com 89654ff6a53dd23df365259f882d59f8a84a9af3 Nathan Weizenbaum nex342@gmail.com http://github.com/nex3/haml/commit/2c11b40b40aad4b3e55688846eab0abd4ad10304 2c11b40b40aad4b3e55688846eab0abd4ad10304 2009-08-27T21:53:58-07:00 2009-08-27T21:53:54-07:00 Get rid of another haml-mode warning. e01174c66001ba4ecb9a820b0cc902d481c6b0cb Nathan Weizenbaum nex342@gmail.com 58fa524f7d87e343430c5eeebfd7e99d0a89e42b Nathan Weizenbaum nex342@gmail.com http://github.com/nex3/haml/commit/1810b98154fa150d3f4bcb0d474076997adb1d18 1810b98154fa150d3f4bcb0d474076997adb1d18 2009-07-27T22:41:55-07:00 2009-07-27T22:41:55-07:00 Get rid of a compile error in haml-mode. eb6f93e070de16a09e9b20c5cc2b87c1ed727ee1 Nathan Weizenbaum nex342@gmail.com 4800e99aacec7f4c148f3fa31ba559fb36802f29 Nathan Weizenbaum nex342@gmail.com http://github.com/nex3/haml/commit/b21d496618c98fe99882bddb80eeda296b7d1867 b21d496618c98fe99882bddb80eeda296b7d1867 2009-07-18T11:48:38-07:00 2009-07-18T11:48:38-07:00 [Emacs] Remove a warning. 275676d600f0cb96c32c1827e8db50d157f680c4 Nathan Weizenbaum nex342@gmail.com 2585333c71deaeda517b7e7a446ab1cd2f305862 Nathan Weizenbaum nex342@gmail.com http://github.com/nex3/haml/commit/859a35946a8780695e2eac2395646bd20c352f2a 859a35946a8780695e2eac2395646bd20c352f2a 2009-07-05T01:51:40-07:00 2009-07-05T01:51:40-07:00 [Emacs] Fix Sass variable parsing. a8d51bab405a75e776d72094f6fb82ce2c1b29b1 Nathan Weizenbaum nex342@gmail.com 242aee374622f713a697e9ac6c3dc2cd0caa924e Nathan Weizenbaum nex342@gmail.com http://github.com/nex3/haml/commit/5709b7082a1953668e08b0293406efac82ce0646 5709b7082a1953668e08b0293406efac82ce0646 2009-07-04T16:26:25-07:00 2009-07-04T16:26:25-07:00 Fix up some update-watcher stuff. 0fa4212b97e5590c8deeea281a060b51067d50db Nathan Weizenbaum nex342@gmail.com 400bf1481e5216b390aeeac597b75e0529465f92 ef58f87f789bc4705bcde5c12723a362556d79f8 Nathan Weizenbaum nex342@gmail.com http://github.com/nex3/haml/commit/99f21fb8a2baac3c5b0ffb5da15a229e0323a268 99f21fb8a2baac3c5b0ffb5da15a229e0323a268 2009-07-01T23:27:29-07:00 2009-07-01T23:27:29-07:00 Merge branch 'master' into new-attrs Conflicts: TODO test/haml/engine_test.rb 5a9598422859157beed6306bda09b2fa94ad1aaf Nathan Weizenbaum nex342@gmail.com 908b15f1bbeb70c1250405f7a155bc82c9a02ee7 Nathan Weizenbaum nex342@gmail.com http://github.com/nex3/haml/commit/8b1ae1f96ec07517cc400679ae8118406c00f2f7 8b1ae1f96ec07517cc400679ae8118406c00f2f7 2009-06-25T00:55:06-07:00 2009-06-25T00:51:23-07:00 Trace all invoked rake tasks. 8727803b15cff03015ba8fecc51e6a5962d59eca Nathan Weizenbaum nex342@gmail.com a66583792c9bb9884d60069e3c1888ec123cea76 daa6b3542f06bfc0d058e5ebb2fe73c9478aecd7 Nathan Weizenbaum nex342@gmail.com http://github.com/nex3/haml/commit/f0e273ba346292b6115fb1c214da14a486a3cbe6 f0e273ba346292b6115fb1c214da14a486a3cbe6 2009-06-18T13:08:49-07:00 2009-06-18T13:08:49-07:00 Merge branch 'master' into new-attrs 23a22be35050a9c3933fb712bc5a9d18af035186 Nathan Weizenbaum nex342@gmail.com 00c3f79a99bf5bd2fe2f8efddb1134c139d73e7c Nathan Weizenbaum nex342@gmail.com http://github.com/nex3/haml/commit/458306fb35092f468d2a54b181940c83cbc1a395 458306fb35092f468d2a54b181940c83cbc1a395 2009-06-17T21:46:25-07:00 2009-06-17T21:46:25-07:00 Delegate update-handling to the Rakefile. 936ae1775b3514d8e9314015fc8c26295a7c9b52 Nathan Weizenbaum nex342@gmail.com 51e4994d2ba6f7094e829f65451d9e021315113d Nathan Weizenbaum nex342@gmail.com http://github.com/nex3/haml/commit/00c3f79a99bf5bd2fe2f8efddb1134c139d73e7c 00c3f79a99bf5bd2fe2f8efddb1134c139d73e7c 2009-06-17T21:25:23-07:00 2009-06-17T21:23:35-07:00 Make the watcher update the Haml and Sass pages when the respective branches are updated. cec44082eb6f4fc506bb7d66fcac77fe8d5464da Nathan Weizenbaum nex342@gmail.com 9503ed1b8943dea71eff109af698283c20d6eebc 1a6df373e547f8e13cbda74fc9331f77eb8ca6fc Nathan Weizenbaum nex342@gmail.com http://github.com/nex3/haml/commit/e63250a20f769efe653e595c2d33846f20b073a4 e63250a20f769efe653e595c2d33846f20b073a4 2009-06-01T00:50:30-07:00 2009-06-01T00:50:30-07:00 Merge branch 'master' into new-attrs 7d501701e4370376f15953e4622e2e77dabe86b4 Nathan Weizenbaum nex342@gmail.com 1c88719ead03ad33b105f417bc99fd768e7ae5e5 Nathan Weizenbaum nex342@gmail.com http://github.com/nex3/haml/commit/e1817a03bfff7a65b36378ee5418ac34016f6e6e e1817a03bfff7a65b36378ee5418ac34016f6e6e 2009-05-27T11:38:40-07:00 2009-05-27T11:38:40-07:00 [Emacs] Properly highlight Sass stuff with underscores. 98967d736716f7df96127161c7ea59672336e3b1 Nathan Weizenbaum nex342@gmail.com d1e095bd85e53018a817326d1c8d00c57d1d8f8f Nathan Weizenbaum nex342@gmail.com http://github.com/nex3/haml/commit/9503ed1b8943dea71eff109af698283c20d6eebc 9503ed1b8943dea71eff109af698283c20d6eebc 2009-05-25T01:57:13-07:00 2009-05-25T01:57:13-07:00 [Emacs] Fix some edge cases. 8e7c9033159c83849f81a34647c78629bdd1a2f6 Nathan Weizenbaum nex342@gmail.com 8d8742a73c3d94f414b28dbeb6688f098bef38a2 Nathan Weizenbaum nex342@gmail.com http://github.com/nex3/haml/commit/d1e095bd85e53018a817326d1c8d00c57d1d8f8f d1e095bd85e53018a817326d1c8d00c57d1d8f8f 2009-05-25T01:18:34-07:00 2009-05-25T00:48:31-07:00 [Emacs] Support new attribute hashes. 3438c5647578c4d1a2c41557aa3a9f149c2b6fa9 Nathan Weizenbaum nex342@gmail.com dde54ed9354a1d7298bbafbdab7f188af422fb46 Nathan Weizenbaum nex342@gmail.com http://github.com/nex3/haml/commit/381e824213d87cc00738fe726d001c985ee2e857 381e824213d87cc00738fe726d001c985ee2e857 2009-05-25T00:31:24-07:00 2009-05-25T00:23:10-07:00 [Emacs] Indent multiline attribute hashes better. d87c56150ca5a92094ad93619c38ee8674195255 Nathan Weizenbaum nex342@gmail.com 82e1bebea2b1eb87e503bda5eed048c872b68435 Nathan Weizenbaum nex342@gmail.com http://github.com/nex3/haml/commit/dde54ed9354a1d7298bbafbdab7f188af422fb46 dde54ed9354a1d7298bbafbdab7f188af422fb46 2009-05-25T00:31:17-07:00 2009-05-24T14:33:03-07:00 [Emacs] Fix a silly error. cee82df78ff2fa22a8951e655522a900b3fe8d76 Nathan Weizenbaum nex342@gmail.com 6e2fd11672162c59e643415ea0a6072c14e9bc35 Nathan Weizenbaum nex342@gmail.com http://github.com/nex3/haml/commit/82e1bebea2b1eb87e503bda5eed048c872b68435 82e1bebea2b1eb87e503bda5eed048c872b68435 2009-05-24T13:09:00-07:00 2009-05-24T13:09:00-07:00 [Emacs] Fix an infinite loop bug in multiline-hash indentation. 06016bf66d4582a1940e211b9748ddd58752ccab Nathan Weizenbaum nex342@gmail.com 535996aaead9016f734913f033ca8eaec4d924a4 Nathan Weizenbaum nex342@gmail.com http://github.com/nex3/haml/commit/6e2fd11672162c59e643415ea0a6072c14e9bc35 6e2fd11672162c59e643415ea0a6072c14e9bc35 2009-05-20T13:00:58-07:00 2009-05-20T13:00:52-07:00 [Emacs] Fix the Haml indentation for Ruby block openers. 9b4e1d357010897a51360432acd8acff976c8a52 Nathan Weizenbaum nex342@gmail.com c24c4ffcd57daf36f9e04cb51ef279e069a19ae3 Nathan Weizenbaum nex342@gmail.com http://github.com/nex3/haml/commit/398bbe0304bf62eb04b942f86ec9652cdfd088bb 398bbe0304bf62eb04b942f86ec9652cdfd088bb 2009-04-29T22:27:51-07:00 2009-04-29T19:27:25-07:00 Add a Rake task and Sinatra script for a GitHub post-receive hook. dfe9c72a9c41884d6486c52b3eced32e2ee005d4 Nathan Weizenbaum nex342@gmail.com ce7fa725235dab614a4969f916ba83d42beba1e5 Nathan Weizenbaum nex342@gmail.com http://github.com/nex3/haml/commit/8c3698874a209776210019a54928f3dafc57f221 8c3698874a209776210019a54928f3dafc57f221 2009-03-29T01:48:03-07:00 2009-03-29T01:47:03-07:00 [Emacs] Better highlight Sass directives. d5d5487d3779dc3d8ae0af051083a9e9d26fbf1e Nathan Weizenbaum nex342@gmail.com e89369c432b1f6a325d940cb91364629915e709d Nathan Weizenbaum nex342@gmail.com http://github.com/nex3/haml/commit/ce7fa725235dab614a4969f916ba83d42beba1e5 ce7fa725235dab614a4969f916ba83d42beba1e5 2009-03-29T01:48:03-07:00 2009-03-28T22:27:50-07:00 [Emacs] Highlight Sass color constants. 7f6a14210897c05fd6a4459013170cde611d3264 Nathan Weizenbaum nex342@gmail.com 8a7c36d3c5765158f705a0a3fc2496ca11953229 Nathan Weizenbaum nex342@gmail.com http://github.com/nex3/haml/commit/e89369c432b1f6a325d940cb91364629915e709d e89369c432b1f6a325d940cb91364629915e709d 2009-03-29T01:48:03-07:00 2009-03-28T22:16:46-07:00 [Emacs] Highlight SassScript colors, bools, and ops. 8147f57bf6ea633d57707ee5f4a363d556a19d56 Nathan Weizenbaum nex342@gmail.com