Skip to content

Merge master into fork #3

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.

Sign up for GitHub

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

Jump to bottom
Open
abreckner wants to merge 99 commits into
base: master
Choose a base branch
from
Open

Merge master into fork #3

abreckner wants to merge 99 commits into from

Conversation

@abreckner
Copy link
Owner

@abreckner abreckner commented Feb 23, 2015

No description provided.

ospsuite and others added 30 commits August 1, 2014 15:38
@ospsuite
Add pinterest button and reorganize social sharing
7c29d95
@Intrepidd
Correct typo in README
4ff926e
@anthonylewis
Use binstubs in examples instead of bundle exec
bb69a8e 
The preferred way of running `rake` and `rails` in Rails 4 is using the generated binstubs. This PR updates the README to use these commands. The associated Rails pull request is here: rails/rails#15192
@ospsuite
Merge pull request #217 from Intrepidd/patch-1
46816e2 
Correct typo in README
@ospsuite
Merge pull request #218 from anthonylewis/patch-1
69fe49f 
Use binstubs in examples instead of bundle exec
@nateberkopec
Remove ruby version files
6d23306
@kerrizor
Update README.md
1df6f11
@ospsuite
Merge pull request #222 from kerrizor/patch-1
0c3bd88 
Update README.md
@jipiboily
Merge pull request #220 from nateberkopec/remove-ruby-version
13f380f 
Remove ruby version files
@nateberkopec
Fixup travis.yml, test Ruby 2.1 + Rails 4.1
fc93c8c
@jipiboily
Merge pull request #221 from nateberkopec/travis-config
0ef9ed3 
Fixup travis.yml, test Ruby 2.1 + Rails 4.1
update on readme contribution chapter
8a47f82
@a-b-r-o-w-n
Add support for tag oriented feeds #213
c32f7e1
@a-b-r-o-w-n
Change single quote to double per style guide
2d0273f
@dept42
Upgrade ckeditor gem to one that works properly with Rails 4+ asset p…
8fd3515 
…ipeline
Added post's tags as a data attribute on the section element
4e4ef65
Classified tag names and added the class to the tag's span element
fa05819
@quainjn
Eager load users on blog & admin posts#index page
bb26bcb
@quainjn
Fix space for CI
2b820f7
@ospsuite
Merge pull request #225 from jethroo/chore/dummy_setup_for_development
2faa441 
update on readme contribution chapter
@ospsuite
Merge pull request #227 from dept42/ckeditor_upgrade
959c1ab 
Upgrade ckeditor gem to work properly with Rails 4+ asset pipeline
@ThomasTheFourth
Updating gem spec for gem compatibility
c50ae3d
adds config options for number of posts per page in admin module
7ad7893
adds method for paginated default post listing
f189b1f
adds pagination route for posts in admin module
537fb6c
adds use of new method for paginated post listing in admin
80bde16
adds pagination to admin post index
8a3f893
adds spec for paginated admin post route
8e22695
removes redundant self
755ca7e
adds parens to method argument
2368ecc
ospsuite and others added 30 commits August 12, 2015 17:10
@ospsuite
Merge pull request #258 from jcarreti/tag_frequency_performance
b5c1632 
Improved performance on tag frequency calculation
@ospsuite
Revert "Improved performance on tag frequency calculation"
9a11bf4
@ospsuite
Merge pull request #265 from jipiboily/revert-258-tag_frequency_perfo…
f1ef541 
…rmance

Revert "Improved performance on tag frequency calculation"
@ospsuite
use responders 2.1
f7d7f89
@ospsuite
Merge branch 'master' of https://github.com/jipiboily/monologue
a5542a3
@ospsuite
Change coffee rails version depedencies
39b04c5
@ospsuite
Merge pull request #264 from Scootin/master
1f6b8de 
Fixed view receiving error notice when post saved successfully
@ospsuite
Bump version to 0.4.2 compatible with rails 4.2
9e3eea8
@ospsuite
Update README.md
a0198eb
@ospsuite
Merge branch 'master' of https://github.com/jipiboily/monologue
7d0156c
@ospsuite
Ensure view generates viewsby default under the views folder and fixes …
4ca70ab 
…#266
@ospsuite
Add new config setting preview_size and fixes #268
a89714e
@ospsuite
Bump to version 0.5.0
3d8d6c4
@ospsuite
Merge pull request #276 from jipiboily/0-5-stable
eb86247 
Version 0.5.0 stable branch
Adds ButterCMS sponsorship
e418a87
@jipiboily
Merge pull request #300 from rogerjin12/patch-1
291956b 
Adds ButterCMS sponsorship
@illegalnumbers
updating documentation
fe905b3
@illegalnumbers
updating to rails specific version fixes #303
dbf1708
@illegalnumbers
refs #303 fixing turbolinks spec error
042047f
@illegalnumbers
fixes #302
9f60d33
@jipiboily
Merge pull request #307 from illegalnumbers/master
7bb860b 
#303 and #302 and a documentation problem
@p12y
Add twitter support
b4bbdbb
@msevestre
Update .travis.yml
c5df49e 
It seems that ruby 1.9.x creates issue with travis. Time to move on
@msevestre
Merge pull request #310 from ptylde/master
8fe4cce 
Add twitter support - Fixes #309
@jipiboily
remove IRC from README has there is no one there anymore
e496d7f
@jipiboily
Update README.md
a684f15
@jipiboily
Revert "Adds ButterCMS sponsorship"
f0a7e81
@jipiboily
Merge pull request #317 from jipiboily/revert-300-patch-1
ca8dc32 
Revert "Adds ButterCMS sponsorship"
@jipiboily
update README with status of the project
e7c787b
@jipiboily
Merge pull request #318 from jipiboily/update-readme
87d7fc2 
update README with status of the project
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.