1. 27 May, 2016 6 commits
  2. 26 May, 2016 31 commits
  3. 25 May, 2016 3 commits
    • Jacob Schatz's avatar
      Merge branch 'updated-contrib-calendar' into 'master' · 3d009f77
      Jacob Schatz authored
      POC: Updated contrib calendar
      
      In an effort to cut down the JS file size - i've removed the heatmap calendar used for the contributing calendar on users profiles. We already have d3 on the page so why not use it instead of using a library which uses it?
      
      ![Screen_Shot_2016-04-27_at_11.08.41](/uploads/64c40f0c766f800fd0e33ac8be7f9644/Screen_Shot_2016-04-27_at_11.08.41.png)
      
      cc. @jschatz1 
      
      See merge request !3944
      3d009f77
    • Jacob Schatz's avatar
      Merge branch '17339-mobile-navigation' into 'master' · 4b4cda85
      Jacob Schatz authored
      Mobile navigation fade out
      
      Closes #17339     
      Closes #17610  
      
      <img src="/uploads/e382dd363bf8beb28339fa6b152be092/Screen_Shot_2016-05-18_at_10.16.59_AM.png" width="400px">
      
      
      See merge request !4195
      4b4cda85
    • Robert Speicher's avatar
      Merge branch 'upgrade-state_machines-activerecord' into 'master' · 41624600
      Robert Speicher authored
      Update state_machines-activerecord from 0.3.0 to 0.4.0.
      
      Includes support for Rails 5, working towards #14286.
      
      See merge request !4295
      41624600