[dev] [CatalinFrancu/dexonline] b0a2ec: Refs #320: remove Source Sans Pro font, add Open S...

[GitHub via Dev]

  Branch: refs/heads/paradigm
  Home:   https://github.com/CatalinFrancu/dexonline
  Commit: b0a2ec681e0e13172e2c8487db4f9a6f09820011
      https://github.com/CatalinFrancu/dexonline/commit/b0a2ec681e0e13172e2c8487db4f9a6f09820011
  Author: Sonia Andriu <sonia.andriu at eaudeweb.ro>
  Date:   2014-05-19 (Mon, 19 May 2014)

  Changed paths:
    M templates/zepu/pageLayout.ihtml
    M wwwbase/styles/zepu.css

  Log Message:
  -----------
  Refs #320: remove Source Sans Pro font, add Open Sans


  Commit: dc96677f1eb2105fcada06f396e02beafcf01de8
      https://github.com/CatalinFrancu/dexonline/commit/dc96677f1eb2105fcada06f396e02beafcf01de8
  Author: Sonia Andriu <sonia.andriu at eaudeweb.ro>
  Date:   2014-05-19 (Mon, 19 May 2014)

  Changed paths:
    M dex.conf.sample
    A patches/00117.sql
    M phplib/StringUtil.php
    M phplib/db.php
    M phplib/models/Definition.php
    M phplib/util.php
    M templates/common/bits/wotdRssBlogItem.ihtml
    M templates/common/bits/wotdRssItem.ihtml
    M templates/common/faq.ihtml
    A templates/common/licenta.ihtml
    M templates/common/search.ihtml
    M tools/getWotdImageByEmail.php
    M tools/rebuildFullTextIndex.php
    M tools/rebuildLexemFrequencies.php
    M tools/syncWikiArticles.php
    M tools/syncWikiSections.php
    M tools/updateMirror.php
    M wwwbase/admin/definitionEdit.php
    M wwwbase/js/dex.js
    M wwwbase/js/wotd.js
    A wwwbase/licenta.php
    M wwwbase/robots.txt
    M wwwbase/search.php
    M wwwbase/stat/apc.php
    R wwwbase/stat/memcache.php
    M wwwbase/stat/sysstatgraph/importstatfiledata.php
    M wwwbase/update4.php
    M wwwbase/wotd.php

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


  Commit: 674e9f5b4d563064a0538eb038f092c5bb7b941b
      https://github.com/CatalinFrancu/dexonline/commit/674e9f5b4d563064a0538eb038f092c5bb7b941b
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2014-05-20 (Tue, 20 May 2014)

  Changed paths:
    M phplib/SmartyWrap.php

  Log Message:
  -----------
  Increment zepu.css version. Refs #320


  Commit: 22a605b81ea173cf5bfcda5b20be4037f460534b
      https://github.com/CatalinFrancu/dexonline/commit/22a605b81ea173cf5bfcda5b20be4037f460534b
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2014-05-22 (Thu, 22 May 2014)

  Changed paths:
    M phplib/DebugInfo.php
    M phplib/util.php
    M wwwbase/search.php

  Log Message:
  -----------
  Fix query log timer


  Commit: 7cf7a1861422129717f3ce3f7d50bae67742f480
      https://github.com/CatalinFrancu/dexonline/commit/7cf7a1861422129717f3ce3f7d50bae67742f480
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2014-05-23 (Fri, 23 May 2014)

  Changed paths:
    M wwwbase/search.php

  Log Message:
  -----------
  Prevent some redirect loops


  Commit: 5db282ae1447b96c1faf220378d2de4e57f14332
      https://github.com/CatalinFrancu/dexonline/commit/5db282ae1447b96c1faf220378d2de4e57f14332
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2014-05-24 (Sat, 24 May 2014)

  Changed paths:
    M phplib/DebugInfo.php
    M phplib/SmartyWrap.php
    M phplib/util.php
    M templates/zepu/pageLayout.ihtml
    M wwwbase/search.php
    M wwwbase/styles/zepu.css

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into paradigm

Conflicts:
	phplib/SmartyWrap.php


Compare: https://github.com/CatalinFrancu/dexonline/compare/5a6721323ed9...5db282ae1447