[dev] [CatalinFrancu/dexonline] 6a528d: Refs #316: add medals with 3D ribbon

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/CatalinFrancu/dexonline
  Commit: 6a528dd851dedcf5f0f5e36a2582e0cfbeb84bb2
      https://github.com/CatalinFrancu/dexonline/commit/6a528dd851dedcf5f0f5e36a2582e0cfbeb84bb2
  Author: Sonia Andriu <sonia.andriu at eaudeweb.ro>
  Date:   2014-03-26 (Wed, 26 Mar 2014)

  Changed paths:
    M wwwbase/img/medals/articles.png
    M wwwbase/img/medals/email1.png
    M wwwbase/img/medals/email2.png
    M wwwbase/img/medals/email3.png
    M wwwbase/img/medals/moderator.png
    M wwwbase/img/medals/programmer1.png
    M wwwbase/img/medals/programmer2.png
    M wwwbase/img/medals/programmer3.png
    M wwwbase/img/medals/social.png
    M wwwbase/img/medals/sponsor.png
    M wwwbase/img/medals/volunteer1.png
    M wwwbase/img/medals/volunteer2.png
    M wwwbase/img/medals/volunteer3.png
    M wwwbase/img/medals/volunteer4.png
    M wwwbase/img/medals/volunteer5.png
    M wwwbase/img/medals/wotd.png

  Log Message:
  -----------
  Refs #316: add medals with 3D ribbon


  Commit: 570dc58479be3002982ef318a9d6af651df8ac5f
      https://github.com/CatalinFrancu/dexonline/commit/570dc58479be3002982ef318a9d6af651df8ac5f
  Author: Sonia Andriu <sonia.andriu at eaudeweb.ro>
  Date:   2014-03-26 (Wed, 26 Mar 2014)

  Changed paths:
    M dex.conf.sample
    M docs/abbrev.conf
    A docs/nginx.conf.sample
    M phplib/OS.php
    M phplib/smarty/Smarty.class.php
    M phplib/smarty/Smarty_Compiler.class.php
    M phplib/util.php
    M templates/common/search.ihtml
    M tools/getWotdImageByEmail.php
    M tools/git-hooks/post-merge.sh
    M wwwbase/.htaccess.sample
    M wwwbase/admin/index.php
    M wwwbase/admin/visual.php
    M wwwbase/admin/visualTag.php
    M wwwbase/elfinder-connector/wotd_connector.php
    M wwwbase/js/dex.js
    M wwwbase/randomList.php
    M wwwbase/search.php

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/CatalinFrancu/dexonline


Compare: https://github.com/CatalinFrancu/dexonline/compare/95bab7d50ace...570dc58479be