Merge remote-tracking branch 'origin/master' into pflynn/in-browser-f…

…ile-system

* origin/master: (180 commits)
  Update to release 1.3
  FR and JP translation fix for index.html file
  Fix unit test that broke due to a side fix in PR #10413, and enhance tests to verify that search tickmarks are rendered.
  Only print deprecation warnings for $().on/off() on EventDispatchers once per caller, like other such warnings. Move $() shim into brackets.js normal startup code, since there's no longer any core code that could hit it (only extensions).
  Fix memory leak in ExtensionManagerViewModel
  Don't adjust selection if rename fails. Add unit tests for these cases.
  Fixed typos in docs
  Update the selected file if a renamed folder is a prefix of the path
  Use command instead of private method.
  German Translation
  Update jQuery -> 2.1.3
  Fix for ImageView bug 5960 & 10180
  Update README.md
  Update README.md
  Update translation
  Update strings.js
  Update urls.js
  Get rid of deprecated calls in LiveDevMultiBrowser
  Add missing attribute
  Fixing UX issue of inactive panel getting too dim to read text for dark themes.
  ...

.brackets.json

@@ -8,6 +8,12 @@
         "es5": true
     },
     "defaultExtension": "js",
+    "language": {
+        "javascript": {
+            "linting.prefer": ["JSLint", "JSHint"],
+            "linting.usePreferredOnly": true
+        }
+    },
     "path": {
         "src/thirdparty/CodeMirror2/**/*.js": {
             "spaceUnits": 2,
@@ -20,4 +26,4 @@
     },
     "spaceUnits": 4,
     "useTabChar": false
-}
+}

Gruntfile.js

@@ -1,24 +1,24 @@
 /*
  * Copyright (c) 2013 Adobe Systems Incorporated. All rights reserved.
- *  
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"), 
- * to deal in the Software without restriction, including without limitation 
- * the rights to use, copy, modify, merge, publish, distribute, sublicense, 
- * and/or sell copies of the Software, and to permit persons to whom the 
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- *  
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- *  
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
- * 
+ *
  */
 /*global module, require*/
 module.exports = function (grunt) {
@@ -27,7 +27,7 @@ module.exports = function (grunt) {
     // load dependencies
     require('load-grunt-tasks')(grunt, {pattern: ['grunt-contrib-*', 'grunt-targethtml', 'grunt-usemin']});
     grunt.loadTasks('tasks');
-    
+
     // Project configuration.
     grunt.initConfig({
         pkg  : grunt.file.readJSON("package.json"),
@@ -59,7 +59,9 @@ module.exports = function (grunt) {
                             'xorigin.js',
                             'dependencies.js',
                             'thirdparty/requirejs/require.js',
-                            'LiveDevelopment/launch.html'
+                            'LiveDevelopment/launch.html',
+                            'LiveDevelopment/MultiBrowserImpl/transports/**',
+                            'LiveDevelopment/MultiBrowserImpl/launchers/**'
                         ]
                     },
                     /* node domains are not minified and must be copied to dist */
@@ -127,7 +129,7 @@ module.exports = function (grunt) {
                     baseUrl: 'src',
                     optimize: 'uglify2',
                     // brackets.js should not be loaded until after polyfills defined in "utils/Compatibility"
-                    // so explicitly include it in main.js 
+                    // so explicitly include it in main.js
                     include: ["utils/Compatibility", "brackets"],
                     // TODO: Figure out how to make sourcemaps work with grunt-usemin
                     // https://github.com/yeoman/grunt-usemin/issues/30
@@ -250,7 +252,7 @@ module.exports = function (grunt) {
                 /* Keep in sync with test/SpecRunner.html dependencies */
                 vendor : [
                     'test/polyfills.js', /* For reference to why this polyfill is needed see Issue #7951. The need for this should go away once the version of phantomjs gets upgraded to 2.0 */
-                    'src/thirdparty/jquery-2.1.1.min.js',
+                    'src/thirdparty/jquery-2.1.3.min.js',
                     'src/thirdparty/CodeMirror2/lib/codemirror.js',
                     'src/thirdparty/CodeMirror2/lib/util/dialog.js',
                     'src/thirdparty/CodeMirror2/lib/util/searchcursor.js',
@@ -302,7 +304,7 @@ module.exports = function (grunt) {
             linux: "<%= shell.repo %>/installer/linux/debian/package-root/opt/brackets/brackets"
         }
     });
-    
+
     // task: install
     grunt.registerTask('install', ['write-config', 'less']);
 

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012-2014 Adobe Systems Incorporated. All rights reserved.
+Copyright (c) 2012-2015 Adobe Systems Incorporated. All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"), 

README.md

@@ -107,6 +107,7 @@ Not sure you needed the exclamation point there, but we like your enthusiasm.
   (starting from "Development") list the features that we're currently working on.
   "Ready" shows what we'll be working on next.
 * Watch our [GitHub activity stream](https://github.com/adobe/brackets/pulse).
+* Watch our [Waffle Kanban board](https://waffle.io/adobe/brackets): Work items in [![Stories in Ready](https://badge.waffle.io/adobe/brackets.svg?label=ready&title=Ready)](http://waffle.io/adobe/brackets) are next. The entire development process is outlined in the [Developer Guide](https://github.com/adobe/brackets/wiki/Brackets-Developers-Guide).
 
 #### Contact info
 

package.json

@@ -1,7 +1,7 @@
 {
     "name": "Brackets",
-    "version": "1.1.0-0",
-    "apiVersion": "1.1.0",
+    "version": "1.3.0-0",
+    "apiVersion": "1.3.0",
     "homepage": "http://brackets.io",
     "issues": {
         "url": "http://github.com/adobe/brackets/issues"
@@ -17,7 +17,7 @@
         "jasmine-node": "1.11.0",
         "grunt-jasmine-node": "0.1.0",
         "grunt-cli": "0.1.9",
-        "phantomjs": "1.9.11",
+        "phantomjs": "1.9.13",
         "grunt-lib-phantomjs": "0.3.0",
         "grunt-contrib-jshint": "0.6.0",
         "grunt-contrib-watch": "0.4.3",
@@ -49,4 +49,4 @@
             "url": "https://github.com/adobe/brackets/blob/master/LICENSE"
         }
     ]
-}
+}

samples/de/Erste Schritte/index.html

@@ -30,8 +30,8 @@ <h2>Dies ist Ihre Anleitung!</h2>
             <em>Brackets ist eine andere Art Editor.</em>
             Brackets hat ein paar einzigartige Features wie Schnelles Bearbeiten, Live-Vorschau und zahlreiche
             weitere, die Sie in anderen Editoren vergeblich suchen werden. Zudem ist Brackets in JavaScript, HTML
-            und CSS geschrieben. Das heißt, dass die meisten Brackets-Nutzer dazu in der Lage sind, den Editor
-            selbst zu verändern und erweitern. Tatsächlich nutzen wir Brackets täglich, um Brackets zu verbessern.
+            und CSS geschrieben. Das heißt, dass die meisten Brackets-Nutzer dazu in der Lage sind, den Editor selbst
+            zu verändern und zu erweitern. Tatsächlich nutzen wir Brackets täglich, um Brackets zu verbessern.
             Lesen Sie weiter, um mehr über die Nutzung der Hauptfeatures zu erfahren.
 
         </p>