Skip to content

Commit

Permalink
More client side authentication work and work on annotations
Browse files Browse the repository at this point in the history
modified:   ../app/controllers/audio_events_controller.rb
	-- more attempts at fixing bug #57

modified:   ../app/assets/javascripts/angular/controllers/annotation_viewer.js
modified:   ../app/assets/javascripts/angular/controllers/login.js
modified:   ../app/assets/javascripts/angular/directives/auth.js
modified:   ../app/assets/javascripts/angular/directives/directives.js
modified:   ../app/assets/javascripts/angular/services/services.js
modified:   ../app/assets/stylesheets/_login_control.css.scss
modified:   ../app/views/layouts/application.html.erb
	-- added support for more types of authentication providers

modified:   ../config/initializers/devise.rb
	-- removed basic auth for images

modified:   ../lib/assets/javascripts/jquery.drawabox.js
	-- deleted unecessary comma

modified:   ../lib/assets/javascripts/functions.js
	-- added uri encoder

../app/serializers/
new file:   ../config/initializers/active_model_serializers.rb
modified:   ../config/initializers/active_model_serializers.rb
modified:   ../Gemfile
modified:   ../Gemfile.lock
	-- added active_model_serializers gem for easier json formatting

modified:   ../app/models/audio_event.rb
	-- removed uncessaaey json formatting
  • Loading branch information
atruskie committed Dec 6, 2012
1 parent 65a6234 commit afe7c4f
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit afe7c4f

Please sign in to comment.