Permalink
Browse files

Merge remote branch 'upstream/master' into rails-3.1-new-ui

Conflicts:
	Gemfile
	README.md
	app/assets/javascripts/rails_admin/jquery-ui-1.8.13.min.js
	app/views/layouts/rails_admin/_head.html.haml
	app/views/layouts/rails_admin/_header.html.haml
	app/views/rails_admin/history/show.html.haml
	app/views/rails_admin/main/_delete_notice.html.erb
	app/views/rails_admin/main/_form_colorpicker.html.erb
	app/views/rails_admin/main/_form_datetime.html.erb
	app/views/rails_admin/main/_form_filtering_multiselect.html.erb
	app/views/rails_admin/main/_form_filtering_select.html.erb
	app/views/rails_admin/main/_form_polymorphic_association.html.erb
	app/views/rails_admin/main/_form_text.html.erb
	app/views/rails_admin/main/dashboard.html.haml
	app/views/rails_admin/main/edit.html.haml
	app/views/rails_admin/main/list.html.haml
	config/routes.rb
	rails_admin.gemspec
	spec/requests/config/navigation/rails_admin_config_navigation_spec.rb
	spec/requests/rails_admin_spec.rb
  • Loading branch information...
2 parents 90b8125 + cc2ae99 commit 2278c5f4d10763dd5d5f17ad9030921dc095d4c6 @bbenezech bbenezech committed Jul 25, 2011
Showing with 2,998 additions and 1,629 deletions.
  1. +1 −3 Gemfile
  2. +206 −130 README.md
  3. +18 −12 app/assets/javascripts/rails_admin/application.js
  4. +0 −407 app/assets/javascripts/rails_admin/jquery-ui-1.8.13.min.js
  5. +25 −22 app/assets/javascripts/rails_admin/ra.filter-box.js
  6. +4 −4 app/assets/javascripts/rails_admin/ra.filtering-multiselect.js
  7. +5 −5 app/assets/javascripts/rails_admin/ra.filtering-select.js
  8. +12 −6 app/assets/javascripts/rails_admin/ra.remote-form.js
  9. +8 −8 app/assets/javascripts/rails_admin/ra.timeline.js
  10. +1 −1 app/assets/javascripts/rails_admin/rails_admin.js
  11. +10 −6 app/assets/stylesheets/rails_admin/base.css
  12. +5 −1 app/assets/stylesheets/rails_admin/dashboard.css
  13. +6 −1 app/assets/stylesheets/rails_admin/form.css
  14. +27 −4 app/assets/stylesheets/rails_admin/list.css
  15. +0 −5 app/assets/stylesheets/rails_admin/ra.filtering-multiselect.css
  16. +6 −8 app/assets/stylesheets/rails_admin/ra.filtering-select.css
  17. +5 −4 app/controllers/rails_admin/application_controller.rb
  18. +4 −0 app/controllers/rails_admin/history_controller.rb
  19. +14 −6 app/controllers/rails_admin/main_controller.rb
  20. +23 −3 app/helpers/rails_admin/application_helper.rb
  21. +8 −0 app/models/rails_admin/history.rb
  22. +11 −0 app/views/layouts/rails_admin/_footer.html.haml
  23. +2 −2 app/views/layouts/rails_admin/_header.html.haml
  24. +3 −3 app/views/layouts/rails_admin/_sidebar.html.haml
  25. +2 −2 app/views/layouts/rails_admin/main.html.haml
  26. +5 −5 app/views/rails_admin/history/show.html.haml
  27. +0 −26 app/views/rails_admin/main/_delete_notice.html.erb
  28. +19 −0 app/views/rails_admin/main/_delete_notice.html.haml
  29. +0 −21 app/views/rails_admin/main/_dragonfly_file.html.erb
  30. +11 −0 app/views/rails_admin/main/_dragonfly_file.html.haml
  31. +0 −4 app/views/rails_admin/main/_file_upload.html.erb
  32. +2 −0 app/views/rails_admin/main/_file_upload.html.haml
  33. +0 −30 app/views/rails_admin/main/_form_colorpicker.html.erb
  34. +29 −0 app/views/rails_admin/main/_form_colorpicker.html.haml
  35. +0 −13 app/views/rails_admin/main/_form_datetime.html.erb
  36. +11 −0 app/views/rails_admin/main/_form_datetime.html.haml
  37. +0 −8 app/views/rails_admin/main/_form_enumeration.html.erb
  38. +2 −0 app/views/rails_admin/main/_form_enumeration.html.haml
  39. +0 −8 app/views/rails_admin/main/_form_field.html.erb
  40. +2 −0 app/views/rails_admin/main/_form_field.html.haml
  41. +0 −9 app/views/rails_admin/main/_form_fieldset.html.erb
  42. +9 −0 app/views/rails_admin/main/_form_fieldset.html.haml
  43. +0 −45 app/views/rails_admin/main/_form_filtering_multiselect.html.erb
  44. +43 −0 app/views/rails_admin/main/_form_filtering_multiselect.html.haml
  45. +0 −36 app/views/rails_admin/main/_form_filtering_select.html.erb
  46. +29 −0 app/views/rails_admin/main/_form_filtering_select.html.haml
  47. +0 −45 app/views/rails_admin/main/_form_paperclip_file.html.erb
  48. +12 −0 app/views/rails_admin/main/_form_paperclip_file.html.haml
  49. +0 −53 app/views/rails_admin/main/_form_polymorphic_association.html.erb
  50. +46 −0 app/views/rails_admin/main/_form_polymorphic_association.html.haml
  51. +0 −20 app/views/rails_admin/main/_form_text.html.erb
  52. +15 −0 app/views/rails_admin/main/_form_text.html.haml
  53. +1 −4 app/views/rails_admin/main/_navigation.html.haml
  54. +9 −4 app/views/rails_admin/main/_submit_buttons.html.haml
  55. +2 −3 app/views/rails_admin/main/{authentication_not_setup.html.erb → authentication_not_setup.html.haml}
  56. +1 −2 app/views/rails_admin/main/bulk_delete.html.haml
  57. +34 −33 app/views/rails_admin/main/dashboard.html.haml
  58. +1 −1 app/views/rails_admin/main/delete.html.haml
  59. +6 −6 app/views/rails_admin/main/edit.html.haml
  60. +3 −3 app/views/rails_admin/main/export.html.haml
  61. +61 −57 app/views/rails_admin/main/list.html.haml
  62. +2 −2 app/views/rails_admin/main/new.html.haml
  63. +31 −0 app/views/rails_admin/main/show.html.haml
  64. +4 −0 config/initializers/active_record_extensions.rb
  65. +2 −1 config/initializers/haml.rb
  66. +5 −5 config/locales/devise.fr.yml
  67. +1 −1 config/locales/devise.nb.yml
  68. +1 −1 config/locales/devise.pt-BR.yml
  69. +46 −0 config/locales/devise.ro.yml
  70. +1 −1 config/locales/rails_admin.bg.yml
  71. +1 −1 config/locales/rails_admin.da.yml
  72. +39 −33 config/locales/rails_admin.de.yml
  73. +7 −1 config/locales/rails_admin.en.yml
  74. +7 −2 config/locales/rails_admin.es.yml
  75. +17 −11 config/locales/rails_admin.fi.yml
  76. +16 −10 config/locales/rails_admin.fr.yml
  77. +1 −1 config/locales/rails_admin.lt.yml
  78. +1 −1 config/locales/rails_admin.lv.yml
  79. +1 −1 config/locales/rails_admin.mn.yml
  80. +2 −2 config/locales/rails_admin.nb.yml
  81. +2 −2 config/locales/rails_admin.nl.yml
  82. +1 −1 config/locales/rails_admin.pl.yml
  83. +1 −1 config/locales/rails_admin.pt-BR.yml
  84. +1 −1 config/locales/rails_admin.pt-PT.yml
  85. +107 −0 config/locales/rails_admin.ro.yml
  86. +1 −1 config/locales/rails_admin.ru.yml
  87. +1 −1 config/locales/rails_admin.sv.yml
  88. +2 −2 config/locales/rails_admin.tr.yml
  89. +1 −1 config/locales/rails_admin.uk.yml
  90. +1 −1 config/locales/rails_admin.zh_cn.yml
  91. +19 −15 config/routes.rb
  92. +1 −3 lib/generators/rails_admin/install_migrations_generator.rb
  93. +4 −4 lib/generators/rails_admin/templates/migration.rb
  94. +0 −9 lib/generators/rails_admin/templates/rename.rb
  95. +50 −126 lib/rails_admin.rb
  96. +1 −1 lib/rails_admin/abstract_history.rb
  97. +1 −1 lib/rails_admin/adapters/active_record.rb
  98. +258 −91 lib/rails_admin/config.rb
  99. +13 −1 lib/rails_admin/config/base.rb
  100. +11 −0 lib/rails_admin/config/fields/association.rb
  101. +12 −2 lib/rails_admin/config/fields/base.rb
  102. +0 −9 lib/rails_admin/config/fields/types/belongs_to_association.rb
  103. +1 −1 lib/rails_admin/config/fields/types/datetime.rb
  104. +1 −1 lib/rails_admin/config/fields/types/enum.rb
  105. +2 −2 lib/rails_admin/config/fields/types/has_many_association.rb
  106. +10 −0 lib/rails_admin/config/fields/types/has_one_association.rb
  107. +17 −0 lib/rails_admin/config/fields/types/paperclip_file.rb
  108. +4 −0 lib/rails_admin/config/fields/types/password.rb
  109. +1 −1 lib/rails_admin/config/fields/types/polymorphic_association.rb
  110. +4 −2 lib/rails_admin/config/model.rb
  111. +1 −0 lib/rails_admin/config/sections.rb
  112. +13 −3 lib/rails_admin/config/sections/export.rb
  113. +12 −5 lib/rails_admin/config/sections/list.rb
  114. +50 −0 lib/rails_admin/config/sections/show.rb
  115. +2 −28 lib/rails_admin/config/sections/update.rb
  116. +12 −0 lib/rails_admin/engine.rb
  117. +3 −3 lib/rails_admin/extensions/cancan/authorization_adapter.rb
  118. +2 −3 lib/rails_admin/support/csv_converter.rb
  119. +789 −0 public/javascripts/rails_admin/jquery-ui-1.8.14.min.js
  120. +42 −0 public/stylesheets/rails_admin/show.css
  121. +10 −19 public/stylesheets/rails_admin/theme/base.css
  122. BIN public/stylesheets/rails_admin/theme/images/ui-bg_flat_0_dddddd_40x100.png
  123. BIN public/stylesheets/rails_admin/theme/images/ui-bg_flat_0_e6e6e6_40x100.png
  124. BIN public/stylesheets/rails_admin/theme/images/ui-bg_flat_0_ffffff_40x100.png
  125. BIN public/stylesheets/rails_admin/theme/images/ui-bg_flat_100_f8f8f7_40x100.png
  126. BIN public/stylesheets/rails_admin/theme/images/ui-bg_flat_20_e6e6e6_40x100.png
  127. BIN public/stylesheets/rails_admin/theme/images/ui-bg_flat_50_aaaaaa_40x100.png
  128. BIN public/stylesheets/rails_admin/theme/images/ui-bg_highlight-hard_100_eaeaea_1x100.png
  129. BIN public/stylesheets/rails_admin/theme/images/ui-bg_highlight-hard_100_f8f8f7_1x100.png
  130. BIN public/stylesheets/rails_admin/theme/images/ui-bg_highlight-hard_100_fafafa_1x100.png
  131. BIN .../stylesheets/rails_admin/theme/images/{ui-icons_454545_256x240.png → ui-icons_333333_256x240.png}
  132. BIN public/stylesheets/rails_admin/theme/images/ui-icons_aaaaaa_256x240.png
  133. BIN public/stylesheets/rails_admin/theme/images/ui-icons_acaca0_256x240.png
  134. +50 −49 public/stylesheets/rails_admin/theme/jquery-ui.css
  135. +5 −2 rails_admin.gemspec
  136. +9 −0 spec/controllers/application_controller_spec.rb
  137. +8 −0 spec/dummy_app/app/models/ball.rb
  138. +12 −0 spec/dummy_app/db/migrate/20110714095433_create_balls.rb
  139. +12 −8 spec/factories.rb
  140. +2 −4 spec/generators/install_migrations_generator_spec.rb
  141. +17 −24 spec/lib/rails_admin_spec.rb
  142. +14 −0 spec/models/rails_admin/history_spec.rb
  143. +14 −2 spec/requests/basic/edit/rails_admin_basic_edit_spec.rb
  144. +17 −4 spec/requests/basic/list/rails_admin_basic_list_spec.rb
  145. +10 −2 spec/requests/basic/new/rails_admin_basic_new_spec.rb
  146. +83 −0 spec/requests/basic/show/rails_admin_basic_show_spec.rb
  147. +17 −0 spec/requests/basic/update/rails_admin_basic_update_spec.rb
  148. +9 −9 spec/requests/config/navigation/rails_admin_config_navigation_spec.rb
  149. +20 −0 spec/requests/config/rails_admin_config_spec.rb
  150. +275 −0 spec/requests/config/show/rails_admin_config_show_spec.rb
  151. +4 −9 spec/requests/history/rails_admin_history_spec.rb
  152. +9 −21 spec/requests/rails_admin_spec.rb
  153. +3 −1 spec/spec_helper.rb
View
@@ -32,12 +32,10 @@ group :development, :test do
end
gem 'cancan' if ENV['AUTHORIZATION_ADAPTER'] == 'cancan'
- gem 'factory_girl', '2.0.0.beta2'
- gem 'generator_spec'
platform :mri_18 do
gem 'ruby-debug'
- gem 'linecache', '0.43' # tmp lock, 0.45 is buggy
+ gem 'linecache'
end
platform :mri_19 do
Oops, something went wrong.

0 comments on commit 2278c5f

Please sign in to comment.