]> git.openstreetmap.org Git - rails.git/commit
First version of blocking feature. Allows both time-based (for map protection) and...
authorMatt Amos <zerebubuth@gmail.com>
Mon, 28 Sep 2009 16:01:00 +0000 (16:01 +0000)
committerMatt Amos <zerebubuth@gmail.com>
Mon, 28 Sep 2009 16:01:00 +0000 (16:01 +0000)
commitdaa2496024cf0bdc65e58eb6e2802784f411f68b
treef704c61f2c5ddc66db21a9c5178a9a9796611c6d
parent52fa09ecae15fd7fa2739471d5d71a8fbcf20838
First version of blocking feature. Allows both time-based (for map protection) and notice-based (for education) blocks on users. Also introduces user roles and a simple UI for displaying and administering these.
33 files changed:
app/controllers/application_controller.rb
app/controllers/user_blocks_controller.rb [new file with mode: 0644]
app/controllers/user_controller.rb
app/controllers/user_roles_controller.rb [new file with mode: 0644]
app/models/user.rb
app/models/user_block.rb [new file with mode: 0644]
app/models/user_role.rb [new file with mode: 0644]
app/views/user/view.html.erb
app/views/user_blocks/_block.html.erb [new file with mode: 0644]
app/views/user_blocks/_blocks.html.erb [new file with mode: 0644]
app/views/user_blocks/blocks_by.html.erb [new file with mode: 0644]
app/views/user_blocks/blocks_on.html.erb [new file with mode: 0644]
app/views/user_blocks/edit.html.erb [new file with mode: 0644]
app/views/user_blocks/index.html.erb [new file with mode: 0644]
app/views/user_blocks/new.html.erb [new file with mode: 0644]
app/views/user_blocks/revoke.html.erb [new file with mode: 0644]
app/views/user_blocks/show.html.erb [new file with mode: 0644]
app/views/user_roles/edit.html.erb [new file with mode: 0644]
app/views/user_roles/index.html.erb [new file with mode: 0644]
app/views/user_roles/new.html.erb [new file with mode: 0644]
app/views/user_roles/show.html.erb [new file with mode: 0644]
config/locales/en.yml
config/routes.rb
db/migrate/044_create_user_roles.rb [new file with mode: 0644]
db/migrate/045_create_user_blocks.rb [new file with mode: 0644]
public/403.html [new file with mode: 0644]
public/images/roles/administrator.png [new file with mode: 0644]
public/images/roles/blank_administrator.png [new file with mode: 0644]
public/images/roles/blank_moderator.png [new file with mode: 0644]
public/images/roles/moderator.png [new file with mode: 0644]
test/fixtures/user_roles.yml [new file with mode: 0644]
test/fixtures/users.yml
test/functional/user_roles_controller_test.rb [new file with mode: 0644]