Permalink
Browse files

Merge branch 'master' into 1005-exclude-timedout-flash

  • Loading branch information...
gregbell committed Nov 8, 2012
2 parents 4497559 + ef31932 commit 2baa11bb31eec4a6a46510bb44d5fa4c794c4510
Showing 334 changed files with 11,986 additions and 3,467 deletions.
View
@@ -12,6 +12,8 @@ tmtags
## VIM
*.swp
+# IDEA / RUBYMINE
+.idea
## PROJECT::GENERAL
tags
@@ -34,3 +36,4 @@ public
.rvmrc
.rspec
.rails-version
+.rbenv-version
View
@@ -1,7 +1,12 @@
-script: bundle exec rake
+script: bundle exec rake test
rvm:
- ree
- 1.9.2
+ - 1.9.3
before_install:
- gem update --system
- gem --version
+env:
+ - RAILS=3.0.12
+ - RAILS=3.1.4
+ - RAILS=3.2.3
View
@@ -1,5 +1,90 @@
## Master (unreleased)
+## 0.5.0
+
+### Enhancements
+
+* Created new view components (Footer, TitleBar, Header, UtilityNav) to more
+ easily customize the views in Active Admin and per namespace. (@gregbell)
+* All CSS is now encapsulated under the `body.active_admin` class. This may
+ change the precedence of styles that you created to override or use in
+ other areas of your application.
+* Dashboards are now implemented as pages. For more details of how to configure
+ a page, checkout http://activeadmin.info/docs/9-custom-pages.html
+* Root route can be set to any controller#action using `#root_to`.
+* Batch Actions allows you to select entries on index page and perform
+ an action against them.
+* CSV separators are configurable.
+* Lot of bug fixes.
+
+### Deprecations
+
+* Removed all references to ActiveAdmin::Renderer. If you were using these
+ please update code to use an Arbre component. Removed
+ `ActiveAdmin:Views::HeaderRender` and replaced with
+ `ActiveAdmin::Views::Header` component.
+* ActiveAdmin::Menu and ActiveAdmin::MenuItem API has changed. If you were
+ creating custom menu items, the builder syntax has changed to. Menu#add now
+ accepts a MenuItem, instead of building the menu item for you.
+* `ActiveAdmin::Dashboards.build` is deprecated in favour of generating a page
+ and using the new `config.root_to` option.
+* Arbre is now a gem on its own.
+
+### Contributions
+
+561 commits (142 Pull Requests) by 88 contributors.
+
+## 0.4.4
+
+### Dependencies
+
+* Use `formtastic` ~> 2.1.1 until AA 0.5.0 is released
+* Use `inherited_resources` >= 1.3.1 (ensure flash messages work)
+
+## 0.4.3
+
+### Bug Fixes
+
+* [#1063][]: Fix comment issues when using postgres ([@jancel][])
+
+## 0.4.2
+
+### Enhancements
+
+* [#822][]: Automatically include js and css to precompile list ([@jschwindt][])
+* [#1033][]: Site title accepts a proc that is rendered in the context
+ of the view ([@pcreux][])
+* [#70][]: Form blocks are now rendered within the context of the view ([@gregbell][])
+* [#70][]: Filter's collections are now eval'd in the context of the view ([@gregbell][])
+* [#1032][]: The html body now includes a class for the namespace name ([@mattvague][])
+* [#1013][]: Hide the count from one specific scope using `:show_count => false`
+ ([@latortuga][])
+* [#1023][]: Add localization support for comments ([@MoritzMoritz][])
+
+### Bug Fixes
+
+* [#34][]: Comments now work with models using string ids ([@jancel][])
+* [#1041][]: When `table_for` collection is empty it no longer outputs
+ a blank array in Ruby 1.9 ([@jancel][], [#1016][])
+* [#983][]: Fixed compatibility with pry-rails ([@pcreux][])
+* [#409][]: Install generator handles custom class names for user ([@gregbell][])
+
+### Contributors
+
+42 Commits by 10 authors
+
+* Allen Huang
+* Daniel Lepage
+* Thibaut Barrère
+* Drew Ulmer
+* Juan Schwindt
+* Moritz Behr
+* Jeff Ancel
+* Matt Vague
+* Greg Bell
+* Philippe Creux
+
+
## 0.4.1
### Enhancements
@@ -421,13 +506,15 @@ of the highlights. 250 commits. Enough said.
[#28]: https://github.com/gregbell/active_admin/issues/28
[#31]: https://github.com/gregbell/active_admin/issues/31
[#32]: https://github.com/gregbell/active_admin/issues/32
+[#34]: https://github.com/gregbell/active_admin/issues/34
[#38]: https://github.com/gregbell/active_admin/issues/38
[#42]: https://github.com/gregbell/active_admin/issues/42
[#45]: https://github.com/gregbell/active_admin/issues/45
[#48]: https://github.com/gregbell/active_admin/issues/48
[#52]: https://github.com/gregbell/active_admin/issues/52
[#55]: https://github.com/gregbell/active_admin/issues/55
[#69]: https://github.com/gregbell/active_admin/issues/69
+[#70]: https://github.com/gregbell/active_admin/issues/70
[#77]: https://github.com/gregbell/active_admin/issues/77
[#92]: https://github.com/gregbell/active_admin/issues/92
[#95]: https://github.com/gregbell/active_admin/issues/95
@@ -450,6 +537,7 @@ of the highlights. 250 commits. Enough said.
[#332]: https://github.com/gregbell/active_admin/issues/332
[#369]: https://github.com/gregbell/active_admin/issues/369
[#381]: https://github.com/gregbell/active_admin/issues/381
+[#409]: https://github.com/gregbell/active_admin/issues/409
[#428]: https://github.com/gregbell/active_admin/issues/428
[#468]: https://github.com/gregbell/active_admin/issues/468
[#470]: https://github.com/gregbell/active_admin/issues/470
@@ -474,17 +562,27 @@ of the highlights. 250 commits. Enough said.
[#751]: https://github.com/gregbell/active_admin/issues/751
[#758]: https://github.com/gregbell/active_admin/issues/758
[#780]: https://github.com/gregbell/active_admin/issues/780
+[#822]: https://github.com/gregbell/active_admin/issues/822
[#865]: https://github.com/gregbell/active_admin/issues/865
[#869]: https://github.com/gregbell/active_admin/issues/869
[#897]: https://github.com/gregbell/active_admin/issues/897
[#931]: https://github.com/gregbell/active_admin/issues/931
[#960]: https://github.com/gregbell/active_admin/issues/960
[#971]: https://github.com/gregbell/active_admin/issues/971
[#978]: https://github.com/gregbell/active_admin/issues/978
+[#983]: https://github.com/gregbell/active_admin/issues/983
[#993]: https://github.com/gregbell/active_admin/issues/993
[#994]: https://github.com/gregbell/active_admin/issues/994
+[#1013]: https://github.com/gregbell/active_admin/issues/1013
+[#1016]: https://github.com/gregbell/active_admin/issues/1016
+[#1023]: https://github.com/gregbell/active_admin/issues/1023
+[#1032]: https://github.com/gregbell/active_admin/issues/1032
+[#1033]: https://github.com/gregbell/active_admin/issues/1033
+[#1041]: https://github.com/gregbell/active_admin/issues/1041
+[#1063]: https://github.com/gregbell/active_admin/issues/1063
[@BoboFraggins]: https://github.com/BoboFraggins
[@DMajrekar]: https://github.com/DMajrekar
+[@MoritzMoritz]: https://github.com/MoritzMoritz
[@ZequeZ]: https://github.com/ZequeZ
[@bobbytables]: https://github.com/bobbytables
[@comboy]: https://github.com/comboy
@@ -499,7 +597,9 @@ of the highlights. 250 commits. Enough said.
[@ggilder]: https://github.com/ggilder
[@gregbell]: https://github.com/gregbell
[@j]: https://github.com/j
+[@jancel]: https://github.com/jancel
[@jbarket]: https://github.com/jbarket
+[@jschwindt]: https://github.com/jschwindt
[@knoopx]: https://github.com/knoopx
[@krug]: https://github.com/krug
[@latortuga]: https://github.com/latortuga
@@ -517,4 +617,4 @@ of the highlights. 250 commits. Enough said.
[@tricknotes]: https://github.com/tricknotes
[@utkarshkukreti]: https://github.com/utkarshkukreti
[@vairix]: https://github.com/vairix
-[@watson]: https://github.com/watson
+[@watson]: https://github.com/watson
View
@@ -3,17 +3,15 @@
This is a guide to contributing to Active Admin. It should walk you through the
major steps to contributing code to the project.
-### 1. Create an Issue on Github
+### 1. Create an Issue on GitHub
The first step to contributing to Active Admin is creating a ticket in our
-[ticketing system on Github](https://github.com/gregbell/active_admin/issues).
+[ticketing system on GitHub](https://github.com/gregbell/active_admin/issues).
The community has been hard at work already, so please take a second to search
for the issue or feature before creating a new one.
-All features or bug fixes should have a ticket. This makes it easy for everyone
-to discuss the code and know if a fix is already in progress for an issue. If
-it's a feature, the team can prioritize what it should work on based on these
-tickets.
+All bug fixes should have a ticket. This makes it easy for everyone
+to discuss the code and know if a fix is already in progress for an issue.
### 2. Fork & Create a Feature Branch
@@ -109,5 +107,5 @@ up to date with Active Admin's master branch. If there were any changes, you
should rebase your feature branch and make sure that it will merge correctly. If
there are any merge conflicts, your pull request will not be merged in.
-Now push your changes up to your feature branch on github and make a pull request!
+Now push your changes up to your feature branch on GitHub and make a pull request!
We will pull your changes, run the test suite, review the code and merge it in.
View
23 Gemfile
@@ -2,10 +2,13 @@ source 'http://rubygems.org'
gemspec
-require File.expand_path('../spec/support/detect_rails_version', __FILE__)
+ACTIVE_ADMIN_PATH = File.dirname(__FILE__) unless defined?(ACTIVE_ADMIN_PATH)
+
+require File.expand_path('spec/support/detect_rails_version', ACTIVE_ADMIN_PATH)
rails_version = detect_rails_version
gem 'rails', rails_version
+gem 'bourbon'
case rails_version
when /^3\.0/
@@ -19,22 +22,26 @@ else
end
group :development, :test do
- gem 'sqlite3-ruby', :require => 'sqlite3'
+ gem 'sqlite3'
gem 'rake', '~> 0.9.2.2', :require => false
- gem 'haml', '~> 3.1.1', :require => false
+ gem 'haml', '~> 3.1.7', :require => false
gem 'yard'
gem 'rdiscount' # For yard
+ gem "sprockets"
+ gem 'rails-i18n' # Gives us default i18n for many languages
+ gem 'parallel_tests'
end
group :test do
- gem 'rspec-rails', '~> 2.8.1'
- gem 'cucumber', '1.1.4'
- gem 'cucumber-rails', '1.2.1'
+ gem 'rspec-rails', '~> 2.9.0'
+ gem 'cucumber-rails', '1.3.0', :require => false
gem 'capybara', '1.1.2'
gem 'database_cleaner'
- gem 'shoulda-matchers', '1.0.0'
+ gem 'shoulda-matchers', '1.3.0'
gem 'launchy'
- gem 'jslint_on_rails', '~> 1.0.6'
+ gem 'jslint_on_rails', '~> 1.1.1'
gem 'guard-rspec'
+ gem "guard-coffeescript"
+ gem 'jasmine'
end
View
@@ -5,4 +5,3 @@ guard 'rspec', :all_on_start => false, :version => 2 do
watch(%r{^lib/active_admin/(.+)\.rb$}) { |m| "spec/unit/#{m[1]}_spec.rb" }
watch('spec/spec_helper.rb') { "spec/" }
end
-
View
@@ -1,4 +1,4 @@
-Copyright (c) 2011 Greg Bell, VersaPay Corporation
+Copyright (c) 2012 Greg Bell, VersaPay Corporation
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
View
@@ -4,30 +4,41 @@ Active Admin is a framework for creating administration style interfaces. It
abstracts common business application patterns to make it simple for developers
to implement beautiful and elegant interfaces with very little effort.
-{<img src="https://secure.travis-ci.org/gregbell/active_admin.png" />}[http://travis-ci.org/gregbell/active_admin]
+{<img src="https://secure.travis-ci.org/gregbell/active_admin.png?branch=master" />}[http://travis-ci.org/gregbell/active_admin] {<img src="https://codeclimate.com/badge.png" />}[https://codeclimate.com/github/gregbell/active_admin] {<img src="https://gemnasium.com/gregbell/active_admin.png" />}[https://gemnasium.com/gregbell/active_admin]
== Documentation & Support
* Documentation & Guides: http://activeadmin.info/documentation.html
* Wiki: https://github.com/gregbell/active_admin/wiki
-* RDoc: http://rubydoc.info/github/gregbell/active_admin/master/frames
+* RDoc: http://rubydoc.info/gems/activeadmin/frames
* Live demo: http://demo.activeadmin.info/admin
* Website: http://www.activeadmin.info
* <b>Need Support?</b> Ask the Mailing list: http://groups.google.com/group/activeadmin
-== Bugs & Feature Requests
-
-* Bug Reports & Feature Requests: https://github.com/gregbell/active_admin/issues
-* Want to Contribute? Read the Guide: https://github.com/gregbell/active_admin/blob/master/CONTRIBUTING.md
-
== Goals
1. Allow developers to quickly create gorgeous administration interfaces
- <strong>(Not Just CRUD)</strong>
+ <b>(Not Just CRUD)</b>
2. Build a DSL for developers and an interface for businesses.
3. Ensure that developers can easily customize every nook and cranny of the interface.
4. Build common interfaces as shareable gems so that the entire community benefits.
+== Bugs Reports & Contributing
+
+* Bug Reports: https://github.com/gregbell/active_admin/issues
+* Want to Contribute? Read the Guide: https://github.com/gregbell/active_admin/blob/master/CONTRIBUTING.md
+
+== Feature Requests
+
+Please don't put feature requests in Github Issues. They will be closed as soon as they
+are reviewed by one of the core team members. If you would like a feature in Active Admin,
+please submit a well tested pull request with the desired changes. If you're not a coder,
+then the mailing list may be a good place to try to convince someone to help you out
+with your cause.
+
+If you are going to submit a pull request, please read the contributing guide:
+https://github.com/gregbell/active_admin/blob/master/CONTRIBUTING.md
+
== Getting Started
@@ -67,6 +78,11 @@ Refresh your web browser to see the interface.
When upgrading to a new version of ActiveAdmin you may need to run
$> rails generate active_admin:assets
+If you get:
+ uninitialized constant Admin::DashboardController
+when trying to view the dashboard (at +/admin+), ensure +app/admin/dashboards.rb+ looks like the current {default}[https://raw.github.com/gregbell/active_admin/master/lib/generators/active_admin/install/templates/dashboard.rb].
+
+
== Next Steps
The best place to get documentation is at http://activeadmin.info/documentation.html.
View
@@ -1,8 +1,8 @@
require "bundler"
+require 'rake'
Bundler.setup
Bundler::GemHelper.install_tasks
-require 'rake'
def cmd(command)
puts command
@@ -14,5 +14,14 @@ require File.expand_path('../spec/support/detect_rails_version', __FILE__)
# Import all our rake tasks
FileList['tasks/**/*.rake'].each { |task| import task }
-# Run the specs & cukes
-task :default => :test
+# Run the specs & cukes using parallel_tests
+task :default => :parallel_tests
+
+begin
+ require 'jasmine'
+ load 'jasmine/tasks/jasmine.rake'
+rescue LoadError
+ task :jasmine do
+ abort "Jasmine is not available. In order to run jasmine, you must: (sudo) gem install jasmine"
+ end
+end
View
@@ -23,8 +23,9 @@ Gem::Specification.new do |s|
s.add_dependency("meta_search", ">= 0.9.2")
s.add_dependency("devise", ">= 1.1.2")
s.add_dependency("formtastic", ">= 2.0.0")
- s.add_dependency("inherited_resources", "> 0")
+ s.add_dependency("inherited_resources", ">= 1.3.1")
s.add_dependency("kaminari", ">= 0.13.0")
s.add_dependency("sass", ">= 3.1.0")
s.add_dependency("fastercsv", ">= 0")
+ s.add_dependency("arbre", ">= 1.0.1")
end
@@ -1,9 +1,3 @@
-/* Active Admin JS */
-$(function(){
- $(".datepicker").datepicker({dateFormat: 'yy-mm-dd'});
-
- $(".clear_filters_btn").click(function(){
- window.location.search = "";
- return false;
- });
-});
+//= require_tree ./lib/
+//= require_tree ./components/
+//= require_tree ./pages/
@@ -1,4 +1,5 @@
//= require jquery
//= require jquery-ui
//= require jquery_ujs
+
//= require active_admin/application
Oops, something went wrong.

0 comments on commit 2baa11b

Please sign in to comment.