Skip to content

Commit

Permalink
Sync master with staging branch
Browse files Browse the repository at this point in the history
Bump version
Tweak initial options so all announcements work without having to save the options
Re-minify files
  • Loading branch information
Evan Herman committed Jul 4, 2016
1 parent 67af574 commit 3585de8
Show file tree
Hide file tree
Showing 13 changed files with 34 additions and 25 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
[![Build Status](https://scrutinizer-ci.com/g/EvanHerman/Timeline-Express/badges/build.png?b=Refactor---v1.2)](https://scrutinizer-ci.com/g/EvanHerman/Timeline-Express/build-status/Refactor---v1.2)
[![Project Stats](https://www.openhub.net/p/timeline-express/widgets/project_thin_badge.gif)](https://www.openhub.net/p/timeline-express)

# Timeline Express - v1.2.8.1
# Timeline Express - v1.2.8.2
This repository is a re-factor of the original code base.

[![WordPress plugin](https://img.shields.io/wordpress/plugin/v/timeline-express.svg?style=flat-square)](https://wordpress.org/plugins/timeline-express/)
Expand Down
2 changes: 1 addition & 1 deletion constants.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* Define the current version of Timeline Express
*/
if ( ! defined( 'TIMELINE_EXPRESS_VERSION_CURRENT' ) ) {
define( 'TIMELINE_EXPRESS_VERSION_CURRENT', '1.2.8.1' );
define( 'TIMELINE_EXPRESS_VERSION_CURRENT', '1.2.8.2' );
}

/**
Expand Down
4 changes: 2 additions & 2 deletions lib/admin/css/min/timeline-express-admin.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions lib/admin/css/min/timeline-express-settings.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions lib/admin/js/min/timeline-express-admin.min.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions lib/admin/js/min/timeline-express-tinymce.min.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* @Plugin Timeline Express
* @Author Code Parrots
* @Site https://www.wp-timelineexpress.com
* @Version 1.2.8.1
* @Build 06-06-2016
* @Version 1.2.8.2
* @Build 07-04-2016
*/
!function(){tinymce.PluginManager.add("timeline_express",function(a,b){function c(){this.disabled(!this.disabled()),a.insertContent("[timeline-express]")}a.on("keyup",function(){a.getContent().indexOf("[timeline-express]")>-1?a.controlManager.setDisabled("timeline_express_shortcode_button",!0):a.controlManager.setDisabled("timeline_express_shortcode_button",!1)}),a.addButton("timeline_express_shortcode_button",{title:"Timeline Express Shortcode",text:!1,image:b+"/../../images/timeline-express-menu-icon.png",onclick:c}),a.onSetContent.add(function(a,b){a.getContent().indexOf("[timeline-express]")>-1&&a.controlManager.setDisabled("timeline_express_shortcode_button",!0)})})}();
4 changes: 2 additions & 2 deletions lib/helpers.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@
*/
function timeline_express_get_options() {
return get_option( TIMELINE_EXPRESS_OPTION, array(
'announcement-time-frame' => '0',
'announcement-time-frame' => '1',
'announcement-display-order' => 'ASC',
'excerpt-trim-length' => 250,
'excerpt-trim-length' => 50,
'excerpt-random-length' => 0,
'date-visibility' => '1',
'read-more-visibility' => '1',
Expand Down
Loading

0 comments on commit 3585de8

Please sign in to comment.