Changeset [0c59ef4c49745c29c3c10b3819d95b3b1b314e0d] by Alex Grunenfelder
Revision 0c59ef4c49745c29c3c10b3819d95b3b1b314e0d,
committed by Alex Grunenfelder
· May 25th, 2010 @ 02:53 PM
Merge branch 'master' of git://github.com/greenbuilding/greenbuildingbrain into dcs_portal
- 'master' of git://github.com/greenbuilding/greenbuildingbrain: (28 commits) temporarily disabling toc links rationalize the display of rpx login here some more mods for rpx handle situations where there is no email address handle blank user names or emails in gravatar helper trying out rpx in the homepage adding sunspot to gems ? backed out rpx for now trying to remove some validations for rpx add migration for removing not null constraint from db which was hurting rpx fix to user data mapping added improved user login form add map data for rpx hide the rpx links a bit better added secret login with rpx link change to internal mapping change mapping mode add rpx mapping setting add rpx authentication updated robots to block atom links since they are 500 ... http://github.com/greenbuilding/greenbuildingbrain/commit/0c59ef4c4...
36 changed files
-
A
app/views/users/change_password.html.erb -
A
config/sunspot.yml -
A
db/migrate/20100512001415_add_authlogic_rpx_migration.rb -
A
db/migrate/20100515034635_remove_not_null_constraint_from_email.rb -
A
solr/conf/elevate.xml -
A
solr/conf/schema.xml -
A
solr/conf/solrconfig.xml -
A
solr/conf/spellings.txt -
A
solr/conf/stopwords.txt -
A
solr/conf/synonyms.txt -
A
solr/lib/lucene-spatial-2.9.1.jar -
A
solr/lib/solr-spatial-light-0.0.4.jar -
R
app/views/users/change_password.erb -
M
.gems -
M
Rakefile -
M
app/controllers/items_controller.rb -
M
app/controllers/users_controller.rb -
M
app/helpers/application_helper.rb -
M
app/models/item.rb -
M
app/models/user.rb -
M
app/models/user_session.rb -
M
app/views/audiofiles/listen.xml.erb -
M
app/views/homepage/dashboard.html.erb -
M
app/views/items/show.html.erb -
M
app/views/layouts/_footer.html.erb -
M
app/views/layouts/_header.html.erb -
M
app/views/layouts/application.html.erb -
M
app/views/tours/show.html.erb -
M
app/views/user_sessions/new.html.erb -
M
app/views/users/edit.html.erb -
M
app/views/users/new.html.erb -
M
app/views/users/show.html.erb -
M
config/environment.rb -
M
config/routes.rb -
M
db/schema.rb -
M
public/robots.txt