GRN2-260: Added the ability to merge user accounts (#938)

* Added the ability to merge user accounts * Styling fixes
2020-02-14 10:24:06 -05:00
parent 31258272c2
commit 005c738e4d
13 changed files with 222 additions and 5 deletions
--- a/app/assets/javascripts/room.js
+++ b/app/assets/javascripts/room.js
@ -69,7 +69,7 @@ $(document).on('turbolinks:load', function(){
    })

    $('.selectpicker').selectpicker({
-      liveSearchPlaceholder: "Start searching..."
+      liveSearchPlaceholder: getLocalizedString('javascript.search.start')
    });
    // Fixes turbolinks issue with bootstrap select
    $(window).trigger('load.bs.select.data-api');