deac/middleman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Commit graph

  • 90490d696f Merge pull request #1678 from maxmeyer/feature/server_hook Thomas Reynolds 2015-11-11 12:26:22 -08:00
  • 741caab546 Make middleman compatible with aruba 0.10.x Dennis Günnewig 2015-11-09 14:46:48 +01:00
  • 90d386079d Make it easier for users behind http proxies to install gems from github with bundler 1.x Dennis Günnewig 2015-11-09 14:46:28 +01:00
  • 0f8ea86119 Add hook for before_server Dennis Günnewig 2015-11-07 18:51:19 +01:00
  • a61b2e3b87 Move HTTPS to server_information Dennis Günnewig 2015-11-07 18:50:55 +01:00
  • 77dad2a400 Merge pull request #1674 from LandonSchropp/v3-stable Thomas Reynolds 2015-11-02 23:15:34 -08:00
  • d67e5f512b Add missing require to default_helpers.rb Landon Schropp 2015-11-02 20:56:39 -08:00
  • 575423628d Add back full version path, fixes #1671 Thomas Reynolds 2015-11-01 09:23:33 -08:00
  • c9bb4540b3 Merge pull request #1668 from djpowers/patch-1 Thomas Reynolds 2015-10-28 20:34:23 -07:00
  • 1c94fe989c Update link to getting started guide Dave Powers 2015-10-28 20:50:10 -04:00
  • 097d19eaca Merge pull request #1661 from tysongach/tg-donation-link Thomas Reynolds 2015-10-28 09:15:10 -07:00
  • 807bb3264c Update donation link Tyson Gach 2015-10-28 09:50:02 -04:00
  • 8dbd35938d Merge pull request #1659 from glamouracademy/v3-stable Thomas Reynolds 2015-10-27 10:54:50 -07:00
  • ec30622dc3 Merge pull request #1 from glamouracademy/glamouracademy-patch-1 glamouracademy 2015-10-27 12:42:27 -04:00
  • 601653b766 Add link for RubyGem package manager download glamouracademy 2015-10-27 12:38:16 -04:00
  • ec99a7b28f Merge pull request #1657 from mojavelinux/issue-1656 Thomas Reynolds 2015-10-26 14:52:30 -07:00
  • c48c81cbba resolves #1656 don't mangle URL inside tag Dan Allen 2015-10-26 00:58:34 -06:00
  • 30e37293b3 Merge pull request #1655 from mojavelinux/issue-1653 Thomas Reynolds 2015-10-26 10:21:11 -07:00
  • 765c28114a Merge pull request #1654 from mojavelinux/patch-1 Thomas Reynolds 2015-10-26 10:20:13 -07:00
  • 4995bd23d7 resolves #1653 don't rewrite paths that start with // Dan Allen 2015-10-26 00:35:40 -06:00
  • c07af953f8 Ignore .ruby-gemset file Dan Allen 2015-10-25 23:58:39 -06:00
  • c2f0db0951 Merge pull request #1650 from jenniferyien/v3-stable Thomas Reynolds 2015-10-24 13:54:33 -07:00
  • 3d88530925 Update LICENSE.md Jenn 2015-10-23 23:33:39 -04:00
  • 19d21d2295 make frontmatter delims configurable Eliott Appleford 2015-10-23 09:08:09 +00:00
  • 3cd84eb4d1 move_file as a replacement for import_asset Thomas Reynolds 2015-10-22 20:23:39 -07:00
  • 5f69431a74 Merge pull request #1614 from poporul/v3-stable Thomas Reynolds 2015-10-22 19:56:24 -07:00
  • a4807496ed Merge pull request #1640 from tommysanterre/Fix_issue_1601_unitialized_constant_on_windows Thomas Reynolds 2015-10-19 15:32:30 -07:00
  • 546cadf4fd Add some requires to help #1601 Tommy Santerre 2015-10-17 21:53:47 -04:00
  • db1e8b8611 add a specific require. hopefully helping #1601 Thomas Reynolds 2015-10-17 14:06:50 -07:00
  • 62d7fa0676 remove unused file Thomas Reynolds 2015-10-12 12:37:42 -07:00
  • d2251de898 Bump Padrino Thomas Reynolds 2015-10-12 12:37:33 -07:00
  • 6357f4f5b8 Add back app.set, but mark as deprecated Thomas Reynolds 2015-10-12 12:37:07 -07:00
  • 58e794645b Merge pull request #1633 from dg-ratiodata/feature/preven_crash_due_to_invalid_data_file Thomas Reynolds 2015-10-09 12:41:26 -07:00
  • 492281f9e8 Refator Data Loader to prevent middleman from crashing due to invalid data file Dennis Günnewig 2015-10-09 11:06:41 +02:00
  • 4d46b84aae Do not run specs if there is no spec directory Alexey Pokhozhaev 2015-10-07 15:59:12 +03:00
  • b9cdc2bba4 Run cucumber if features directory exists + removed unused task Alexey Pokhozhaev 2015-10-07 15:29:34 +03:00
  • 3a7848da9e Little bit cleaned up. Dry in rake tasks. Fix $LOAD_PATH Alexey Pokhozhaev 2015-10-02 15:12:13 +03:00
  • 8292bc9899 Merge pull request #1625 from ajsharp/patch-1 Thomas Reynolds 2015-10-05 20:47:19 -07:00
  • 9a529cd294 Add Errno::ENETUNREACH to exception list in BasicNetworkResolver Alex Sharp 2015-10-05 11:08:52 -07:00
  • eb82f402a0 gem bumps Thomas Reynolds 2015-10-05 09:48:04 -07:00
  • 529bcca927 Merge pull request #1623 from boone/spellcheck Thomas Reynolds 2015-10-05 08:21:06 -07:00
  • 5a4d7352f1 Fixed typos. Mike Boone 2015-10-04 20:59:53 -04:00
  • f4bff73b7b Merge pull request #1622 from y-yagi/master_remove_unnecessary_require Thomas Reynolds 2015-10-04 17:57:55 -07:00
  • 99c2362ee8 Merge pull request #1616 from y-yagi/reomve_unnecessary_require Thomas Reynolds 2015-10-04 11:50:46 -07:00
  • e26f83e1c2 remove unnecessary require yuuji.yaginuma 2015-10-04 07:24:21 +09:00
  • 65a65b9677 remove unnecessary require yuuji.yaginuma 2015-10-03 10:06:52 +09:00
  • e9abfe1134 rubocop Thomas Reynolds 2015-10-01 13:54:54 -07:00
  • 67fc3d0c05 Fix: Can't clean files when the project is under a hidden directory. inoue_sachiro 2015-09-30 21:23:27 +09:00
  • fd6a2376bd Fix frontmatter on 2.0 Thomas Reynolds 2015-10-01 10:25:53 -07:00
  • a064ba93b3 Merge pull request #1613 from ne-sachirou/fix/clean_under_hidden_dir Thomas Reynolds 2015-09-30 23:57:05 -07:00
  • d828067189 Fix sass helpers in SassC context Thomas Reynolds 2015-09-30 11:16:57 -07:00
  • 0698d7f5aa Revert "Frontmatter parseing changes broke some whitespace in tests, but shouldn't be a regression" Thomas Reynolds 2015-09-30 10:24:12 -07:00
  • 2aac804e92 Fix: Can't clean files when the project is under a hidden directory. inoue_sachiro 2015-09-30 21:23:27 +09:00
  • 9686c1ec7a Merge pull request #1611 from middleman/Arcovion-patch-2 Eliott Appleford 2015-09-30 08:17:18 +01:00
  • b389c26b4e Fix frontmatter regex Eliott Appleford 2015-09-30 05:45:34 +01:00
  • 9df1a45301 Strip newline after frontmatter Eliott Appleford 2015-09-30 05:00:57 +01:00
  • 5e3ddbf988 Frontmatter parseing changes broke some whitespace in tests, but shouldn't be a regression Thomas Reynolds 2015-09-29 10:27:53 -07:00
  • d9fc7a95e1 Fix a bad i18n regression Thomas Reynolds 2015-09-28 14:52:16 -07:00
  • 04c133c90f Fix minify css tests Thomas Reynolds 2015-09-28 13:58:49 -07:00
  • 32891dc6fe SassC, woot Thomas Reynolds 2015-09-28 11:24:37 -07:00
  • 97cd1c1411 Fix JSON frontmatter parsing Eliott Appleford 2015-09-24 20:27:36 +01:00
  • fe66beacc3 Test fix WIP Thomas Reynolds 2015-09-23 16:20:16 -07:00
  • ddc4a3cabc Update data.rb Eliott Appleford 2015-09-23 23:40:42 +01:00
  • 5afc138eb8 Merge pull request #1608 from middleman/frontmatter Thomas Reynolds 2015-09-23 15:23:05 -07:00
  • 47bdcb2d9c Fix frontmatter parsing changes from #1608 Eliott Appleford 2015-09-23 20:06:11 +00:00
  • 11fc90f93c Merge pull request #1604 from middleman/frontmatter Eliott Appleford 2015-09-21 13:33:43 +01:00
  • 91a06a1a35 Refactor util/data.rb further Eliott Appleford 2015-09-20 12:23:47 +00:00
  • 62f431b5ae Refactor frontmatter parsing Eliott Appleford 2015-09-19 14:53:12 +00:00
  • d3d32731e1 more test fixes Thomas Reynolds 2015-09-19 16:00:38 -07:00
  • 765de5ab11 Remove ancient twitter bootstrap test. Use npm or bower, y'all Thomas Reynolds 2015-09-19 14:39:55 -07:00
  • 3e1fc0aa1f Change test to respect global relative assets change Thomas Reynolds 2015-09-19 14:26:30 -07:00
  • 3ae28874bf Fix test breakage Thomas Reynolds 2015-09-19 14:07:42 -07:00
  • 2907761556 tweak logger ref Thomas Reynolds 2015-09-17 14:46:27 -07:00
  • fdabd87957 merge in fixes from stable Thomas Reynolds 2015-09-17 13:53:43 -07:00
  • 409a892da7 Forward port some stable changes Thomas Reynolds 2015-09-17 09:41:17 -07:00
  • 2870647097 Merge pull request #1578 from ashfurrow/after_render-fix Thomas Reynolds 2015-09-17 09:35:37 -07:00
  • a251c82562 Add test for #1568 Thomas Reynolds 2015-07-20 12:13:10 -07:00
  • 41255e6727 Merge pull request #1599 from nslocum/v3-stable Thomas Reynolds 2015-09-17 09:03:51 -07:00
  • 2b2ee10d81 dont autoload stuff when bundler will load v4.0.0.rc.1 Thomas Reynolds 2015-09-16 14:01:39 -07:00
  • 260c6be66c Move compass and sprockets to template config Thomas Reynolds 2015-09-16 10:53:31 -07:00
  • ed405b266f bump target ruby version Thomas Reynolds 2015-09-14 17:46:12 -07:00
  • 8c02eb2a26 Some tweaks to get blog working Thomas Reynolds 2015-09-14 17:37:35 -07:00
  • c09b15a895 specify the root directory. Nick Slocum 2015-09-13 11:05:11 -04:00
  • d99b922e67 Let's do this Thomas Reynolds 2015-09-12 16:16:26 -07:00
  • 40f023f01c Let's do this Thomas Reynolds 2015-09-12 16:15:32 -07:00
  • 10feaad451 Ignore gems installed in local dir. nslocum 2015-09-11 08:42:52 -04:00
  • 441dc2faa6 Revert breaking resource source_file api. For #1595 Thomas Reynolds 2015-09-09 11:55:56 -07:00
  • 8a349322ac Merge pull request #1593 from komor72/patch-1 Thomas Reynolds 2015-09-03 10:09:54 -07:00
  • 0d4d82a01a Update middleman-livereload version to more current Rafał Komorowski 2015-09-03 18:25:43 +02:00
  • d849930e51 Don't set mode AND environment with the same ENV Thomas Reynolds 2015-09-01 09:58:13 -07:00
  • 7a28fd0a50 disable osx builds for now Thomas Reynolds 2015-08-31 11:25:22 -07:00
  • 5cab7c46a9 Store intermediate resources in reducer so the array is not empty the first run. Addresses #1590 Thomas Reynolds 2015-08-31 11:18:45 -07:00
  • 60d88139af Merge pull request #1588 from bradgessler/patch-1 Thomas Reynolds 2015-08-28 15:29:13 -07:00
  • 8bdeab50ee Fix typo in server CLI. Brad Gessler 2015-08-28 13:08:56 -07:00
  • f76561d101 Add logger require in rack. Addresses #1550 Thomas Reynolds 2015-08-28 09:58:10 -07:00
  • 9ed0796b4a Move some extension setup to ready event Thomas Reynolds 2015-08-20 17:45:18 -07:00
  • 3485f49f74 Use Hashie Mash for recursive indifferent Thomas Reynolds 2015-08-18 16:22:32 -07:00
  • 0861fad2e1 Adding ignore Thomas Reynolds 2015-08-17 15:59:48 -07:00
  • 241fe69f7d Adding ignore Thomas Reynolds 2015-08-17 14:33:19 -07:00
  • 9886e04a95 Patch around seemingly invalid logic in Listen v3 Thomas Reynolds 2015-08-17 14:28:15 -07:00