Merge 12304:14009 from trunk.
authorTom Hughes <tom@compton.nu>
Sun, 8 Mar 2009 13:02:37 +0000 (13:02 +0000)
committerTom Hughes <tom@compton.nu>
Sun, 8 Mar 2009 13:02:37 +0000 (13:02 +0000)
commitc8ee1351049ef1bb4d7b50d071b2a96154266d1d
treec295d8a7d8d780eb90b4cbb7c93e60d96ea3bef6
parent0272d30b9683fb3a4bb6b63940373b17a5c6cf60
parentfa3c97d6a69ae9937a49eb38fce434e122a6678c
Merge 12304:14009 from trunk.
26 files changed:
app/controllers/api_controller.rb
app/controllers/user_controller.rb
app/controllers/user_preference_controller.rb
app/models/changeset.rb
app/models/node.rb
app/models/relation.rb
app/models/way.rb
app/views/diary_entry/list.rhtml
app/views/layouts/site.rhtml
app/views/user/login.rhtml
app/views/user/new.rhtml
config/environment.rb
config/initializers/libxml.rb
db/migrate/019_add_timestamp_indexes.rb
db/migrate/020_populate_node_tags_and_remove.rb
db/migrate/020_populate_node_tags_and_remove_helper.c
db/migrate/021_move_to_innodb.rb
db/migrate/022_key_constraints.rb
db/migrate/023_add_changesets.rb
db/migrate/024_order_relation_members.rb
db/migrate/025_add_end_time_to_changesets.rb
lib/diff_reader.rb
lib/osm.rb
public/stylesheets/site.css
test/functional/node_controller_test.rb
test/functional/relation_controller_test.rb