use attribute as key
Merge branch 'refs/heads/master' into attribute_names

* refs/heads/master: (31 commits)
  Reverting Gemfile-plugins, Gemfile.lock, and schema.rb to what they are in master - something got screwed up with concerto-hardware and it is causing inappropriate merge conflicts.
  preview preview when no media_id present
  fixes #768 video quality via field_config
  cleanup checking for no template
  fix #764 translations
  fix #779 link to template
  Adding Gemfile.lock from master to hopefully end this merge conflict bullshit. Also fixed duration not being saved for #729 due to the submissions_controller and rearranged logic on submissions#show.
  bind timepicker to class instead of id and regardless of whether or not there is a datefield in the dom
  require datepair (part of existing jquery.timepicker.js)
  fix html indentation
  detect if the uploaded file is not a zip file
  conditionally include sideblock if screen details exist
  make template xml files false by default
  add support for hidden flag to close #774
  For #729, restructured approach on submissions#show for moderation to use form submit buttons. This still does not work fully due to: 1) the moderation_flag needs to be updated depending on whether the approve or deny button is clicked; 2) duration and moderation_reason are not being sent alongside the form submit to submissions#update
  Removed moderate_form partial (changed to moderate_tile_form); began to wire up Approve and Deny from submissions#show. Please note that Deny is currently NOT FUNCTIONAL from the submissions#show view - need to figure out how to properly submit the form along with the parameters.
  Fixing merge conflict on _moderate_form
  Turned moderate_form into a remote; added update.js.erb for submissions_controller; wired up transitions so that approve and deny happen using ajax
  Fixing merge conflict on Gemfile.lock
  Made initial commits for new moderation user interface: added moderate buttons to submissions#index, added popup forms, wired up actions
  ...

Conflicts:
	app/views/concerto_plugins/index.html.erb
Merge branch 'refs/heads/master' into attribute_names

* refs/heads/master:
  Added JS to set moderation_flag properly to close #792
Merge branch 'refs/heads/master' into attribute_names

* refs/heads/master: (41 commits)
  removing dead link to close #797
  fix #798 move owner into fieldset
  Tighen up file selection during template importing for #794.
  #795 fix defaults and stop if frontend doesn't build
  add remove conflicting superdebug file msg
  add exit codes for failures
  addresses #795 checks for compiled file after compilation
  this belongs in the before-script
  begin at the very beginning
  the ordering is off
  trying workaround from freerange/mocha@66bab2a
  Restore duration editing on submission#show.
  Refactor submission#show moderation into 2 forms.  Close #791.
  fix indentation
  Fix temp token checking. See #796.
  Add plugin callbacks for after screen changes.
  Strange version.rb-e temp file crept into the last commit
  add missing translation for view_all
  Version bump to 0.8.4
  Sort of dealing with #795 with a newly-compiled frontend
  ...
update closure
Merge branch 'refs/heads/master' into attribute_names

* refs/heads/master: (187 commits)
  Revert "Moved configuration to Concerto admin settings"
  Revert "Revert "For users without both postgres and mysql installed, be a little more intelligent about the related gems""
  Revert "For users without both postgres and mysql installed, be a little more intelligent about the related gems"
  Moved configuration to Concerto admin settings
  For users without both postgres and mysql installed, be a little more intelligent about the related gems
  Fixing #851 - removing icecube and reccuring_select references from main Gemfile and minimizing default plugins to avoid unexpected dependencies during runtime
  upgrade some gems, keep clockwork at 0.7.0
  Bring Gemfile.lock up to date
  Revert back to https for rubygems source (oops!)
  Don't support platforms bundler doesn't know about
  requested move to further up in Gemfile
  Added Gemfile.local to make it easier to install unicorn
  Whilst we have no tests for it, this would have been sure to fail under 1.8
  Found the proper classname to query-but obviously only under newer rubies
  Add conditional for 0 days for keeping activity logs
  Update 02-concerto_config.rb
  Added Activity model, ConcertoConfig entry, and cron entry to achieve #871
  Add translation to close #867
  add redacting of user's name from activity log
  add bundler version requirement
  ...
translate User attributes for # 838
straighten up Template translations for #838
clean up translations in subscriptions for #838
Merge remote-tracking branch 'origin/master' into attribute_names
Merge branch 'master' into attribute_names

* master:
  Bump to 0.9.0.kilobalrog.
  Make restart webserver button conditional
  Cleaned up content/submission editing workflow and added restart webserver button back
  Plugins crash if no controller hooks are specified since select is called on nil
clean up translations in submissions for #838
clean up translations in screens for #838
Merge branch 'master' into attribute_names

* master: (33 commits)
  Implement Text_Resize FieldConfig. Resolves #904
  Fixes #920, we're checking fieldconfig updated_at now as well!
  Add timestamps to FieldConfig
  Include all templates by default
  got the semantic down pt2
  got the semantic down
  apparently this is the only way to do a post with link_to calling action results in ?method=post being attached to the url, looks like a bug in rails
  Even gods leave commented code in by mistake
  Fixes #915 , I am CSS GODDDD , take that zaiks
  1.8.x is done
  A comma
  Added field config for #904
  Last go with icalendar before I nuke 1.8 support from orbit
  Moved icalendar dependency of concerto_calendar back to the 1.5.x series to make Ruby 1.8 keep chugging
  Update hardare gem name and bump installed gems
  Revert "Merge pull request #917 from gabe283/CAS"
  Create Concerto admin group on first registration and redirect user sign_in route to CAS login page
  Added CAS omniauth support to Devise login
  Package names changed
  Initial CAS work
  ...

Conflicts:
	app/views/subscriptions/index.html.erb
Merge branch 'master' into attribute_names

* master: (33 commits)
  add french translation from Lucas Manssens
  General bundle update in keeping with #930 and the 1.8.x deprecation. The only restrictions left are for rails and Rubyzip (not sure why). Let's hope Generalissimo Travis approves of this little putsch
  rename variable and use clearer conditional
  fix feed visibility
  display group owned screen in my screens
  fix screen permission (don't show all screens in other section)
  Closes #924. Another Devilish Bug Vanquished.
  submissions#show issue where 'edit content' would block link
  #869 handle no files edits
  #869 support replacing graphic and stylesheet on template edit
  #869 add fields for graphic and stylesheet files
  Bump to 0.9.1.kilobalrog.
  Fixes #923 thanks for the hint @bamnet
  Disable viewport scaling for mobile devices
  changed responsiveness of menu per #521. it's not perfect, but it's a start without going crazy over mobile use
  fixed the attribution of the commit. sorry for being a concerto virgin...
  Revert "added "edit content" and some flashy jquery to actually do it"
  added "edit content" and some flashy jquery to actually do it
  Proper logging for Content Not Found for Frontend
  Closes #891.. Thanks @gabe283 thanks for finding this.
  ...
Merge branch 'master' into attribute_names

* master: (66 commits)
  Screen auth test
  Fixed error when submitting params owner id and owner type
  Hardware plugin should be enabled
  Admins should be added to groups they apply to
  Change if to unless, unless that's an if
  New leader field only works for group#new action
  Remove height/width fields from view per #935
  Create a more generalized filterable menu that supports both groups and users
  modified "edit content" banner location revision of ae88200527e9b76a9ee166594eb4afd6c049cc91
  Bumped hardware and iframe plugins
  Plugins gemfile had wrong hardware plugin
  button style
  Added filterable user list to new group leader selection
  Added filterable menu when creating new memberships
  tracking and responsiveness increased letter tracking on buttons and fixed browser width responsiveness to match
  fixed extraneous slash from dbde1072881a52436183a3a731c360b924446c9a
  favicon upgrade: 16x16 --> 64x64
  fix for 1412cf3de795a59d8c0f79640c62c6d20c1df661
  topmenu button styling
  Add padding to template preview graphic
  ...
Merge branch 'attribute_names' of github.com:concerto/concerto into attribute_names

* 'attribute_names' of github.com:concerto/concerto: (33 commits)
  Screen auth test
  Fixed error when submitting params owner id and owner type
  Hardware plugin should be enabled
  Admins should be added to groups they apply to
  Change if to unless, unless that's an if
  New leader field only works for group#new action
  Remove height/width fields from view per #935
  Create a more generalized filterable menu that supports both groups and users
  modified "edit content" banner location revision of ae88200527e9b76a9ee166594eb4afd6c049cc91
  Bumped hardware and iframe plugins
  Plugins gemfile had wrong hardware plugin
  button style
  Added filterable user list to new group leader selection
  Added filterable menu when creating new memberships
  tracking and responsiveness increased letter tracking on buttons and fixed browser width responsiveness to match
  fixed extraneous slash from dbde1072881a52436183a3a731c360b924446c9a
  favicon upgrade: 16x16 --> 64x64
  fix for 1412cf3de795a59d8c0f79640c62c6d20c1df661
  topmenu button styling
  Add padding to template preview graphic
  ...
Added some controller error translations
i18n - models

Conflicts:
	config/locales/en.yml
i18n - models pt. 2

Conflicts:
	config/locales/en.yml