Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: getherbert/framework
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: dev
Choose a base ref
...
head repository: shortlist-digital/agreable-wp-plugin-framework
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Able to merge. These branches can be automatically merged.
  • 7 commits
  • 2 files changed
  • 2 contributors

Commits on Sep 28, 2017

  1. Copy the full SHA
    cdd99d0 View commit details
  2. define as stable

    jonsherrard committed Sep 28, 2017
    Copy the full SHA
    c860763 View commit details
  3. update name

    jonsherrard committed Sep 28, 2017
    Copy the full SHA
    c272e55 View commit details
  4. update name again

    jonsherrard committed Sep 28, 2017
    Copy the full SHA
    9fc7a5e View commit details
  5. update name

    jonsherrard committed Sep 28, 2017
    Copy the full SHA
    8f6e554 View commit details
  6. update name

    jonsherrard committed Sep 28, 2017
    Copy the full SHA
    a633b6d View commit details

Commits on Nov 7, 2017

  1. Bumping Twig version to v2

    ecoad committed Nov 7, 2017
    Copy the full SHA
    638f407 View commit details
Showing with 5 additions and 5 deletions.
  1. +1 −1 Herbert/Framework/Providers/TwigServiceProvider.php
  2. +4 −4 composer.json
2 changes: 1 addition & 1 deletion Herbert/Framework/Providers/TwigServiceProvider.php
Original file line number Diff line number Diff line change
@@ -35,7 +35,7 @@ public function register()
return [
'debug' => $this->app->environment() === 'local',
'charset' => 'utf-8',
'cache' => content_directory() . '/twig-cache',
'cache' => content_directory() . '/uploads/twig-cache',
'auto_reload' => true,
'strict_variables' => false,
'autoescape' => true,
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "getherbert/herbert",
"description": "Herbert",
"name": "shortlist-digital/agreable-wp-plugin-framework",
"description": "Herbert Fork",
"license": "MIT",
"require": {
"twig/twig": "~1.16",
"twig/twig": "^2.0",
"illuminate/database": "~5.0",
"vierbergenlars/php-semver": "~3.0",
"symfony/var-dumper": "~3.0",
@@ -17,5 +17,5 @@
"config": {
"preferred-install": "dist"
},
"minimum-stability": "dev"
"minimum-stability": "stable"
}