PhileCMS / Phile

A flat file CMS with a swappable parser and template engine.
https://philecms.github.io/
Other
256 stars 48 forks source link

Develop #284

Closed james2doyle closed 8 years ago

james2doyle commented 8 years ago

Merge the latest Develop branch changes into the master.

james2doyle commented 8 years ago

When we get some more +1's on this, I will merge this in.

Frodox commented 8 years ago

It's hard to view +4,489 −3,990 at once, but all individual commits are ok, so +1 from me :)

kicken commented 8 years ago

Has a +1 from me. Looks good.

NeoBlack commented 8 years ago

@james2doyle I would like to have #285, #286 and #290 merged into develop before you merge develop into master. all three no-brainer or important for composer installations. can you please vote and merge this before make a new release?

james2doyle commented 8 years ago

The tests are failing in Scrutinizer because of the bumped PHP version requirement in composer.json

NeoBlack commented 8 years ago

don't know how scrutinizer works, but running the stuff with PHP 5.4?

NeoBlack commented 8 years ago

the red travis looks like a temporary issue.

james2doyle commented 8 years ago

Is this all good now? Anyone not happy with this?