bcc94e60df2f86d69836df38f5b9b6b5bee76c76 Mislav Marohnić mislav.marohnic@gmail.com http://github.com/mislav/haml/commit/bdfe0fc4cf5cdeb0a8688159486e15cd225ab5ea bdfe0fc4cf5cdeb0a8688159486e15cd225ab5ea

2008-09-21T15:31:55-07:00

add a template test with partial layout rendering 8d9b1a65abf45c713b4e6b9b4019adf4c01867cb Mislav Marohnić mislav.marohnic@gmail.com f7d701ab7ce85a784bacf8c301c7376700057450 Mislav Marohnić mislav.marohnic@gmail.com http://github.com/mislav/haml/commit/bcc94e60df2f86d69836df38f5b9b6b5bee76c76 bcc94e60df2f86d69836df38f5b9b6b5bee76c76

2008-09-21T15:24:18-07:00

fix Sass options so that haml/template_test.rb can be run standalone 2a880a18716824615a5245fa274a8de199ec6d59 Mislav Marohnić mislav.marohnic@gmail.com ce5ea1c922618b2212d24e26f332a1e18e579eb1 Mislav Marohnić mislav.marohnic@gmail.com http://github.com/mislav/haml/commit/f7d701ab7ce85a784bacf8c301c7376700057450 f7d701ab7ce85a784bacf8c301c7376700057450

2008-09-21T13:42:35-07:00

fix inspection of the private method 661f280017c8e334720f11cbc9f7194f5e6ff37c Mislav Marohnić mislav.marohnic@gmail.com c19ad796ff9956d447f82c57d707afb3de1aad51 Mislav Marohnić mislav.marohnic@gmail.com http://github.com/mislav/haml/commit/ce5ea1c922618b2212d24e26f332a1e18e579eb1 ce5ea1c922618b2212d24e26f332a1e18e579eb1

2008-09-19T07:08:48-07:00

fix Rails edge: evaluate_assigns is now _evaluate_assigns_and_ivars 0a4d0028c24c155a599c1629956f54a773280e39 Mislav Marohnić mislav.marohnic@gmail.com d466651cff20358a4066ed7a1a65c11a5eaa5c2a Nathan Weizenbaum nex342@gmail.com http://github.com/mislav/haml/commit/c19ad796ff9956d447f82c57d707afb3de1aad51 c19ad796ff9956d447f82c57d707afb3de1aad51

2008-09-14T23:57:43-07:00

Allow mixins to take precedence over sibling selectors in ambiguous cases. b2f71d44f7bb1576f10912c74236cc0ddb96de92 Nathan Weizenbaum nex342@gmail.com f5c0d024e8676861782467371139b7d74f36c7be 452b2c2584f38e510eb57e0180698dc53fbb4c29 Nathan Weizenbaum nex342@gmail.com http://github.com/mislav/haml/commit/d466651cff20358a4066ed7a1a65c11a5eaa5c2a d466651cff20358a4066ed7a1a65c11a5eaa5c2a

2008-09-07T11:57:22-07:00

Merge branch 'stable' 8daf5f2c7cffcf4b34b7364caad1cc9f86c5aabc Nathan Weizenbaum nex342@gmail.com dd0d69be77cfafa874842d2e3ae2d6984867a744 Nathan Weizenbaum nex342@gmail.com http://github.com/mislav/haml/commit/452b2c2584f38e510eb57e0180698dc53fbb4c29 452b2c2584f38e510eb57e0180698dc53fbb4c29

2008-09-07T11:57:18-07:00

Fix REVISION-handling a bit more. bc3e6419e00b0dde7d99ccb369f0a9a67019cbff Nathan Weizenbaum nex342@gmail.com 860592f342373d1386fdba0909d1c0d3ac8e0014 dd0d69be77cfafa874842d2e3ae2d6984867a744 Nathan Weizenbaum nex342@gmail.com http://github.com/mislav/haml/commit/f5c0d024e8676861782467371139b7d74f36c7be f5c0d024e8676861782467371139b7d74f36c7be

2008-09-07T11:50:28-07:00

Merge branch 'stable' Conflicts: VERSION 4fa36dce2775554b6519153264232322fa5aa73d Nathan Weizenbaum nex342@gmail.com f586f9fa318a29b4909f0102d8b0844e76f58c59 Nathan Weizenbaum nex342@gmail.com http://github.com/mislav/haml/commit/dd0d69be77cfafa874842d2e3ae2d6984867a744 dd0d69be77cfafa874842d2e3ae2d6984867a744

2008-09-07T11:49:32-07:00

Update VERSION for 2.0.3. d49f78bdd7263f68d6b628a38ecd9c06afa2cd4a Nathan Weizenbaum nex342@gmail.com 39d4c54c8fe9c0ed63234397658d7936ec72b970 f586f9fa318a29b4909f0102d8b0844e76f58c59 Nathan Weizenbaum nex342@gmail.com http://github.com/mislav/haml/commit/860592f342373d1386fdba0909d1c0d3ac8e0014 860592f342373d1386fdba0909d1c0d3ac8e0014

2008-09-07T11:40:03-07:00

2008-09-07T11:21:31-07:00

Merge branch 'stable' Conflicts: lib/sass/plugin.rb test/haml/results/filters.xhtml 4fa36dce2775554b6519153264232322fa5aa73d Nathan Weizenbaum nex342@gmail.com 8284da861e59e335b0869481d6d0c2684803dfd5 Nathan Weizenbaum nex342@gmail.com http://github.com/mislav/haml/commit/f586f9fa318a29b4909f0102d8b0844e76f58c59 f586f9fa318a29b4909f0102d8b0844e76f58c59

2008-09-07T11:18:38-07:00

Clean up Sass::Plugin option handling a little. 4f62a6b56370c87ab2e7538efdcacdfd3ad7cf6d Nathan Weizenbaum nex342@gmail.com 8d2c38c95cba9e251a441bd604bb6a3719d01039 7512dbe0938da2cc5e0dd083bc9ffea02c0fb79a Nathan Weizenbaum nex342@gmail.com http://github.com/mislav/haml/commit/8284da861e59e335b0869481d6d0c2684803dfd5 8284da861e59e335b0869481d6d0c2684803dfd5

2008-09-07T11:12:11-07:00

Merge commit '7512dbe0938da2cc5e0dd083bc9ffea02c0fb79a' into stable f953335358ec5bec9326f7823f6f2004a7fd094c Nathan Weizenbaum nex342@gmail.com 21f261d3a7e18a296a9c1f4be7430906df3d072c Nathan Weizenbaum nex342@gmail.com http://github.com/mislav/haml/commit/8d2c38c95cba9e251a441bd604bb6a3719d01039 8d2c38c95cba9e251a441bd604bb6a3719d01039

2008-09-05T13:10:49-07:00

2008-09-05T12:36:50-07:00

rstrip css2sass output. 95fdfabce7bb1f0094cc42238869b12cf08c6911 Nathan Weizenbaum nex342@gmail.com 21f261d3a7e18a296a9c1f4be7430906df3d072c Chris Eppstein chris@eppsteins.net http://github.com/mislav/haml/commit/7512dbe0938da2cc5e0dd083bc9ffea02c0fb79a 7512dbe0938da2cc5e0dd083bc9ffea02c0fb79a

2008-09-03T14:17:48-07:00

2008-09-03T10:36:14-07:00

Make the Sass filter in haml files pass the Sass::Plugin options when initializing the sass engine. 93f4ca2b5a00a49794811a3e577cb86fda123cb0 Chris Eppstein chris@eppsteins.net 1da96625212c8c76d7baa1e8d68db05e28c69e78 21f261d3a7e18a296a9c1f4be7430906df3d072c Nathan Weizenbaum nex342@gmail.com http://github.com/mislav/haml/commit/39d4c54c8fe9c0ed63234397658d7936ec72b970 39d4c54c8fe9c0ed63234397658d7936ec72b970

2008-09-02T17:02:11-07:00

Merge branch 'stable' Conflicts: lib/sass/css.rb f8d346d7b43be2b991928f455f8b64f01fd223b7 Nathan Weizenbaum nex342@gmail.com 3ffaaf5b64c58a2e93590c027fd60fcaa645c9d5 Nathan Weizenbaum nex342@gmail.com http://github.com/mislav/haml/commit/21f261d3a7e18a296a9c1f4be7430906df3d072c 21f261d3a7e18a296a9c1f4be7430906df3d072c

2008-09-02T16:59:28-07:00

Handle @media and friends properly in css2sass. 50da7e9beca8ae0d0eb42011dd31f966784e7c35 Nathan Weizenbaum nex342@gmail.com 2f56b425baa6def128bf0ac7c2f990d27d6f6627 Nathan Weizenbaum nex342@gmail.com http://github.com/mislav/haml/commit/3ffaaf5b64c58a2e93590c027fd60fcaa645c9d5 3ffaaf5b64c58a2e93590c027fd60fcaa645c9d5

2008-09-02T16:06:07-07:00

Mention haml/sass executables in docs on how to use. fa69f4c4d70fb37f72e3c4af9280fd4d9cfa03ec Nathan Weizenbaum nex342@gmail.com c237f843b8a5a4b65c2b8a61d3632e9fea9f954b 2f56b425baa6def128bf0ac7c2f990d27d6f6627 Nathan Weizenbaum nex342@gmail.com http://github.com/mislav/haml/commit/1da96625212c8c76d7baa1e8d68db05e28c69e78 1da96625212c8c76d7baa1e8d68db05e28c69e78

2008-08-31T15:41:38-07:00

Merge branch 'stable' 06ef9d3e04b7fbbeb476fca054467d5e6e0b969a Nathan Weizenbaum nex342@gmail.com d9fd622458c6da8af42d938e237a336380c74474 Nathan Weizenbaum nex342@gmail.com http://github.com/mislav/haml/commit/2f56b425baa6def128bf0ac7c2f990d27d6f6627 2f56b425baa6def128bf0ac7c2f990d27d6f6627

2008-08-31T15:41:32-07:00

Add -r and -I flags to the Haml executable. a2d460e7589832a7ab23ec830caad3c918d30804 Nathan Weizenbaum nex342@gmail.com 97f9810d8ad72a3216065c795ce40082e35de0d5 Nathan Weizenbaum nex342@gmail.com http://github.com/mislav/haml/commit/d9fd622458c6da8af42d938e237a336380c74474 d9fd622458c6da8af42d938e237a336380c74474

2008-08-31T15:21:14-07:00

Make the :javascript filter respect the :attr_wrapper option. dd304344d244487c8375067a13b9c3a1f1c2630b Nathan Weizenbaum nex342@gmail.com eafdc2db7eaa59d233c88a65f5c965d28ecee5cb 97f9810d8ad72a3216065c795ce40082e35de0d5 Nathan Weizenbaum nex342@gmail.com http://github.com/mislav/haml/commit/c237f843b8a5a4b65c2b8a61d3632e9fea9f954b c237f843b8a5a4b65c2b8a61d3632e9fea9f954b

2008-08-30T15:13:53-07:00

Merge branch 'stable' Conflicts: lib/haml/precompiler.rb e521e7ee2a520a518aa6eafc86e4d031318b2822 Nathan Weizenbaum nex342@gmail.com 534b536b6f0e42d8e8c3c1fd806161a61b15acb2 Nathan Weizenbaum nex342@gmail.com http://github.com/mislav/haml/commit/97f9810d8ad72a3216065c795ce40082e35de0d5 97f9810d8ad72a3216065c795ce40082e35de0d5

2008-08-29T20:40:42-07:00

Errors should descend from StandardError, not Exception. 425278b44add96944436dcbb5d8e59325714fc0e Nathan Weizenbaum nex342@gmail.com 429314d2b0da220065e5d888d501ad9d0f0e9e7b Nathan Weizenbaum nex342@gmail.com http://github.com/mislav/haml/commit/534b536b6f0e42d8e8c3c1fd806161a61b15acb2 534b536b6f0e42d8e8c3c1fd806161a61b15acb2

2008-08-29T20:40:05-07:00

Fix a strange Haml indentation-error bug. febcc754a557e3a8496a8a5e543637b78ef16d16 Nathan Weizenbaum nex342@gmail.com 567f1222a8a1b6e0579f8876ce68a395aa7dbd75 429314d2b0da220065e5d888d501ad9d0f0e9e7b Nathan Weizenbaum nex342@gmail.com http://github.com/mislav/haml/commit/eafdc2db7eaa59d233c88a65f5c965d28ecee5cb eafdc2db7eaa59d233c88a65f5c965d28ecee5cb

2008-08-29T19:08:28-07:00

2008-08-29T19:07:59-07:00

Merge branch 'stable' Relatively major changes to warning-avoiding to get it working with master. The warning-avoiding in stable is based on http://pastie.org/262917.txt?key=18ufvnurbhubd7io3em5q, while the warning-avoiding in master is based on http://pastie.org/262888.txt?key=tmdvzn8bf9gm2hqht4fllq. d5c8dcafa73069365e66eea49ac0622b63fd687f Nathan Weizenbaum nex342@gmail.com fceeccea32ccc12affb50f21247ce17bf30f99c4 Mislav Marohnić mislav.marohnic@gmail.com http://github.com/mislav/haml/commit/429314d2b0da220065e5d888d501ad9d0f0e9e7b 429314d2b0da220065e5d888d501ad9d0f0e9e7b

2008-08-29T18:50:32-07:00

2008-08-29T17:40:59-07:00

avoid some warnings thrown by the Ruby interpreter dab8a1ce55711caa04fb58787b8bd69bccb4e629 Nathan Weizenbaum nex342@gmail.com 8eb07c63e4efdd38c5b5b6a9bc3ffa384381ca58 fceeccea32ccc12affb50f21247ce17bf30f99c4 Nathan Weizenbaum nex342@gmail.com http://github.com/mislav/haml/commit/567f1222a8a1b6e0579f8876ce68a395aa7dbd75 567f1222a8a1b6e0579f8876ce68a395aa7dbd75

2008-08-29T16:20:18-07:00

Merge branch 'stable' 86952dd419a5a57e22be139de2e620e3614736d0 Nathan Weizenbaum nex342@gmail.com c7948ffbadbbe03208b5e8e3b82fb2f2b68e2e94 Nathan Weizenbaum nex342@gmail.com http://github.com/mislav/haml/commit/fceeccea32ccc12affb50f21247ce17bf30f99c4 fceeccea32ccc12affb50f21247ce17bf30f99c4

2008-08-29T16:19:48-07:00

Fix a minor documentation error. b0d0acdeffe0cb02c4f7b26e0ddb060182aeb2bf Nathan Weizenbaum nex342@gmail.com 7bb91cf49ac6a38fc69e16a9fb07b8484b5cc4cf c7948ffbadbbe03208b5e8e3b82fb2f2b68e2e94 Nathan Weizenbaum nex342@gmail.com http://github.com/mislav/haml/commit/8eb07c63e4efdd38c5b5b6a9bc3ffa384381ca58 8eb07c63e4efdd38c5b5b6a9bc3ffa384381ca58

2008-08-29T16:18:31-07:00

Merge branch 'stable' 7b321820ee37e1daba496e341d68cd93bd42cc33 Nathan Weizenbaum nex342@gmail.com 0fa3201cc96c600e8f3307526bd9569fe845be31 Nathan Weizenbaum nex342@gmail.com http://github.com/mislav/haml/commit/c7948ffbadbbe03208b5e8e3b82fb2f2b68e2e94 c7948ffbadbbe03208b5e8e3b82fb2f2b68e2e94

2008-08-29T16:18:24-07:00

Add support for more bluecloth parsers, and get rid of some {red,blue}cloth-specific tests. 217bd7fc89ac770a0dc426901da24ba8a0605c2f Nathan Weizenbaum nex342@gmail.com 89e5cf92005b9a0c8fe6d8b74081160f819bd9d4 Mislav Marohnić mislav.marohnic@gmail.com http://github.com/mislav/haml/commit/0fa3201cc96c600e8f3307526bd9569fe845be31 0fa3201cc96c600e8f3307526bd9569fe845be31

2008-08-29T15:41:14-07:00

2008-08-28T07:29:13-07:00

BlueCloth vs. RedCloth: change Markdown filter to only use BlueCloth. Remove tests that rely on 'redcloth' or Textile output. This is necessary because the new RedCloth doesn't support Markdown anymore, renders Textile with different whitespace setting, and it's generally a bad practice to rely on output of 3rd party libraries that have their own tests. df4aae1a3d420264dac22df45c239ceb3cd04ea1 Nathan Weizenbaum nex342@gmail.com