Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Combined with 2.0.0-wip branch #22

Closed
wants to merge 42 commits into from
Closed

Combined with 2.0.0-wip branch #22

wants to merge 42 commits into from

Conversation

scottrice10
Copy link

Also added the 1.2.4 change, so should work with both Wordpress and Github downloads.

root and others added 26 commits July 7, 2013 02:01
Conflicts:
	.travis.yml
	README.txt
	api/Indexer.php
	elasticsearch.php
	phpunit.xml
…fantastic-elasticsearch

Conflicts:
	elasticsearch.php
	facet-widget/lang/taxonomies-filter-widget-en_US.mo
	facet-widget/lang/taxonomies-filter-widget-en_US.po
	facet-widget/lang/taxonomies-filter-widget-ro_RO.mo
	facet-widget/lang/taxonomies-filter-widget-ro_RO.po
	lib/charts-widget/lang/taxonomies-filter-widget-en_US.mo
	lib/charts-widget/lang/taxonomies-filter-widget-en_US.po
	lib/charts-widget/lang/taxonomies-filter-widget-ro_RO.mo
	lib/charts-widget/lang/taxonomies-filter-widget-ro_RO.po
	lib/facet-widget/lang/plugin.po
	lib/facet-widget/lang/taxonomies-filter-widget-en_US.mo
	lib/facet-widget/lang/taxonomies-filter-widget-en_US.po
	lib/facet-widget/lang/taxonomies-filter-widget-ro_RO.mo
	lib/facet-widget/lang/taxonomies-filter-widget-ro_RO.po
 Please enter the commit message for your changes. Lines starting
Conflicts:
	.travis.yml
	README.txt
	elasticsearch.php
	phpunit.xml
	src/elasticsearch/Api.php
	wp/lib/nhp/options/options.php
@scottrice10
Copy link
Author

Charts Widget uses chart.js library to turn facet counts into one of six chart types (line, bar, polararea, radar, pie, or doughnut). Took a look at Automattic's es-backbone library, but the chart.js library offered more display types. Plus, the Wordpress Charts plugin already had the ball rolling incorporating charts.js.

Fantastic Elasticsearch 2.0.0 is really coming along. The new Faceting class, exposing ranges and taxonomy term arrays, is a nice improvement. I've incorporated some of the new method calls into the Facet and Charts Widgets and will continue to keep up with your changes. A Maps Widget plotting geo-facets is on the way.

@parisholley
Copy link
Owner

I'm not sure I can merge this code in. Are you the original author of the widget code? I saw this plugin Code Canyon which looks like the same thing.

http://codecanyon.net/item/taxonomies-filter-widget/4282257

@scottrice10
Copy link
Author

Cristian Iionel is the author of Taxonomies Filter Widget. It's an awesome plugin that does a particularly good job with ajax. I just e-mailed Cristian to ask if we could use a large portion of his code in Fantastic Elasticsearch.

I purchased a standard license for Taxonomies Filter Widget from Code Canyon in May and have been using the plugin since then. Envato's standard license reads that as a license holder, I may "create one End Product" and can "make any number of copies of the sigle End Product, as long as the End Product is distributed for free." http://codecanyon.net/licenses/regular, #4 and #5

Fantastic Elasticsearch is a single end product distributed for free. On the other hand, you as the original author do not own a license, and you might have plans to commercialize the plugin. However, you could always change the code in the future, if you did decide to sell the plugin.

Regardless, Cristian's wishes should probably overrule any licensing. So if he responds, I'll let you know what he says.

@parisholley
Copy link
Owner

thanks for clearing that up! i intend on keeping this plugin free but unless he gives the ok (which would require him to agree to distribute it with a MIT license) I will have to deny the pull.

Conflicts:
	elasticsearch.php
	wp/admin/sections/wordpress-integration.php
Conflicts:
	api/Defaults.php
	api/Indexer.php
	elasticsearch.php
	lib/facet-widget/lang/taxonomies-filter-widget-en_US.mo
	lib/facet-widget/lang/taxonomies-filter-widget-en_US.po
	lib/facet-widget/lang/taxonomies-filter-widget-ro_RO.mo
	lib/facet-widget/lang/taxonomies-filter-widget-ro_RO.po
	lib/map-widget/lang/taxonomies-filter-widget-en_US.mo
	lib/map-widget/lang/taxonomies-filter-widget-en_US.po
	lib/map-widget/lang/taxonomies-filter-widget-ro_RO.mo
	lib/map-widget/lang/taxonomies-filter-widget-ro_RO.po
	wp/lib/charts-widget/lang/taxonomies-filter-widget-en_US.mo
	wp/lib/charts-widget/lang/taxonomies-filter-widget-en_US.po
	wp/lib/charts-widget/lang/taxonomies-filter-widget-ro_RO.mo
	wp/lib/charts-widget/lang/taxonomies-filter-widget-ro_RO.po
	wp/lib/facet-widget/facet-widget.php
	wp/lib/nhp/options/options.php
@parisholley
Copy link
Owner

haven't heard back, gonna close this

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants