deac
/
middleman
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
3,169 Commits
11 Branches
271 Tags
23 MiB
Commit Graph

142 Commits (master)

Author SHA1 Message Date
Thomas Reynolds ba01a0a72b more templates back into cli 2014-05-26 18:44:11 -07:00
Thomas Reynolds 113b352474 have travis install rubocop 2014-04-29 11:59:10 -07:00
Thomas Reynolds f513ab77b3 Rubocop'd 2014-04-29 11:43:05 -07:00
Thomas Reynolds 8eabe4d354 rubocop 2: the reckoning 2014-04-29 10:44:24 -07:00
Thomas Reynolds 04dc48f13d Great rubocop-ing 2014-04-28 16:02:18 -07:00
Thomas Reynolds f800a51fb2 Update haml and sass deps 2014-04-03 09:53:33 -07:00
Thomas Reynolds 6d2f8cd50c Add options hash to asset methods to allow special options to be passed through from extensions 2014-03-31 14:15:46 -07:00
Ben Hollis 5ce8549f03 Remove Asciidoc support in favor of a middleman-asciidoc extension. 2014-03-29 19:24:51 -07:00
Karl Freeman 57534b6e7c rubocop'd Gemfile 
- add rubocop as a development dependency
 2014-03-25 10:08:59 +00:00
Ben Hollis 58616ce486 pry-debugger is not available on Ruby 2.1 2014-03-13 20:31:41 -07:00
Karl Freeman 772de85ce3 move to middleman-templates 2014-03-11 11:07:55 +00:00
Ben Hollis 9e9bed0043 pry-debugger is not available on Ruby 2.1 2014-03-03 23:07:32 -08:00
Ben Hollis 7b46fd6524 Merge remote-tracking branch 'origin/v3-stable' 
Conflicts:
	CHANGELOG.md
	middleman-core/lib/middleman-core/core_extensions/rendering.rb
	middleman-core/lib/middleman-core/extensions.rb
	middleman-core/lib/middleman-core/version.rb
	middleman-core/lib/middleman-more/core_extensions/compass.rb
	middleman-core/lib/middleman-more/core_extensions/default_helpers.rb
	middleman-core/middleman-core.gemspec
 2014-02-22 18:11:37 -08:00
Thomas Reynolds 3995ad850c update padrino. 2014-02-18 18:30:29 -08:00
Thomas Reynolds bea2515a41 Move CLI into middleman-cli 2014-01-02 16:39:06 -08:00
Thomas Reynolds a610608785 remove old style extension support 2014-01-01 15:10:49 -08:00
Karl Freeman dcf527008e StringLiterals 'cop' fix [ci skip] 2013-12-29 23:04:30 +00:00
Karl Freeman f6f235c1fe exclude development gems 2013-12-29 22:53:18 +00:00
Karl Freeman 03d6e6c990 Implemented Rubocop 
- just took a stab at running the StringLiterals cop to get a taste.
 2013-12-28 00:47:39 +00:00
Thomas Reynolds 22c977d426 Merge branch 'master' of github.com:middleman/middleman 2013-10-29 09:44:22 -07:00
Thomas Reynolds ca4935361b drop Ruby 1.8, add some extra tests 2013-10-29 09:43:56 -07:00
Thomas Reynolds 19c155349d Merge pull request #1044 from mojavelinux/asciidoc-renderer 
resolves #1043 added a renderer for AsciiDoc files
 2013-10-29 09:37:36 -07:00
Ben Hollis 7143f53efa Remove middleman-more files 2013-10-19 15:59:12 -07:00
Dan Allen 5439139b76 added cucumber tests for #1043, AsciiDoc support 2013-10-19 14:41:52 -06:00
Thomas Reynolds cd9964edbe prep 2013-09-07 13:12:31 -07:00
Thomas Reynolds ba3b8c4db3 old redcarpet for ruby 1.8 2013-07-16 15:07:59 -07:00
Thomas Reynolds 7e405fc414 And by 1.8, I mean MRI 1.8 2013-06-12 17:58:59 -07:00
Thomas Reynolds e03362e6f6 Apparently Ruby 1.8 doesn't have Proc.source_location 2013-06-12 17:40:17 -07:00
Thomas Reynolds 9d5a878713 prybegone 2013-06-09 17:15:15 -07:00
Thomas Reynolds d71af3f5a1 Force padrino to skip safebuffer on erb 2013-06-08 15:36:14 -07:00
Thomas Reynolds 403d6abd05 fix up simplecov, add coveralls 2013-05-30 13:38:52 -04:00
Ben Hollis 994bd651f8 Add Simplecov 2013-05-28 22:29:58 -07:00
Thomas Reynolds 5b8c7a2494 move vendored gems into shared root 2013-05-23 16:06:20 -07:00
Thomas Reynolds 7a227b8bac stub out blank middleman-more gem for backwards compat with extensions 2013-05-23 15:26:33 -07:00
Thomas Reynolds 9ebddeed1d merge more into core, use gem availability to autoload 2013-05-09 14:41:26 -07:00
Thomas Reynolds 399af44c71 update uglifier dep 2013-04-22 22:22:36 -07:00
Thomas Reynolds 4b5e6aeb54 loosen fivemat dep 2013-04-14 09:24:35 -07:00
Ben Hollis b4c2bf3098 Requiring sinatra messes stuff up 2013-04-12 23:32:17 -07:00
Thomas Reynolds 3f94df1eef prep 3.1 beta 2013-04-12 16:19:47 -07:00
Thomas Reynolds 0574cc3d28 Support sideloading from .frontmatter files. Closes #855 2013-04-12 16:14:16 -07:00
Ben Hollis b159946a6e Upgrade fivemat 2013-04-06 23:53:51 -07:00
Ben Hollis c602df30dd Fix some 1.8.7 issues 2013-04-06 22:55:49 -07:00
Thomas Reynolds 16d6ac156c looser test deps 2013-03-18 14:21:06 -07:00
Thomas Reynolds f2f3ad21b6 bump tilt requirement, unregister plaintext template. fixes #824 2013-03-18 14:12:49 -07:00
Thomas Reynolds 0525902e43 what about no https travis? 2013-02-24 16:13:31 -08:00
Thomas Reynolds 18849c2eea loosen testing deps 2013-02-24 13:55:59 -08:00
Karl Freeman 6f5804d6b2 Bundler advises not to use a source symbol anymore 
- d30026e9c8
 2013-02-24 13:35:43 -08:00
Thomas Reynolds aa2102cbb7 update listen dep 2013-02-19 17:14:10 -08:00
Ben Hollis 9057b7a85e Support Haml 4. Tests only run with Haml 4 now. Fixes #783 2013-02-17 19:40:17 -08:00
Ben Hollis 6dbe7f7a5a Update Gemfile to allow bundler to ever complete. Also simplify Gemfile, update dependencies, and remove $LOAD_PATH hacking from gemspecs. 2013-01-25 22:31:40 -08:00
Thomas Reynolds af132f6207 disable cane 2013-01-14 23:33:16 -08:00
Thomas Reynolds ae9e6e722e bye bye pry 2013-01-14 22:41:11 -08:00
Thomas Reynolds 18da6362ba Allow multi-level i18n files. Fixes #725 2013-01-11 17:23:24 -08:00
Thomas Reynolds 63a82e6b1e Lock therubyracer for now 2012-12-15 14:53:57 -08:00
Thomas Reynolds 01e9c336b0 Stylus support and tests. Fixes #649 2012-10-28 12:18:29 -07:00
Thomas Reynolds d3818e8368 Prep 3.0.5 2012-09-23 19:00:40 -07:00
Thomas Reynolds 5a88184769 lock therubyrhino gem dep 2012-08-16 13:56:25 -07:00
Thomas Reynolds 446aa6a4ba Clean up whitespace, play with cane for testing style quality and code complexity 2012-08-13 15:41:07 -07:00
Thomas Reynolds 174000c1a2 3.0 [ci skip] 2012-07-09 10:00:49 -07:00
Thomas Reynolds 2282657000 Use therubyrhino for jruby execjs tests 2012-07-07 14:31:39 -07:00
Thomas Reynolds cdca063fb8 Add middleman-sprockets as a gitmodule [no ci] 2012-07-02 21:32:08 -07:00
Thomas Reynolds aa0d848ba5 Don't test Less on JRuby 2012-06-05 10:28:09 -07:00
Thomas Reynolds 286c7352b6 Fix Less load paths, simplify builder error output. Fixes #461 2012-06-05 10:24:00 -07:00
Thomas Reynolds 8d483f882c Move Sprockets into an extension 2012-05-26 13:43:27 -07:00
Thomas Reynolds 024d33c16e Bump cucumber dep [no-ci] 2012-05-10 20:18:18 -07:00
Thomas Reynolds ed50d4326a Try to avoid running bundler in tests on Travis 2012-05-10 16:07:11 -07:00
Thomas Reynolds 18d5c99f1f Redcarpet is C ruby only 2012-05-02 16:39:56 -07:00
Thomas Reynolds a7adc20b47 still support and test redcarpet 2012-05-02 15:27:47 -07:00
Thomas Reynolds 2965e3709d Yard doc cleanup 2012-05-02 11:13:48 -07:00
Thomas Reynolds 3d1f8e7624 Try Fivemat cucumber output 2012-04-12 11:04:23 -07:00
Thomas Reynolds 07828d8aa0 derp only allow compass 0.12 2012-03-14 20:05:49 -07:00
Thomas Reynolds 7d2821a472 travis update 2012-03-14 20:02:49 -07:00
Thomas Reynolds a6d099c4a0 massage some deps 2012-03-03 16:23:06 -08:00
Thomas Reynolds 5842bf8e5b allow extensionless files to be previewed and built. fixes #270, but requires alternative layouts be placed in a layouts/ directory now. 2012-02-12 11:45:42 -08:00
Thomas Reynolds 73913f0ace Start getting middleman-more tests passing. About 50% done 2011-12-29 19:04:39 -08:00
Thomas Reynolds c8a134a386 split into middleman-core and middleman-more 2011-12-29 15:09:51 -08:00
Thomas Reynolds 5611976d29 try multi platform builds 2011-09-09 11:14:34 -07:00
Thomas Reynolds cc577c0c73 give sprockets access to middleman environment scope (variables, data, etc) 2011-08-31 13:15:59 -07:00
tdreyno 4face08dac use bundler for packaging 2010-12-23 17:18:15 -08:00
tdreyno a0cce524a8 remove vendored gems 2010-02-15 13:02:20 -08:00
tdreyno ce6deb4c9f Update to sinatra 1.0a 2010-01-29 22:48:34 -08:00
tdreyno 5e94e17529 gem updates 2010-01-20 15:22:40 -08:00
tdreyno 97397489c9 ready for relase 2009-12-13 12:02:24 -08:00
tdreyno 420286ed45 bundle update 2009-12-03 13:34:20 -08:00
tdreyno 6172790a79 pass specs again 2009-11-30 11:32:02 -08:00
tdreyno d770a60d19 more changes 2009-11-24 14:24:20 -08:00
tdreyno b49f9fda6b move vendor dir 2009-11-22 14:16:20 -08:00
tdreyno 83d3456837 use system thin for native compilation 2009-11-17 15:33:46 -08:00
tdreyno 4692ceff07 a fully-bundled middleman 2009-11-17 15:26:23 -08:00
tdreyno 85250dddae for some reason runcoderun LOVES rack-test 0.5.1 2009-11-17 14:01:06 -08:00
tdreyno ed83154945 add smusher dep 2009-11-17 11:13:32 -08:00
tdreyno aa5a3d5918 runcoderun 2009-11-13 12:25:16 -08:00