Permalink
Browse files

Merging in latest version of typo

  • Loading branch information...
2 parents f1de5dd + b63ec3a commit 83614295e896dd2ddf86764c52aaf6f7de64a57a @jeady jeady committed Jun 14, 2012
Showing with 1,399 additions and 630 deletions.
  1. +0 −2 .bundle/config
  2. +2 −0 .gitignore
  3. +854 −59 CHANGELOG
  4. +8 −8 Gemfile
  5. +51 −53 README.textile
  6. +2 −20 app/controllers/admin/content_controller.rb
  7. +0 −18 app/controllers/admin/pages_controller.rb
  8. +0 −46 app/controllers/admin/themes_controller.rb
  9. +9 −9 app/models/article.rb
  10. +3 −7 app/models/category.rb
  11. +19 −1 app/models/content.rb
  12. +9 −7 app/models/page.rb
  13. +1 −2 app/models/post_type.rb
  14. +0 −22 app/models/sanitizable.rb
  15. +7 −0 app/views/admin/categories/new.html.erb
  16. +1 −2 app/views/admin/dashboard/_overview.html.erb
  17. +1 −1 app/views/admin/feedback/_button.html.erb
  18. +2 −2 app/views/admin/redirects/new.html.erb
  19. +0 −26 app/views/admin/themes/catalogue.html.erb
  20. +0 −5 app/views/admin/themes/index.html.erb
  21. +0 −1 app/views/layouts/administration.html.erb
  22. +19 −29 config/initializers/access_rules.rb
  23. +5 −0 db/migrate/103_really_update_existing_articles_with_nil_or_empty_post_type.rb
  24. +1 −1 doc/typo.gemspec
  25. +245 −220 lang/fr_FR.rb
  26. +35 −35 lang/nl_NL.rb
  27. +1 −1 lib/tasks/release.rake
  28. +19 −0 lib/transforms.rb
  29. +2 −2 lib/typo_version.rb
  30. +1 −1 public/javascripts/ckcustom.js
  31. +1 −1 spec/controllers/accounts_controller_spec.rb
  32. +3 −3 spec/controllers/admin/content_controller_spec.rb
  33. +0 −11 spec/controllers/admin/pages_controller_spec.rb
  34. +2 −2 spec/controllers/backend_controller_spec.rb
  35. +6 −0 spec/lib/transforms_spec.rb
  36. +31 −5 spec/models/article_spec.rb
  37. +13 −0 spec/models/category_spec.rb
  38. +44 −11 spec/models/page_spec.rb
  39. +0 −16 spec/models/sanitizable_spec.rb
  40. +2 −1 vendor/plugins/easy-ckeditor/app/controllers/ckeditor_controller.rb
View
@@ -1,2 +0,0 @@
----
-BUNDLE_WITHOUT: adapters
View
@@ -21,3 +21,5 @@ tmp/*
nbproject
public/cache/*
.rbenv-version
+bin/
+.bundle/
Oops, something went wrong.

0 comments on commit 8361429

Please sign in to comment.