Commit Graph

59 Commits

Author SHA1 Message Date
Chris Eppstein
b90f9c5be0 Add support for packager to build one-click installers 2012-03-14 00:19:54 -07:00
Chris Eppstein
c8174b5679 Merge branch 'master' into stable
Conflicts:
	Gemfile
	lib/compass/sass_extensions/functions.rb
	lib/compass/sass_extensions/functions/trig.rb
	test/units/sass_extensions_test.rb
2012-03-11 18:30:25 -07:00
Chris Eppstein
325e376b55 ruby prof too 2012-03-11 18:17:26 -07:00
Chris Eppstein
8ed750c103 rcov doesn't work on 1.9 2012-03-05 11:34:42 -08:00
Scott Davis
9b39b5707f removed unneeded timecop 2012-03-01 13:48:34 -05:00
Scott Davis
89de5cb492 fixed some issues with test runners calling out the the command line which was creating unexpected results 2011-12-11 01:31:54 -05:00
Scott Davis
5bf3b68d2c tuned Gemfile for travis-ci 2011-12-10 13:07:21 -05:00
Scott Davis
1280fce2be added guard support 2011-12-09 20:42:31 -05:00
Scott Davis
067fb963df updated rake and cucumber so tests pass in 1.9.3 2011-09-26 13:42:12 -04:00
Scott Davis
8ae841785a updated gemfile so rcov will only install with mri_18 2011-09-03 15:57:25 -04:00
Scott Davis
1ad4dcaae8 hoping this fixes the ci server issues 2011-07-26 15:11:52 -04:00
Sven Fuchs
6170ab119f Update Gemfile to use rake 0.8.7
rake 0.9.x won't be compatible with Cucumber::Rake::Task::ForkedCucumberRunner which uses the RUBY constant, resulting in 'uninitialized constant Cucumber::Rake::Task::ForkedCucumberRunner::RUBY'
2011-06-21 16:51:49 +02:00
Chris Eppstein
ecd1efdea4 Fix for a compass validator bug due to some internal compass changes. 2011-06-11 11:33:01 -07:00
Chris Eppstein
2cafc616b6 see if this makes rubinius happy. 2011-04-28 22:02:51 -07:00
Chris Eppstein
cd9fe91059 Merge branch 'master' into stable
* master:
  sprite test_unit
  more sprite tests to test_unit
  sprite base test
  sprite tests moved over
  fixed merge in gemfile
  diff helper
  refactored tests
  updated the sencha site graphic
  updated gemfile
  updated gemfile
  updated gemfile
  fixed merge
  added application integration to turtorials
  merge
  added redirect for reference and updated general layouts redirect

Conflicts:
	Gemfile
	Gemfile.lock
2011-04-28 05:02:18 -07:00
Chris Eppstein
880360c0c1 Bump sass dependency for development. 2011-04-28 04:58:27 -07:00
Scott Davis
f4f9d7bfdc fixed merge in gemfile 2011-04-27 23:23:14 -04:00
Scott Davis
27809a19de Gemfile.locl 2011-04-27 23:20:29 -04:00
Scott Davis
c317ef6870 refactored tests 2011-04-27 23:18:52 -04:00
Brandon Mathis
f3ea546150 fixed merge 2011-04-26 23:02:59 -05:00
Brandon Mathis
f86bbfc013 updated the sencha site graphic 2011-04-26 22:58:26 -05:00
Scott Davis
f1061c474b updated gemfile 2011-04-26 22:00:46 -04:00
Scott Davis
e78ddf5d72 updated gemfile 2011-04-26 21:59:20 -04:00
Scott Davis
5cdd9c6d09 updated gemfile 2011-04-26 21:52:47 -04:00
Scott Davis
0d029e6a02 merge 2011-04-24 23:23:07 -04:00
Chris Eppstein
85268281bc Fix failing tests due to load path changes. 2011-04-24 16:41:56 -07:00
Scott Davis
fec367d60c fixed gemfile and removed coercion to float 2011-04-20 19:57:19 -04:00
Chris Eppstein
7b0bb7ad2b Change FSSM to a gem dependency instead of vendoring it. Closes GH-343. 2011-04-19 20:00:54 -07:00
Scott Davis
2c62cdf2f9 closes #296 rescue OutOfBounds exception gracfuly 2011-04-01 14:47:24 -04:00
John Bintz
f031d868d1 start refactoring work on sprite map 2011-03-22 21:19:19 -04:00
Scott Davis
acf9c662f6 merge 2011-03-21 17:33:37 -04:00
Scott Davis
d361d5f826 chunky_png gemfile change 2011-03-21 17:18:28 -04:00
Scott Davis
3f3eba57a2 merge 2011-03-18 06:44:54 -04:00
Chris Eppstein
7057f0f5bd Release documentation. 2011-03-15 17:09:46 -07:00
Scott Davis
bc13d6aed5 rmagick changes 2011-02-24 03:08:28 -05:00
Chris Eppstein
13ecaa2da6 bump sass dependency 2011-01-20 14:17:32 -08:00
Scott Davis
7343e80b7d bumped chunky_png to 0.12.0 and updated specs accordingly 2011-01-20 17:10:35 -05:00
Chris Eppstein
e384dee5da Update gemspec to work around sass regression. 2011-01-17 11:47:59 -08:00
Chris Eppstein
8519a66a02 Update sass dependency 2011-01-10 10:16:05 -08:00
Travis Tilley
3f8e83208d ruby-prof doesn't work on jruby 2011-01-07 01:41:13 +08:00
Chris Eppstein
1818957131 fix some bugs when building examples 2010-12-19 18:02:49 -08:00
Chris Eppstein
6ab9780dfe update gemfiles 2010-12-06 09:36:03 -08:00
Chris Eppstein
20bb8c0d28 Update gemfiles to depend on sass3.1 2010-12-05 16:14:36 -08:00
Nico Hagenburger
2522a3c981 updated gem versions 2010-12-05 16:13:12 -08:00
Nico Hagenburger
f577da1d5e updated to rspec 2.0.0 2010-12-05 16:13:11 -08:00
Chris Eppstein
dd2c9eb72d Add a --profile option to the compass CLI 2010-12-05 16:13:11 -08:00
Chris Eppstein
b313ac794e update the gemspec with lemonade dependencies. add nico as an author. 2010-12-05 16:13:11 -08:00
Chris Eppstein
ffe967e8c8 Bolt on lemonade to get started. 2010-12-05 16:13:10 -08:00
Chris Eppstein
9f1b8f515b Use the new Sass gem now. 2010-12-05 16:13:10 -08:00
Chris Eppstein
fd1dd25737 Depend on sass 3.1 2010-11-27 15:53:38 -08:00