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

Merge daattali beautiful jekyll #1

Merged
merged 34 commits into from Jan 28, 2019

Conversation

Projects
None yet
10 participants
@dborisenko
Copy link
Owner

dborisenko commented Jan 28, 2019

No description provided.

daattali and others added some commits May 4, 2018

add fb comment (#350)
* add fb comment

* Update README.md for facebook comments

* Update _config.yml

* Update README.md
Notch display (#355)
* Notch display

* Notch display

* Update main.css

mistake
Moved Google Analytics to the Head (#419)
* Moved Google Analytics to the Head

* Update CHANGELOG
Updates github-pages to v193 (#426)
* update github-pages to v193

* rebuild gemfile.lock with ruby 2.5.3p105 [x64-mingw32]
[Feature] Staticman v3 Support (#440)
* Added Staicman support

* Corrected template for staticman.yml

* Edit for coherence with _includes/disqus.html

* Updated documentation for Staticman

* Updated License to give credits to Michale Rose

* Update LICENSE

* add more staticman details to readme

* Clearer instructions about reCAPTCHA in YML

* Nest reCAPTCHA param inside Staticman

* Prepend all css selectors with .staticman-comments

Edit suggested by theme owner to avoid CSS rules overriding.

* Add myself to the change log

* Update _config.yml
Fix Staticman's raw JSON response in #440 (#444)
* Fix redirection error in daattali/beautiful-jekyll#440

* Corrected jQuery call URL in Staticman script
Fixed avatar img link on LINE51 (contained space) (#448)
Removed the extra space after {{ site.url }} and before "

npes87184 and others added some commits Jan 21, 2019

README.md: add solution of write permission when setup docker env (#450)
* README.md: add solution of write permission when setup docker env

Signed-off-by: Yu-Chen Lin <npes87184@gmail.com>

* Update README.md
Merge branch 'master' of github.com:daattali/beautiful-jekyll into me…
…rge-daattali-beautiful-jekyll

# Conflicts:
#	.gitignore
#	CHANGELOG.md
#	LICENSE
#	README.md
#	_config.yml
#	_posts/2015-01-19-soccer.md
#	_posts/2015-02-28-test-markdown.md
#	aboutme.md

@dborisenko dborisenko merged commit 9f8c17a into master Jan 28, 2019

@dborisenko dborisenko deleted the merge-daattali-beautiful-jekyll branch Jan 28, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment