Permalink
Browse files

Merge branch 'master' into wymeditor

  • Loading branch information...
2 parents 3f54d56 + 8285ecc commit 611d125dfdfac54e348cebee93992d654444bdc7 @parndt parndt committed Sep 22, 2011
Showing with 1,140 additions and 1,117 deletions.
  1. +4 −0 .gitignore
  2. +8 −5 .travis.yml
  3. +2 −0 Gemfile
  4. +48 −47 Gemfile.lock
  5. +1 −1 authentication/config/locales/bg.yml
  6. +4 −6 authentication/config/routes.rb
  7. +0 −4 authentication/lib/authenticated_system.rb
  8. +1 −1 authentication/refinerycms-authentication.gemspec
  9. +1 −1 base/refinerycms-base.gemspec
  10. +1 −1 bin/refinerycms
  11. +4 −166 core/app/assets/javascripts/refinery/admin.js
  12. +13 −0 core/app/assets/javascripts/refinery/ajaxy_pagination.js.coffee
  13. +64 −0 core/app/assets/javascripts/refinery/interface.js.coffee
  14. +142 −0 core/app/assets/javascripts/refinery/modal_dialogs.js
  15. +4 −0 core/app/assets/javascripts/refinery/refinery.js
  16. +21 −0 core/app/assets/javascripts/refinery/sortable_menu.js.coffee
  17. +8 −0 core/app/assets/javascripts/refinery/submit_continue.js.coffee
  18. +358 −430 core/app/assets/stylesheets/refinery/refinery.css.scss
  19. +54 −55 core/app/assets/stylesheets/refinery/site_bar.css.scss
  20. +23 −21 core/app/assets/stylesheets/refinery/submenu.css.scss
  21. +23 −23 core/app/assets/stylesheets/refinery/tooltips.css.scss
  22. +50 −54 core/app/assets/stylesheets/refinery/ui.css.scss
  23. +1 −0 core/app/views/refinery/_head.html.erb
  24. +1 −1 core/app/views/refinery/admin/_menu.html.erb
  25. +14 −14 core/config/locales/ru.yml
  26. +1 −1 core/lib/gemspec.rb
  27. +17 −9 core/lib/generators/cms_generator.rb
  28. 0 core/lib/generators/templates/app/decorators/controllers/refinery/.gitkeep
  29. 0 core/lib/generators/templates/app/decorators/models/refinery/.gitkeep
  30. +19 −24 core/lib/refinery/application_controller.rb
  31. +90 −0 core/lib/refinery/core/engine.rb
  32. +1 −72 core/lib/refinerycms-core.rb
  33. +1 −1 core/lib/tasks/refinery.rake
  34. +0 −57 core/public/javascripts/wymeditor/lang/bg.js
  35. +16 −6 core/refinerycms-core.gemspec
  36. +49 −0 core/spec/lib/generators/cms_generator_spec.rb
  37. +1 −1 dashboard/refinerycms-dashboard.gemspec
  38. +1 −1 doc/engines.md
  39. +44 −0 doc/guides/4 - Customising your Design/3 - How to override Javascripts.textile
  40. +1 −1 doc/guides/7 - Hosting/2 - How to use Amazon S3 for storage.textile
  41. +6 −0 doc/settings.md
  42. +2 −2 images/config/locales/bg.yml
  43. +1 −1 images/lib/refinerycms-images.rb
  44. +1 −1 images/refinerycms-images.gemspec
  45. +0 −2 lib/refinery/generators/engine/templates/db/migrate/create_plural_name.rb
  46. +2 −9 pages/app/models/refinery/page.rb
  47. +0 −3 pages/config/locales/bg.yml
  48. +0 −3 pages/config/locales/cs.yml
  49. +0 −3 pages/config/locales/da.yml
  50. +0 −3 pages/config/locales/de.yml
  51. +0 −3 pages/config/locales/el.yml
  52. +0 −3 pages/config/locales/en.yml
  53. +0 −3 pages/config/locales/es.yml
  54. +0 −3 pages/config/locales/fi.yml
  55. +0 −3 pages/config/locales/fr.yml
  56. +0 −4 pages/config/locales/it.yml
  57. +0 −3 pages/config/locales/ja.yml
  58. +0 −3 pages/config/locales/ko.yml
  59. +0 −3 pages/config/locales/lolcat.yml
  60. +0 −3 pages/config/locales/lt.yml
  61. +0 −3 pages/config/locales/lv.yml
  62. +0 −3 pages/config/locales/nb.yml
  63. +0 −3 pages/config/locales/nl.yml
  64. +0 −3 pages/config/locales/pl.yml
  65. +0 −3 pages/config/locales/pt-BR.yml
  66. +0 −3 pages/config/locales/rs.yml
  67. +2 −4 pages/config/locales/ru.yml
  68. +0 −3 pages/config/locales/sk.yml
  69. +0 −3 pages/config/locales/sl.yml
  70. +0 −3 pages/config/locales/sv.yml
  71. +0 −3 pages/config/locales/vi.yml
  72. +0 −3 pages/config/locales/zh-CN.yml
  73. +0 −3 pages/config/locales/zh-TW.yml
  74. +1 −1 pages/refinerycms-pages.gemspec
  75. +1 −0 readme.md
  76. +1 −1 refinerycms.gemspec
  77. +1 −1 resources/refinerycms-resources.gemspec
  78. +1 −1 settings/refinerycms-settings.gemspec
  79. +2 −2 testing/lib/generators/files/spec/support/refinery.rb
  80. +1 −1 testing/refinerycms-testing.gemspec
  81. +13 −6 wymeditor/app/assets/javascripts/wymeditor/jquery.refinery.wymeditor.js
  82. +14 −3 wymeditor/app/assets/javascripts/wymeditor/lang/ru.js
View
@@ -50,6 +50,7 @@ nbproject
# Rubinius
*.rbc
+*.rbx
# Vim
*.swp
@@ -75,6 +76,9 @@ capybara-*html
.rvmrc
.rvmrc.*
+#Sprockets
+public/assets
+
# REFINERY CMS DEVELOPMENT ====================================================
# Always keep this section at the bottom.
View
@@ -1,17 +1,20 @@
-before_script: "sh -e /etc/init.d/xvfb start"
-script: "DISPLAY=:99.0 bundle exec rake db:create db:migrate spec"
+before_script:
+ - "ruby --version"
+ - "sh -e /etc/init.d/xvfb start"
+ - "bundle exec rake db:create db:migrate"
+script: "DISPLAY=:99.0 bundle exec rspec ./**/spec"
notifications:
email:
- parndt@gmail.com
- ugis.ozolss@gmail.com
irc:
- - irc.freenode.org#refinerycms
+ - "irc.freenode.org#refinerycms"
env:
- DB=postgres
- DB=mysql
rvm:
- 1.8.7
- 1.9.2
- 1.9.3
- - rbx-2.0
- - jruby
+ - rbx
+# - jruby
View
@@ -26,6 +26,8 @@ gemspec
# REFINERY CMS DEVELOPMENT ====================================================
+gem "rails", "= 3.1.1.rc1"
+
group :development, :test do
gem 'refinerycms-testing', '~> 2.0.0'
gem 'rcov', :platform => :mri_18
View
@@ -31,7 +31,7 @@ PATH
friendly_id_globalize3 (~> 3.2.1)
globalize3 (~> 0.2.0.beta3)
jquery-rails
- rails (~> 3.1.0)
+ rails (>= 3.1.1.rc1)
refinerycms-base (= 2.0.0)
refinerycms-settings (= 2.0.0)
sass-rails (~> 3.1.0)
@@ -145,12 +145,12 @@ PATH
GEM
remote: http://rubygems.org/
specs:
- actionmailer (3.1.0)
- actionpack (= 3.1.0)
+ actionmailer (3.1.1.rc1)
+ actionpack (= 3.1.1.rc1)
mail (~> 2.3.0)
- actionpack (3.1.0)
- activemodel (= 3.1.0)
- activesupport (= 3.1.0)
+ actionpack (3.1.1.rc1)
+ activemodel (= 3.1.1.rc1)
+ activesupport (= 3.1.1.rc1)
builder (~> 3.0.0)
erubis (~> 2.7.0)
i18n (~> 0.6)
@@ -159,28 +159,27 @@ GEM
rack-mount (~> 0.8.2)
rack-test (~> 0.6.1)
sprockets (~> 2.0.0)
- activemodel (3.1.0)
- activesupport (= 3.1.0)
- bcrypt-ruby (~> 3.0.0)
+ activemodel (3.1.1.rc1)
+ activesupport (= 3.1.1.rc1)
builder (~> 3.0.0)
i18n (~> 0.6)
- activerecord (3.1.0)
- activemodel (= 3.1.0)
- activesupport (= 3.1.0)
+ activerecord (3.1.1.rc1)
+ activemodel (= 3.1.1.rc1)
+ activesupport (= 3.1.1.rc1)
arel (~> 2.2.1)
tzinfo (~> 0.3.29)
- activeresource (3.1.0)
- activemodel (= 3.1.0)
- activesupport (= 3.1.0)
- activesupport (3.1.0)
+ activeresource (3.1.1.rc1)
+ activemodel (= 3.1.1.rc1)
+ activesupport (= 3.1.1.rc1)
+ activesupport (3.1.1.rc1)
multi_json (~> 1.0)
acts_as_indexed (0.7.3)
addressable (2.2.6)
arel (2.2.1)
awesome_nested_set (2.0.2)
activerecord (>= 3.0.0)
babosa (0.3.5)
- bcrypt-ruby (3.0.0)
+ bcrypt-ruby (3.0.1)
builder (3.0.0)
capybara (1.0.1)
mime-types (>= 1.16)
@@ -193,23 +192,23 @@ GEM
capybara (~> 1.0.0)
childprocess (0.2.2)
ffi (~> 1.0.6)
- coffee-rails (3.1.0)
+ coffee-rails (3.1.1)
coffee-script (>= 2.2.0)
- railties (~> 3.1.0.rc1)
+ railties (~> 3.1.0)
coffee-script (2.2.0)
coffee-script-source
execjs
coffee-script-source (1.1.2)
database_cleaner (0.6.7)
- devise (1.4.5)
+ devise (1.4.6)
bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.0.3)
warden (~> 1.0.3)
diff-lcs (1.1.3)
dragonfly (0.9.8)
rack
erubis (2.7.0)
- execjs (1.2.4)
+ execjs (1.2.7)
multi_json (~> 1.0)
factory_girl (2.1.0)
factory_girl_rails (1.2.0)
@@ -223,16 +222,16 @@ GEM
rspec-instafail (~> 0.1.8)
ruby-progressbar (~> 0.0.10)
generator_spec (0.8.4)
- rails (< 4.0, >= 3.0)
+ rails (>= 3.0, < 4.0)
rspec-rails
- globalize3 (0.2.0.beta3)
+ globalize3 (0.2.0.beta4)
activemodel (>= 3.0.0)
activerecord (>= 3.0.0)
paper_trail (~> 2)
growl (1.0.3)
- guard (0.6.3)
+ guard (0.7.0)
thor (~> 0.14.6)
- guard-rspec (0.4.4)
+ guard-rspec (0.4.5)
guard (>= 0.4.0)
guard-spork (0.2.1)
guard (>= 0.2.2)
@@ -242,8 +241,7 @@ GEM
jquery-rails (1.0.14)
railties (~> 3.0)
thor (~> 0.14)
- json_pure (1.5.4)
- spruz (~> 0.2.8)
+ json_pure (1.6.1)
launchy (2.0.5)
addressable (~> 2.2.6)
mail (2.3.0)
@@ -255,10 +253,10 @@ GEM
mysql2 (0.3.7)
nokogiri (1.5.0)
orm_adapter (0.0.5)
- paper_trail (2.3.2)
+ paper_trail (2.3.3)
rails (~> 3)
polyglot (0.3.2)
- rack (1.3.2)
+ rack (1.3.3)
rack-cache (1.0.3)
rack (>= 0.4)
rack-mount (0.8.3)
@@ -267,17 +265,17 @@ GEM
rack
rack-test (0.6.1)
rack (>= 1.0)
- rails (3.1.0)
- actionmailer (= 3.1.0)
- actionpack (= 3.1.0)
- activerecord (= 3.1.0)
- activeresource (= 3.1.0)
- activesupport (= 3.1.0)
+ rails (3.1.1.rc1)
+ actionmailer (= 3.1.1.rc1)
+ actionpack (= 3.1.1.rc1)
+ activerecord (= 3.1.1.rc1)
+ activeresource (= 3.1.1.rc1)
+ activesupport (= 3.1.1.rc1)
bundler (~> 1.0)
- railties (= 3.1.0)
- railties (3.1.0)
- actionpack (= 3.1.0)
- activesupport (= 3.1.0)
+ railties (= 3.1.1.rc1)
+ railties (3.1.1.rc1)
+ actionpack (= 3.1.1.rc1)
+ activesupport (= 3.1.1.rc1)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
@@ -305,26 +303,28 @@ GEM
ruby-progressbar (0.0.10)
rubyzip (0.9.4)
sass (3.1.7)
- sass-rails (3.1.0)
+ sass-rails (3.1.2)
actionpack (~> 3.1.0)
railties (~> 3.1.0)
sass (>= 3.1.4)
- selenium-webdriver (2.5.0)
+ sprockets (~> 2.0.0)
+ tilt (~> 1.3.2)
+ selenium-webdriver (2.6.0)
childprocess (>= 0.2.1)
ffi (>= 1.0.7)
json_pure
rubyzip
seo_meta (1.2.0.rc2)
rails (>= 3.0.0)
- simplecov (0.5.0)
- simplecov-html (~> 0.5.0)
- simplecov-html (0.5.0)
+ simplecov (0.5.3)
+ multi_json (~> 1.0.3)
+ simplecov-html (~> 0.5.3)
+ simplecov-html (0.5.3)
spork (0.9.0.rc9)
sprockets (2.0.0)
hike (~> 1.2)
rack (~> 1.0)
- tilt (!= 1.3.0, ~> 1.1)
- spruz (0.2.13)
+ tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.4)
thor (0.14.6)
tilt (1.3.3)
@@ -338,7 +338,7 @@ GEM
multi_json (>= 1.0.2)
warden (1.0.5)
rack (>= 1.0)
- will_paginate (3.0.0)
+ will_paginate (3.0.1)
xpath (0.1.4)
nokogiri (~> 1.3)
@@ -353,6 +353,7 @@ DEPENDENCIES
guard-spork
jquery-rails
mysql2
+ rails (= 3.1.1.rc1)
rb-fchange (~> 0.0.5)
rb-fsevent (>= 0.3.9)
rb-notifu (~> 0.0.4)
@@ -70,4 +70,4 @@ bg:
password: Парола
password_confirmation: Потвърждение на паролата
email: Е-поща
- remember_me: Запомняне данните за вход
+ remember_me: Запомняне на данните за вход
@@ -3,8 +3,8 @@
# Add Devise necessary routes.
# For Devise routes, see: https://github.com/plataformatec/devise
scope(:module => 'refinery') do
- devise_for :'refinery/users', :class_name => "::Refinery::User", :module => 'refinery', :controllers => {
- :registrations => 'refinery/users'
+ devise_for :refinery_user, :class_name => "::Refinery::User", :path => "refinery/users", :module => 'refinery', :controllers => {
+ :registrations => 'refinery/users',
},
:skip => [:registrations],
:path_names => {
@@ -28,9 +28,7 @@
end
# Override Devise's other routes for convenience methods.
- #get 'refinery/login', :to => "sessions#new", :as => :new_user_session
- #get 'refinery/login', :to => "sessions#new", :as => :refinery_login
- #get 'refinery/logout', :to => "sessions#destroy", :as => :destroy_user_session
- #get 'refinery/logout', :to => "sessions#destroy", :as => :logout
+ get 'refinery/login', :to => "sessions#new", :as => :refinery_login
+ get 'refinery/logout', :to => "sessions#destroy", :as => :refinery_logout
end
@@ -35,10 +35,6 @@ def refinery_user?
refinery_user_signed_in? && current_refinery_user.has_role?(:refinery)
end
- def current_user
- current_refinery_user
- end
-
protected :store_location, :redirect_back_or_default, :refinery_user?
def self.included(base)
@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
s.version = %q{2.0.0}
s.summary = %q{Authentication engine for Refinery CMS}
s.description = %q{The default authentication engine for Refinery CMS}
- s.date = %q{2011-09-10}
+ s.date = %q{2011-09-15}
s.email = %q{info@refinerycms.com}
s.homepage = %q{http://refinerycms.com}
s.rubyforge_project = %q{refinerycms}
@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
s.version = %q{2.0.0}
s.summary = %q{Base engine for Refinery CMS}
s.description = %q{This provides a base for Refinery CMS which handles things like settings on the Refinery namespace.}
- s.date = %q{2011-09-10}
+ s.date = %q{2011-09-15}
s.email = %q{info@refinerycms.com}
s.homepage = %q{http://refinerycms.com}
s.rubyforge_project = %q{refinerycms}
View
@@ -271,7 +271,7 @@ module Refinery
find_and_replace('config/database.yml', %r{password:}, '#password:')
else
find_and_replace('config/database.yml', %r{username:.*}, "username: #{@options[:database][:username]}")
- find_and_replace('config/database.yml', %r{password:.*}, "password: #{@options[:database][:password]}")
+ find_and_replace('config/database.yml', %r{password:.*}, "password: \"#{@options[:database][:password]}\"")
end
puts "\n---------"
Oops, something went wrong.

0 comments on commit 611d125

Please sign in to comment.