Merge branch 'master' of github.com:mozilla/FlightDeck
Merge branch 'worker-js_hack'
default is a reserved word, and check for main_callback before trying…
… to call it
fixes bug 638223 - Delete confirmation modal does not go away when yo…
…u hit enter
fix the '200 Error' in libraries with 2+ digits in revision number
pressing enter when a folder is highlight will toggle is open and closed
adding irreversible styles to Remove file prompt. also making irrever…
…sible styles red on hover and active as well.
Merge branch 'addon_sdk-1.0b4rc1'
Merge branch 'bug-633589-add_external_resource'
validating url of external attachment
Merge branch 'master' into bug-633589-add_external_resource
addon sdk 1.0b4rc1 added
need commas in an array of json for latest dependencies
check Dependencies for out-of-date shouldn't happen in Package.View
Merge branch 'bug-633592-keyboard_shortcuts'
using ace's active line blue color to show focus in the tree
focus and blurring the actual editor
Merge branch 'bug-634344-upgrade_django'
keyboard shortcuts, mostly working. ui also
Django updated to 1.2.5\nall requests are dressed with a CSRF header
external resource is working some content validation still needs to b…
fixes the bug introduced with duplicate module front-end
Merge branch 'bug-639805-colored_buttons'
irreversible style added (used in DELETE addon feature)
Merge branch 'es'
Updates to es.yml per metrics
Merge branch 'docs'
misplaced a parenthesis
fixes bug 641107 - warn users when libraries have conflicting module …
Merge branch 'add_version_value_to_edit_properties_modal'