Skip to content


Subversion checkout URL

You can clone with
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: publify/publify
base: master
head fork: mjsteger/typo
compare: master
Checking mergeability… Don’t worry, you can still create the pull request.
Commits on Feb 26, 2012
Richard Xia Fixed indentation in database.yml.sqlite cde6a7e
Richard Xia Corrected some specs 4b72978
Richard Xia Fixed stubbing of User.salt in specs to remove interfile dependencies c7a9bb9
Richard Xia Removed Gemfile.lock from .gitignore. Added Gemfile.lock 8d2b622
Richard Xia Removed config/database.yml 20bf349
Richard Xia Added database.yml e41feff
Richard Xia Changed database.yml to have postgresql production db 811cb88
Richard Xia Trying to fix Gemfile stuff e768a47
Richard Xia Removed ckeditor from gitignore 303e235
Richard Xia Added hack to easy-ckeditor to prevent it from doing filesystem calls in
Richard Xia Creating a public/files directory 13f37de
Richard Xia Added code to disable file system write 9bf7984
Richard Xia Removed cache option for javascript/stylesheet _include_tag 721a5e4
Richard Xia Added theme stylesheets manually 9ccd594
Richard Xia Added theme images 81050f4
Commits on Feb 27, 2012
Richard Xia Added view partials and helpers from bootstrap into main area acc6ba7
Richard Xia Wrapped theme_helper.rb into a module 41661bd
Richard Xia Reverted to old articles/search.html.erb bb3a075
Richard Xia Fixed categories_controller_spec.rb 6d0a98a
Commits on Mar 09, 2012
@fdv fdv Fixes issue 55: ActionView::Template::Error (settings was supposed to…
… be a Hash, but was a String)

Thank you to Georges Arnould for finding out and fixing.
Richard Xia Added explicit require to text_filter.rb f1de5dd
Commits on Mar 15, 2012
@mjsteger mjsteger got merging to work, though the order might be wrong 6ebc50f
@mjsteger mjsteger solved merging backwards, lol 1b17888
@mjsteger mjsteger Now putting in illegal # for article ID wont cause a 500 b1de1f3
@mjsteger mjsteger non-admins can no longer see the merge button feef07b
@mjsteger mjsteger yay, fixed comments so they go correctly. Wow that was dumb 50b7431
@mjsteger mjsteger Added tests to make sure that merge was properly visible f71b3df
@mjsteger mjsteger Got all the tests in and green...wooo cf08f2a