Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
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: samvit/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
production
158b745
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.
d7b00c6
Richard Xia Added explicit require to text_filter.rb f1de5dd
Commits on Mar 10, 2012
Samvit Ramadurgam article merging works - comments not started yet 2993e71
Samvit Ramadurgam added admin merging exclusivity 45ee776
Samvit Ramadurgam just finished model specs, commenting seemsto be working in the model…
… but is rending wrong in the view
21974c9
Samvit Ramadurgam finished model spec, need to fix errors in controller spec and maybe …
…test views. Actual implementation: everything done except comments dont show up when merged (although they show up in the db
ed345c5
Commits on Mar 16, 2012
Samvit Ramadurgam moved to new controller and changed view - doesnt work 798e8e4
Samvit Ramadurgam have errors but making progress, @article isnt nil anymore 9112d0e
Samvit Ramadurgam merge seems to work with the new refectored code 29776ff
Samvit Ramadurgam doesnt work at allllllllllllllllllllll b8d205b
Samvit Ramadurgam now model test works f3e9e61
Samvit Ramadurgam controllers test pasedd 325af2b
Samvit Ramadurgam working 0ec0fc7
Samvit Ramadurgam done 5ca4207