Skip to content

Commit

Permalink
Squashed 'includes/libraries/aihrus-framework/' changes from 4570a11.…
Browse files Browse the repository at this point in the history
….893f2ae

893f2ae RESOLVE #184 Remove deprecated constructor calls for WP_Widget
b2922b5 Version 1.2.3RC1
13885c6 Merge commit 'fc59104ce654a8877ccf12203410cfcf9fd96f28' into 1.2.2
fc59104 Squashed 'includes/libraries/parsedown/' changes from 93f7b26..a9dfc97

git-subtree-dir: includes/libraries/aihrus-framework
git-subtree-split: 893f2aebe08ea99320c90f1088d13674891a264c
  • Loading branch information
michael-cannon committed Jul 16, 2015
1 parent 82bef88 commit f62c054
Show file tree
Hide file tree
Showing 34 changed files with 916 additions and 571 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Expand Up @@ -2,6 +2,10 @@

## master

## 1.2.3RC1
* RESOLVE michael-cannon/testimonials-widget#184 Remove deprecated constructor calls for WP_Widget
* Update Parsedown library

## 1.2.2
* Add Inside Axelerant link
* Store branding updates
Expand Down
2 changes: 1 addition & 1 deletion README.md
@@ -1,7 +1,7 @@
# Aihrus Framework

Tested up to: 4.1.0
Stable tag: 1.2.2
Stable tag: 1.2.3RC1

A helper library for WordPress plugins by Aihrus and maintained by [Axelerant](//axelerant.com).

Expand Down
2 changes: 1 addition & 1 deletion aihrus-framework.php
Expand Up @@ -35,7 +35,7 @@
}

if ( ! defined( 'AIHR_VERSION' ) ) {
define( 'AIHR_VERSION', '1.2.2' );
define( 'AIHR_VERSION', '1.2.3RC1' );
}

require_once ABSPATH . 'wp-admin/includes/plugin.php';
Expand Down
2 changes: 1 addition & 1 deletion includes/class-aihrus-widget.php
Expand Up @@ -52,7 +52,7 @@ public function __construct( $classname, $description, $id_base, $title ) {
);

// Create the widget
$this->WP_Widget(
parent::__construct(
static::ID,
$title,
$widget_ops,
Expand Down
10 changes: 8 additions & 2 deletions includes/libraries/parsedown/.travis.yml
@@ -1,10 +1,16 @@
language: php

php:
- 7.0
- 5.6
- 5.5
- 5.4
- 5.3
- 5.2
- hhvm

- hhvm-nightly

matrix:
fast_finish: true
allow_failures:
- php: 7.0
- php: hhvm-nightly

0 comments on commit f62c054

Please sign in to comment.