search

timwis / jkan

A lightweight, backend-free open data portal, powered by Jekyll
https://jkan.io
MIT License
219 stars 309 forks source link

Added Disqus #115

Closed iltempe closed 7 years ago

iltempe commented 8 years ago

I've added the possibility to make comments with DISQUS on datasets.

It's just a question to set a tag in the dataset md file, "comment: true" and in _config.yml your disqus shortname.

In dataset.html page if inserted the JS code to enable disqus where comments are enable.

you can look everythig on http://iltempe.github.io/opendatagentediprato/datasets/.

patcon commented 8 years ago

Hey @iltempe, this sounds great! But in order to submit a PR, you'll have to submit a feature branch from the upstream's master branch, or else you're submitting all your customizations together.

A good practice is to create a branch for your city, maybe a prato branch. This should we to get you there:

# rename current custom master branch to prato
git branch -m master prato
# Ensure upstream remote is present
git remote add upstream https://github.com/timwis/jkan.git
git fetch upstream
# Recreate master tracking upstream
git checkout --track upstream/master

Then anytime you create a feature, you'll have to create the feature branch off of master

If you want to stay in sync with upstream, you can just rebase every once in awhile

git checkout prato
git rebase master
git push origin prato --force

Overriding history with a force-push is a little contentious, but I usually prefer it when I'm the only person working on a repo. You could always research how to keep merging master into the prato branch, and that would be comparable

Anyhow, good luck!

iltempe commented 8 years ago

Thanks for your suggestion.

i’m in line with your development in the fork https://github.com/iltempe/opendatagentediprato https://github.com/iltempe/opendatagentediprato

In this fork i’ve already implemented Disqus comment feature.

Is possible to merge this feature with JKAN from this repo?

Matteo

Il giorno 07 mag 2016, alle ore 23:40, Patrick Connolly notifications@github.com ha scritto:

Hey @iltempe https://github.com/iltempe, this sounds great! But in order to submit a PR, you'll have to submit a feature branch from the upstream's master branch, or else you're submitting all your customizations together.

A good practice is to create a branch for your city, maybe a prato branch. This should we to get you there:

rename current custom master branch to prato

git branch -m master prato

Ensure upstream remote is present

git remote add upstream https://github.com/timwis/jkan.git git fetch upstream

Recreate master tracking upstream

git checkout --track upstream/master Then anytime you create a feature, you'll have to create the feature branch off of master

If you want to stay in sync with upstream, you can just rebase every once in awhile

git checkout prato git rebase master git push origin prato --force Overriding history with a force-push is a little contentious, but I usually prefer it when I'm the only person working on a repo. You could always research how to keep merging master into the prato branch, and that would be comparable

Anyhow, good luck!

— You are receiving this because you were mentioned. Reply to this email directly or view it on GitHub https://github.com/timwis/jkan/pull/115#issuecomment-217670406