added debugger in development
splitted long line
basic implementation of choose short-name option
Merge branch 'wcmc-next' into wcmc-next-short-url
Scope to order ShortUrls by visit count
Use visit ordering scope in ShortUrls display
Require users to confirm their email addresses
Only allow @unep-wcmc.org emails to register
client side implementation of edit short url
edit short urls - server side
removed inline class for form
test for update short_url
moved does_url_belong_to_user? method from controller to model
before_filter on ShortUrlsController and fixed tests
fixes for merge request
use Devise's built in before_filter :authenticate_user!
check for current user existence in does_url_belong_to_user?
Merge branch 'wcmc-next' into wcmc-next-short-url

* wcmc-next:
  Only allow @unep-wcmc.org emails to register
  Require users to confirm their email addresses
  Use visit ordering scope in ShortUrls display
  Scope to order ShortUrls by visit count

Conflicts:
	app/models/short_url.rb
Update short_url.rb

&& in place of and
Merge pull request #3 from unepwcmc/wcmc-next-short-url

Wcmc next short url
Merge branch 'wcmc-next' into disregard-vote

* wcmc-next:
  Update short_url.rb
  fixes for merge request use Devise's built in before_filter :authenticate_user! check for current user existence in does_url_belong_to_user?
  before_filter on ShortUrlsController and fixed tests
  moved does_url_belong_to_user? method from controller to model
  test for update short_url
  removed inline class for form
  edit short urls - server side
  client side implementation of edit short url
  Only allow @unep-wcmc.org emails to register
  Require users to confirm their email addresses
  Use visit ordering scope in ShortUrls display
  Scope to order ShortUrls by visit count
  basic implementation of choose short-name option
  splitted long line
  added debugger in development

Conflicts:
	Gemfile.lock
	db/schema.rb