Skip to content

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.
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 Jun 14, 2012
@jeady jeady Merging in latest version of typo 8361429
Commits on Jun 16, 2012
@jeady jeady Adding cucumber support to typo ac8b263
Commits on Jun 20, 2012
@jeady jeady Adding cucumber starter features 7cf7345
@jeady jeady Spruced up the create blog feature a bit 1241c05
Richard Xia Merge pull request #1 from jeady/master
Update Typo to latest version, enable cucumber
Commits on Jul 22, 2012
@jeady jeady Merging latest version of typo c95ea13
Commits on Aug 02, 2012
@jeady jeady Finished incomplete fdv/typo merge eb2362a
Commits on Aug 09, 2012
Richard Xia Merge pull request #2 from jeady/master
Add cucumber starter features, merge in fdv/typo
Commits on Sep 13, 2012
@jeady jeady Bundle thin gem to enable thin instead of WEBrick on Heroku. This wil…
…l allow Typo to run on Heroku Cedar.
@jeady jeady Disable production caching. Necessary for Heroku Cedar compatibility. 2e29b1a
Commits on Sep 22, 2012
@jeady jeady Updated seeds.rb to fix bug with Cucumber incorrectly loading the Art…
…icle model.
@jeady jeady Fix to prevent some of cucumber's whining. 8d3a53a
@jeady jeady Update Gemfile.lock 1afcc37
@jeady jeady Silence some warnings appearing in rspec 0759b4f
@jeady jeady Fixing failing rspec test. a7f3d67
@jeady jeady Adding fix to complain rspec from whining. 6072eb4
Commits on Sep 23, 2012
@jeady jeady Fixing admin article list formatting issues in chrome. acd9cad
Commits on Oct 09, 2012
Richard Xia Merge pull request #3 from jeady/master
Update Typo with various bug fixes
Commits on Oct 15, 2012
@jeady jeady Fixing crash bug when you follow the 'Your posts' link from the admin
@jeady jeady Shut up Rails from whining about not being able to log to Heroku's
Richard Xia Merge pull request #4 from jeady/master
Fix 2 non-critical areas of confusion for students
Commits on Aug 15, 2013
@tansaku tansaku updating Gemfile to use https for rubygems source 3a18f58
@tansaku tansaku updating Gemfile to use ruby 1.9.2 2cb9432
@tansaku tansaku Merge pull request #8 from tansaku/master
Adjusting Gemfile to specify https for rubygems and 1.9.2 for ruby
Commits on Aug 16, 2013
saasbook Modify seeds.rb for Heroku empty? error 4ce9dba
@tansaku tansaku Merge pull request #9 from msmithnova/upstream
Modify seeds.rb for Heroku empty? error
Commits on Nov 13, 2013
@tansaku tansaku Update Gemfile 62aedda
Commits on Jun 12, 2014
@tansaku tansaku adjusting confirmation message to help avoid people losing password 756985c
@tansaku tansaku doh, forgot the slash 88482ed
Commits on Jan 22, 2016
@jmorcate jmorcate Update new.html.erb 11e07af
Commits on Feb 02, 2016
@tansaku tansaku Merge pull request #20 from jmorcate/#111826889
Update new.html.erb