1. 27 Apr, 2016 1 commit
    • Jacob Schatz's avatar
      Merge branch 'master' into 'master' · a1db1355
      Jacob Schatz authored
      Fixed width of .search-location-badge as it was causing issues in Safari.
      
      Fixed width of .search-location-badge as it was causing issues in Safari.
      
      Fixes issue #15541 and is a minor CSS only change so [ci skip]
      
      # Before
      
      Safari:
      ![Screen_Shot_2016-04-24_at_22.35.38](/uploads/74388670fde3af94429d83b954833bd3/Screen_Shot_2016-04-24_at_22.35.38.png)
      
      # After
      
      Safari:
      ![Screen_Shot_2016-04-24_at_21.59.49](/uploads/177d0d8fda665165dff5006930604fc6/Screen_Shot_2016-04-24_at_21.59.49.png)
      
      Chrome:
      ![Screen_Shot_2016-04-24_at_21.59.40](/uploads/6764cd5864901210f4f8eff4388fd6db/Screen_Shot_2016-04-24_at_21.59.40.png)
      
      # CSS class referenced in the following files:
      
      `./app/assets/javascripts/search_autocomplete.js.coffee`
      
      `./app/assets/stylesheets/pages/search.scss`
      
      …and is visible on the search bar on every page.
      
      See merge request !3900
      a1db1355
  2. 26 Apr, 2016 1 commit
    • Jacob Schatz's avatar
      Merge branch 'emoji-unicode-fix' into 'master' · f2afc5dd
      Jacob Schatz authored
      Fixes issue with emoji comments not showing correct emoji image
      
      Previously it would look for the unicode character inside the award menu. But this menu might not always be there.
      
      Now, the unicode characters are loaded onto the page in an array which the award emoji that looks in to get the correct emoji unicode character
      
      Fixes #15512
      
      See merge request !3885
      f2afc5dd
  3. 25 Apr, 2016 14 commits
  4. 22 Apr, 2016 9 commits
  5. 21 Apr, 2016 15 commits