Update rvmrc to use a non specific build version of ruby
Update rvmrc to use a non specific build version of ruby
Merge branch 'master' of github.com:msevestre/monologue
Update editor from tinymce to ckeditor. This is the first step required to allow image upload
implementation of preview without save in admin.
fixing sporadic failing test - now wait for frame to load. Also changed the driver from the default to use the headless webkit driver. Much fast execution!
Making the layout consistent throughout -- using the twitter-bootstrap class.
remove webkit as a driver for tests and use the default selenium instead to see if it will fix the failing test on Travis CI specifically with Ruby 2.0
trying something different too see if capybara + ruby 2 will work appropriately with frames and page.should
.
Selenium WebDriver does not support Ruby 2 -- failing on Travis CI when switching frames and asserting for content. Comment out code for now since this is a testing tool incompatibility problem.
Merge pull request #146 from jusx/feature-preview-without-save

Implementation of preview without save in admin.
Merge branch 'master', remote-tracking branch 'upstream/master'
Update editor from tinymce to ckeditor. This is the first step required to allow image upload
Merge branch 'ckeditor' of github.com:msevestre/monologue into ckeditor
Remove used of required_tree that is more pain than anything else
Merge pull request #145 from msevestre/ckeditor

Move editor from TimyMCE to CKEditor