Merge remote-tracking branch 'remotes/origin/branch-4.5'

Conflicts:
	plugins/sonar-xoo-plugin/pom.xml
	sonar-plugin-api/pom.xml
	sonar-plugin-api/src/main/java/org/sonar/api/config/Settings.java

6 files changed, 20 insertions, 5 deletions

diff --git a/server/sonar-web/src/main/coffee/coding-rules/app.coffee b/server/sonar-web/src/main/coffee/coding-rules/app.coffee
index aab13d216d4..14ab0d938c5 100644
--- a/server/sonar-web/src/main/coffee/coding-rules/app.coffee
+++ b/server/sonar-web/src/main/coffee/coding-rules/app.coffee
@@ -509,7 +509,7 @@ requirejs [
         repo = _.findWhere(App.repositories, key: value)
         other_repo_with_same_name = _.find(App.repositories, (repos) -> repos.name == repo.name && repos.key != repo.key)
         if other_repo_with_same_name
-          repo.name + ' - ' + App.languages[repo.language]
+          App.languages[repo.language] + ' ' + repo.name
         else
           repo.name
 
diff --git a/server/sonar-web/src/main/hbs/coding-rules/coding-rules-quality-profile-activation.hbs b/server/sonar-web/src/main/hbs/coding-rules/coding-rules-quality-profile-activation.hbs
index 560972b992b..9e48279434d 100644
--- a/server/sonar-web/src/main/hbs/coding-rules/coding-rules-quality-profile-activation.hbs
+++ b/server/sonar-web/src/main/hbs/coding-rules/coding-rules-quality-profile-activation.hbs
@@ -45,7 +45,7 @@
             {{else}}
               {{#eq type 'BOOLEAN'}}
               <select name="{{key}}" value="{{value}}">
-                <option value="{{defaultValue}}">{{t 'default'}}</option>
+                <option value="{{defaultValue}}">{{t 'default'}} ({{t defaultValue}})</option>
                 <option value="true"{{#eq value 'true'}} selected="selected"{{/eq}}>{{t 'true'}}</option>
                 <option value="false"{{#eq value 'false'}} selected="selected"{{/eq}}>{{t 'false'}}</option>
               </select>
diff --git a/server/sonar-web/src/main/js/issues/extra.js b/server/sonar-web/src/main/js/issues/extra.js
index 6f7700c336b..7edfb0ece40 100644
--- a/server/sonar-web/src/main/js/issues/extra.js
+++ b/server/sonar-web/src/main/js/issues/extra.js
@@ -621,12 +621,14 @@ define(
           var idObj = _.findWhere(params, { key: 'id' });
           if (idObj) {
             var that = this,
-                f = this.app.favoriteFilter;
+              f = this.app.favoriteFilter;
             this.app.canSave = false;
             f.set('id', idObj.value);
             f.fetch({
               success: function () {
-                params = _.extend({}, that.parseQuery(f.get('query')), params);
+                var parsedFilter = that.parseQuery(f.get('query'));
+                params = _.extend({}, params);
+                params = _.extent(params, parsedFilter);
                 that.loadResults(params);
               }
             });
diff --git a/server/sonar-web/src/main/js/tests/e2e/tests/coding-rules-spec.js b/server/sonar-web/src/main/js/tests/e2e/tests/coding-rules-spec.js
index 4b4349c7a23..b6cabf1d88a 100644
--- a/server/sonar-web/src/main/js/tests/e2e/tests/coding-rules-spec.js
+++ b/server/sonar-web/src/main/js/tests/e2e/tests/coding-rules-spec.js
@@ -60,6 +60,15 @@ casper.test.begin(testName('Readonly Tests'), function suite(test) {
     });
 
 
+    casper.waitForSelector('div.navigator-facets-list-item:nth-child(2)', function checkFacets() {
+      test.assertSelectorHasText('div.navigator-facets-list-item:nth-child(2) a:nth-child(1)', 'Java SonarQube');
+      test.assertSelectorHasText('div.navigator-facets-list-item:nth-child(2) a:nth-child(2)', 'Java Common SonarQube');
+      test.assertSelectorHasText('div.navigator-facets-list-item:nth-child(2) a:nth-child(3)', 'CoffeeScript SonarQube');
+      test.assertSelectorHasText('div.navigator-facets-list-item:nth-child(2) a:nth-child(4)', 'CoffeeScript Common SonarQube');
+      test.assertSelectorHasText('div.navigator-facets-list-item:nth-child(2) a:nth-child(5)', 'Xoo SonarQube');
+    });
+
+
     casper.waitForSelector('li.active', function checkResultsList() {
       test.assertElementCount('ol.navigator-results-list li', 10);
       test.assertElementCount('li.active', 1);
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/helpers/application_helper.rb b/server/sonar-web/src/main/webapp/WEB-INF/app/helpers/application_helper.rb
index d3989111e74..be210cffe4e 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/helpers/application_helper.rb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/app/helpers/application_helper.rb
@@ -992,6 +992,9 @@ module ApplicationHelper
   def url_for_issues(params)
     url = ApplicationController.root_context + '/issues/search#'
     params.each do |key, value|
+      if key == 'filter'
+        key = 'id'
+      end
       url += key.to_s + '=' + value.to_s + '|'
     end
     url
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb
index d9c1cad458a..1b6e846b19c 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb
@@ -204,11 +204,12 @@
       <%= render 'branding/footer' -%>
       <div>
         Version <%= sonar_version -%> -
+        <a href="http://www.gnu.org/licenses/lgpl-3.0.txt" target="lgpl_v3">LGPL v3</a> -
         <a href="http://www.sonarqube.org" target="sonar">Community</a> -
         <a href="http://www.sonarqube.org/documentation" target="sonar_doc">Documentation</a> -
         <a href="http://www.sonarqube.org/support" target="support">Get Support</a> -
         <a href="http://sonar-plugins.codehaus.org" target="plugins">Plugins</a> -
-        <a href="<%= ApplicationController.root_context -%>/api_documentation">API</a>
+        <a href="<%= ApplicationController.root_context -%>/api_documentation">Web Service API</a>
         <% unless DatabaseVersion.production? %>
           <br><br><span class="error big" id="evaluation_warning">Embedded database should be used for evaluation purpose only</span>
           <br><br><span class="error">The embedded database will not scale, it will not support upgrading to newer versions of SonarQube, and there is no support for migrating your data out of it into a different database engine.</span>