[dev] [dexonline/dexonline] f69585: Remove paradigm.php. Addresses #529.

Sat Dec 31 12:10:18 EET 2016

  Branch: refs/heads/master
  Home:   https://github.com/dexonline/dexonline
  Commit: f69585d3eff8b64c8bbe50dee935442a01389100
      https://github.com/dexonline/dexonline/commit/f69585d3eff8b64c8bbe50dee935442a01389100
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2016-11-18 (Fri, 18 Nov 2016)

  Changed paths:
    M docs/nginx.conf.sample
    M templates/bits/multiParadigm.tpl
    M templates/search.tpl
    M wwwbase/.htaccess.sample
    A wwwbase/js/autoload/search.js
    M wwwbase/js/dex.js
    R wwwbase/paradigm.php
    M wwwbase/search.php

  Log Message:
  -----------
  Remove paradigm.php. Addresses #529.


  Commit: 4fc00b51899c61ff891226605d46ce20593cc364
      https://github.com/dexonline/dexonline/commit/4fc00b51899c61ff891226605d46ce20593cc364
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2016-11-18 (Fri, 18 Nov 2016)

  Changed paths:
    M phplib/util.php
    M templates/search.tpl
    M wwwbase/css/paradigm.css
    R wwwbase/js/autoload/search.js
    M wwwbase/search.php

  Log Message:
  -----------
  Introduce Bootstrap tabs on the search page. Addresses #529.


  Commit: 83ef07373c45284621eb70de86940a46dd01740d
      https://github.com/dexonline/dexonline/commit/83ef07373c45284621eb70de86940a46dd01740d
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2016-11-18 (Fri, 18 Nov 2016)

  Changed paths:
    M phplib/util.php
    M templates/acuratete.tpl
    M templates/admin/definitionEdit.tpl
    A templates/bits/count.tpl
    M templates/bits/sourceDropDown.tpl
    M templates/contribuie.tpl
    M templates/search.tpl
    M wwwbase/admin/viewPendingDefinitions.php
    M wwwbase/admin/viewTypos.php
    M wwwbase/search.php

  Log Message:
  -----------
  Simplify search.php and search.tpl. Work in progress. Addresses #529.


  Commit: 869a35fbf2c39a21aa1e1200a092ad3bacd40389
      https://github.com/dexonline/dexonline/commit/869a35fbf2c39a21aa1e1200a092ad3bacd40389
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2016-11-20 (Sun, 20 Nov 2016)

  Changed paths:
    M phplib/SearchResult.php
    M phplib/StringUtil.php
    M phplib/models/Definition.php
    M phplib/models/Lexem.php
    M phplib/util.php
    M templates/bits/count.tpl
    M templates/search.tpl
    M wwwbase/.htaccess.sample
    M wwwbase/search.php

  Log Message:
  -----------
  Refactor search.tpl and search.php.


  Commit: 492d5cf7b8b0a78de91290780c6f8d59e462f793
      https://github.com/dexonline/dexonline/commit/492d5cf7b8b0a78de91290780c6f8d59e462f793
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2016-11-20 (Sun, 20 Nov 2016)

  Changed paths:
    M phplib/models/Definition.php
    M phplib/models/Entry.php
    M phplib/models/Lexem.php
    M templates/bits/multiParadigm.tpl
    M templates/search.tpl
    M wwwbase/css/paradigm.css
    M wwwbase/search.php

  Log Message:
  -----------
  Use entries instead of lexems in searches. Addresses #529. Work in progress.


  Commit: e9f64242030692be0d0f3c4f6e2d41be36f62fc0
      https://github.com/dexonline/dexonline/commit/e9f64242030692be0d0f3c4f6e2d41be36f62fc0
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2016-11-21 (Mon, 21 Nov 2016)

  Changed paths:
    M phplib/models/Entry.php

  Log Message:
  -----------
  Preserve lexem order for entries.


  Commit: a5cb4b42d9b69ee30b10e11fe651690cbec77bda
      https://github.com/dexonline/dexonline/commit/a5cb4b42d9b69ee30b10e11fe651690cbec77bda
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2016-11-21 (Mon, 21 Nov 2016)

  Changed paths:
    M phplib/models/Definition.php
    M phplib/models/Entry.php
    M phplib/models/Lexem.php
    M phplib/models/NGram.php
    M phplib/models/Visual.php
    M phplib/models/WikiArticle.php
    M phplib/util.php
    M templates/search.tpl
    M wwwbase/.htaccess.sample
    M wwwbase/css/autoload/search.css
    M wwwbase/search.php

  Log Message:
  -----------
  Use entries instead of lexems in searches. Addresses #529.


  Commit: 4eb79e16916ba7024392cf42d00e1f15c8fb238f
      https://github.com/dexonline/dexonline/commit/4eb79e16916ba7024392cf42d00e1f15c8fb238f
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2016-11-21 (Mon, 21 Nov 2016)

  Changed paths:
    A patches/00197.sql

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


  Commit: b8b2e720ddfd7ed654e36994a1f0789a55267cc7
      https://github.com/dexonline/dexonline/commit/b8b2e720ddfd7ed654e36994a1f0789a55267cc7
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2016-11-21 (Mon, 21 Nov 2016)

  Changed paths:
    M phplib/models/Definition.php
    M wwwbase/search.php

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


  Commit: 011c1646a45e3a281e55e934fe0946bd3de77e66
      https://github.com/dexonline/dexonline/commit/011c1646a45e3a281e55e934fe0946bd3de77e66
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2016-11-23 (Wed, 23 Nov 2016)

  Changed paths:
    M phplib/models/Entry.php
    M wwwbase/admin/bulkReplace.php
    M wwwbase/css/meaningTree.css
    M wwwbase/js/meaningTree.js
    M wwwbase/js/third-party/jquery.textcomplete.min.js
    M wwwbase/js/third-party/jquery.textcomplete.min.map

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


  Commit: a0addf29014ef078cc7059d86beb34354e602b5a
      https://github.com/dexonline/dexonline/commit/a0addf29014ef078cc7059d86beb34354e602b5a
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2016-11-23 (Wed, 23 Nov 2016)

  Changed paths:
    M phplib/SearchResult.php
    M phplib/models/Entry.php
    M templates/admin/structChooseEntry.tpl
    A templates/bits/definitionList.tpl
    A templates/bits/editableMeaningTree.tpl
    A templates/bits/entry.tpl
    R templates/bits/entryLink.tpl
    M templates/bits/lexemName.tpl
    M templates/bits/meaningTree.tpl
    M templates/editEntry.tpl
    M templates/editTree.tpl
    M templates/search.tpl
    M wwwbase/admin/viewUnassociatedTrees.php
    M wwwbase/css/autoload/search.css
    M wwwbase/editEntry.php
    M wwwbase/search.php

  Log Message:
  -----------
  Show trees when available. Addresses #529.


  Commit: df3b3d56d682fcb1bdf0ca6af60de7c8e2cdc898
      https://github.com/dexonline/dexonline/commit/df3b3d56d682fcb1bdf0ca6af60de7c8e2cdc898
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2016-11-23 (Wed, 23 Nov 2016)

  Changed paths:
    M wwwbase/search.php

  Log Message:
  -----------
  Only show trees for structured / under review entries. Addresses #529.


  Commit: e7070954ffd002fc96e4125bed5f4aa4ac455f73
      https://github.com/dexonline/dexonline/commit/e7070954ffd002fc96e4125bed5f4aa4ac455f73
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2016-11-23 (Wed, 23 Nov 2016)

  Changed paths:
    M phplib/SmartyWrap.php
    M templates/bits/meaningTree.tpl
    A wwwbase/css/editableMeaningTree.css
    M wwwbase/css/meaningTree.css
    M wwwbase/editTree.php

  Log Message:
  -----------
  Meaning tree formatting. Addresses #529.


  Commit: 6c3d419d072d67af1128830ac90d833b7b2f78b8
      https://github.com/dexonline/dexonline/commit/6c3d419d072d67af1128830ac90d833b7b2f78b8
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2016-11-24 (Thu, 24 Nov 2016)

  Changed paths:
    M wwwbase/search.php

  Log Message:
  -----------
  Remove unneeded flash message.


  Commit: cc881fee9a76a784b767d5efec5813e4d2ebbcac
      https://github.com/dexonline/dexonline/commit/cc881fee9a76a784b767d5efec5813e4d2ebbcac
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2016-11-24 (Thu, 24 Nov 2016)

  Changed paths:
    M templates/search.tpl
    M wwwbase/search.php

  Log Message:
  -----------
  Minor fixes. Addresses #529.


  Commit: f822ea01a7f4c0f91d50927b5dc22840b1d1edd3
      https://github.com/dexonline/dexonline/commit/f822ea01a7f4c0f91d50927b5dc22840b1d1edd3
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2016-11-26 (Sat, 26 Nov 2016)

  Changed paths:
    M phplib/AdminStringUtil.php
    M wwwbase/css/main.css

  Log Message:
  -----------
  Add a maker (__) for emphasized text. Fixes #533.


  Commit: 38378cb9f7075711433dd15994c349c19c178ec6
      https://github.com/dexonline/dexonline/commit/38378cb9f7075711433dd15994c349c19c178ec6
  Author: Sonia Frâncu <sonia at andriu.ro>
  Date:   2016-12-01 (Thu, 01 Dec 2016)

  Changed paths:
    M templates/search.tpl

  Log Message:
  -----------
  Refs #532: add callout class for number of structured definitions


  Commit: 59e34c7726dc64a7e648bb003ff65cc8a7836a66
      https://github.com/dexonline/dexonline/commit/59e34c7726dc64a7e648bb003ff65cc8a7836a66
  Author: Sonia Frâncu <sonia at andriu.ro>
  Date:   2016-12-01 (Thu, 01 Dec 2016)

  Changed paths:
    M templates/search.tpl

  Log Message:
  -----------
  Refs #532: typo: closing tag for p was missing


  Commit: 80b5fc5234e1ce795f6203869ee739d08e4e0bd3
      https://github.com/dexonline/dexonline/commit/80b5fc5234e1ce795f6203869ee739d08e4e0bd3
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2016-12-01 (Thu, 01 Dec 2016)

  Changed paths:
    A patches/00198.sql
    A patches/00199.php
    A patches/00200.sql
    A patches/00201.php
    M phplib/models/Lexem.php
    M phplib/models/Meaning.php
    M phplib/util.php
    M templates/bits/editableMeaningTree.tpl
    M templates/bits/meaningTree.tpl
    M templates/bits/phpConstants.tpl
    M templates/editTree.tpl
    M templates/istoria-definitiei.tpl
    A wwwbase/css/autoload/editTree.css
    M wwwbase/css/editableMeaningTree.css
    M wwwbase/css/main.css
    M wwwbase/css/meaningTree.css
    M wwwbase/editTree.php
    M wwwbase/istoria-definitiei.php
    A wwwbase/js/autoload/istoria-definitiei.js
    M wwwbase/js/meaningTree.js

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


  Commit: e76ee672aca393220a810cc418807eb7ab6708d8
      https://github.com/dexonline/dexonline/commit/e76ee672aca393220a810cc418807eb7ab6708d8
  Author: Sonia Frâncu <sonia at andriu.ro>
  Date:   2016-12-01 (Thu, 01 Dec 2016)

  Changed paths:
    M templates/search.tpl
    M wwwbase/config.json
    M wwwbase/css/bootstrap.min.css

  Log Message:
  -----------
  Refs #532: style button for _arată toate definițiile_


  Commit: 13e9e70ae5aafbc08d4f4edd7ce3d807f7cbc064
      https://github.com/dexonline/dexonline/commit/13e9e70ae5aafbc08d4f4edd7ce3d807f7cbc064
  Author: Sonia Frâncu <sonia at andriu.ro>
  Date:   2016-12-01 (Thu, 01 Dec 2016)

  Changed paths:
    A patches/00198.sql
    A patches/00199.php
    A patches/00200.sql
    A patches/00201.php
    M phplib/models/Lexem.php
    M phplib/models/Meaning.php
    M phplib/util.php
    M templates/bits/editableMeaningTree.tpl
    M templates/bits/meaningTree.tpl
    M templates/bits/phpConstants.tpl
    M templates/editTree.tpl
    M templates/istoria-definitiei.tpl
    A wwwbase/css/autoload/editTree.css
    M wwwbase/css/editableMeaningTree.css
    M wwwbase/css/main.css
    M wwwbase/css/meaningTree.css
    M wwwbase/editTree.php
    M wwwbase/istoria-definitiei.php
    A wwwbase/js/autoload/istoria-definitiei.js
    M wwwbase/js/meaningTree.js

  Log Message:
  -----------
  Merge branch 'entriesInSeach' of https://github.com/dexonline/dexonline into entriesInSeach


  Commit: 1a7506115ff86e75dbae5b14701a2bfb50ea7c29
      https://github.com/dexonline/dexonline/commit/1a7506115ff86e75dbae5b14701a2bfb50ea7c29
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2016-12-01 (Thu, 01 Dec 2016)

  Changed paths:
    M templates/bits/doneaza-la-ce-folosim.tpl
    M templates/search.tpl

  Log Message:
  -----------
  Minor fixes. Addresses #532.


  Commit: dfff092c12056b060cd5002def4c9b03f7e43be8
      https://github.com/dexonline/dexonline/commit/dfff092c12056b060cd5002def4c9b03f7e43be8
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2016-12-05 (Mon, 05 Dec 2016)

  Changed paths:
    M patches/00201.php
    R templates/bits/definitionList.tpl
    M templates/bits/entry.tpl
    R templates/bits/gallery.tpl
    M templates/hangman.tpl
    M templates/search.tpl
    A templates/search/definitionList.tpl
    A templates/search/entryList.tpl
    A templates/search/entryToc.tpl
    A templates/search/extendToAllSources.tpl
    A templates/search/fullTextLock.tpl
    A templates/search/gallery.tpl
    A templates/search/lexemList.tpl
    A templates/search/missingDefinitionWarnings.tpl
    A templates/search/showAllLink.tpl
    A templates/search/trees.tpl
    A templates/search/wikiArticles.tpl
    M wwwbase/search.php

  Log Message:
  -----------
  Rework search.tpl and search.php for clarity.


  Commit: 7392af02bb3ae179b35eea0f574a9ecd02dac777
      https://github.com/dexonline/dexonline/commit/7392af02bb3ae179b35eea0f574a9ecd02dac777
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2016-12-05 (Mon, 05 Dec 2016)

  Changed paths:
    M templates/search.tpl

  Log Message:
  -----------
  Reword tab name. Addresses #532.


  Commit: 64d59f47e4b2cb02b60f52e7789e66cbb389f1cd
      https://github.com/dexonline/dexonline/commit/64d59f47e4b2cb02b60f52e7789e66cbb389f1cd
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2016-12-06 (Tue, 06 Dec 2016)

  Changed paths:
    M phplib/models/Meaning.php
    M phplib/models/ObjectTag.php
    A tools/migrateEtymologies.php

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


  Commit: 2f6b65d5a1d728384764780131cea914a5438321
      https://github.com/dexonline/dexonline/commit/2f6b65d5a1d728384764780131cea914a5438321
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2016-12-06 (Tue, 06 Dec 2016)

  Changed paths:
    M wwwbase/search.php

  Log Message:
  -----------
  Add a TODO for a minor bug.


  Commit: c4544902ce1f74da02334e8046c10ae58cefb979
      https://github.com/dexonline/dexonline/commit/c4544902ce1f74da02334e8046c10ae58cefb979
  Author: Sonia Frâncu <sonia at andriu.ro>
  Date:   2016-12-14 (Wed, 14 Dec 2016)

  Changed paths:
    M phplib/models/Meaning.php
    M templates/bits/meaningTree.tpl
    M wwwbase/css/meaningTree.css

  Log Message:
  -----------
  Refs #537: increase font for meanings and submeanings


  Commit: e07fbbe0eb0ac2a278da1f52ebbd825c750498ea
      https://github.com/dexonline/dexonline/commit/e07fbbe0eb0ac2a278da1f52ebbd825c750498ea
  Author: Sonia Frâncu <sonia at andriu.ro>
  Date:   2016-12-14 (Wed, 14 Dec 2016)

  Changed paths:
    M wwwbase/css/meaningTree.css

  Log Message:
  -----------
  Refs #537: more focus on sources, less on labels


  Commit: ca9efda8576ba734f4f583556daaffcdcdfd680d
      https://github.com/dexonline/dexonline/commit/ca9efda8576ba734f4f583556daaffcdcdfd680d
  Author: Sonia Frâncu <sonia at andriu.ro>
  Date:   2016-12-14 (Wed, 14 Dec 2016)

  Changed paths:
    M wwwbase/css/meaningTree.css

  Log Message:
  -----------
  Refs #537: highlight examples text


  Commit: 3478b36259a70715f36a9b0f3ec1be4fb11e43b3
      https://github.com/dexonline/dexonline/commit/3478b36259a70715f36a9b0f3ec1be4fb11e43b3
  Author: Sonia Frâncu <sonia at andriu.ro>
  Date:   2016-12-14 (Wed, 14 Dec 2016)

  Changed paths:
    M wwwbase/css/meaningTree.css

  Log Message:
  -----------
  Refs #537: correct vertical space between meanings


  Commit: 20cd3122e1605d63e9fda3ce847dd1a27a09b7b0
      https://github.com/dexonline/dexonline/commit/20cd3122e1605d63e9fda3ce847dd1a27a09b7b0
  Author: Sonia Frâncu <sonia at andriu.ro>
  Date:   2016-12-14 (Wed, 14 Dec 2016)

  Changed paths:
    M wwwbase/css/meaningTree.css

  Log Message:
  -----------
  FRefs #537 remove extra top-space for 1st meaning


  Commit: ccb7988471e048765618aa2fc97bc43b58b440a8
      https://github.com/dexonline/dexonline/commit/ccb7988471e048765618aa2fc97bc43b58b440a8
  Author: Sonia Frâncu <sonia at andriu.ro>
  Date:   2016-12-14 (Wed, 14 Dec 2016)

  Changed paths:
    M wwwbase/css/meaningTree.css

  Log Message:
  -----------
  Refs #537 more highlight for each meaning and tree


  Commit: 20ae39d19567df726bad6b555e89e22cf4915538
      https://github.com/dexonline/dexonline/commit/20ae39d19567df726bad6b555e89e22cf4915538
  Author: Sonia Frâncu <sonia at andriu.ro>
  Date:   2016-12-14 (Wed, 14 Dec 2016)

  Changed paths:
    M wwwbase/css/meaningTree.css

  Log Message:
  -----------
  Refs #537 extra white space for TOC meanings


  Commit: 7f203ada70aacc62bc8052e53725fe2efe9907d2
      https://github.com/dexonline/dexonline/commit/7f203ada70aacc62bc8052e53725fe2efe9907d2
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2016-12-22 (Thu, 22 Dec 2016)

  Changed paths:
    M phplib/models/Tree.php
    M templates/bits/meaningTree.tpl
    M templates/search/trees.tpl
    M wwwbase/search.php

  Log Message:
  -----------
  Extract etymologies and show them at the end. Addresses #537.


  Commit: 2d50687b98a336373321a884d0058907612fe8e7
      https://github.com/dexonline/dexonline/commit/2d50687b98a336373321a884d0058907612fe8e7
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2016-12-22 (Thu, 22 Dec 2016)

  Changed paths:
    M docs/abbrev/dex98.conf
    M phplib/models/Entry.php
    M phplib/models/Meaning.php
    M phplib/models/Tag.php
    A phplib/third-party/PHP-parsing-tool/Examples/ArithmeticExpressionParser.php
    A phplib/third-party/PHP-parsing-tool/Examples/CSVParser.php
    A phplib/third-party/PHP-parsing-tool/Examples/JSONFormater.php
    A phplib/third-party/PHP-parsing-tool/Examples/JSONParser.php
    A phplib/third-party/PHP-parsing-tool/Extension/Base.php
    A phplib/third-party/PHP-parsing-tool/Extension/Choice.php
    A phplib/third-party/PHP-parsing-tool/Extension/Integer.php
    A phplib/third-party/PHP-parsing-tool/Extension/Interface.php
    A phplib/third-party/PHP-parsing-tool/Extension/ItemRestrictions.php
    A phplib/third-party/PHP-parsing-tool/Extension/ItemRestrictions/Contain.php
    A phplib/third-party/PHP-parsing-tool/Extension/ItemRestrictions/FollowedBy.php
    A phplib/third-party/PHP-parsing-tool/Extension/ItemRestrictions/Is.php
    A phplib/third-party/PHP-parsing-tool/Extension/ItemRestrictions/ItemRestrictionAnd.php
    A phplib/third-party/PHP-parsing-tool/Extension/ItemRestrictions/ItemRestrictionInterface.php
    A phplib/third-party/PHP-parsing-tool/Extension/ItemRestrictions/ItemRestrictionNot.php
    A phplib/third-party/PHP-parsing-tool/Extension/ItemRestrictions/ItemRestrictionOr.php
    A phplib/third-party/PHP-parsing-tool/Extension/Lookahead.php
    A phplib/third-party/PHP-parsing-tool/Extension/Regex.php
    A phplib/third-party/PHP-parsing-tool/Extension/RuleCondition.php
    A phplib/third-party/PHP-parsing-tool/Extension/SequenceItem.php
    A phplib/third-party/PHP-parsing-tool/Extension/Series.php
    A phplib/third-party/PHP-parsing-tool/Extension/String.php
    A phplib/third-party/PHP-parsing-tool/Extension/Text.php
    A phplib/third-party/PHP-parsing-tool/Extension/TextNode.php
    A phplib/third-party/PHP-parsing-tool/Extension/Time.php
    A phplib/third-party/PHP-parsing-tool/Extension/Unorder.php
    A phplib/third-party/PHP-parsing-tool/Extension/WhiteCharactersContext.php
    A phplib/third-party/PHP-parsing-tool/GrammarNode/AnyText.php
    A phplib/third-party/PHP-parsing-tool/GrammarNode/BaseNode.php
    A phplib/third-party/PHP-parsing-tool/GrammarNode/Branch.php
    A phplib/third-party/PHP-parsing-tool/GrammarNode/BranchDecorator.php
    A phplib/third-party/PHP-parsing-tool/GrammarNode/BranchExtraCondition.php
    A phplib/third-party/PHP-parsing-tool/GrammarNode/BranchFactory.php
    A phplib/third-party/PHP-parsing-tool/GrammarNode/BranchInterface.php
    A phplib/third-party/PHP-parsing-tool/GrammarNode/BranchStringCondition.php
    A phplib/third-party/PHP-parsing-tool/GrammarNode/Choice.php
    A phplib/third-party/PHP-parsing-tool/GrammarNode/Decorator.php
    A phplib/third-party/PHP-parsing-tool/GrammarNode/ErrorTrackDecorator.php
    A phplib/third-party/PHP-parsing-tool/GrammarNode/ItemRestrictions.php
    A phplib/third-party/PHP-parsing-tool/GrammarNode/LeafInterface.php
    A phplib/third-party/PHP-parsing-tool/GrammarNode/LeafTime.php
    A phplib/third-party/PHP-parsing-tool/GrammarNode/Lookahead.php
    A phplib/third-party/PHP-parsing-tool/GrammarNode/NaiveBranch.php
    A phplib/third-party/PHP-parsing-tool/GrammarNode/NodeInterface.php
    A phplib/third-party/PHP-parsing-tool/GrammarNode/Numeric.php
    A phplib/third-party/PHP-parsing-tool/GrammarNode/PEGBranch.php
    A phplib/third-party/PHP-parsing-tool/GrammarNode/PredefinedSimpleString.php
    A phplib/third-party/PHP-parsing-tool/GrammarNode/PredefinedString.php
    A phplib/third-party/PHP-parsing-tool/GrammarNode/Regex.php
    A phplib/third-party/PHP-parsing-tool/GrammarNode/Series.php
    A phplib/third-party/PHP-parsing-tool/GrammarNode/Text.php
    A phplib/third-party/PHP-parsing-tool/GrammarNode/TextS.php
    A phplib/third-party/PHP-parsing-tool/GrammarNode/Unorder.php
    A phplib/third-party/PHP-parsing-tool/GrammarNode/WhitespaceContextCheck.php
    A phplib/third-party/PHP-parsing-tool/GrammarNode/WhitespaceNegativeContextCheck.php
    A phplib/third-party/PHP-parsing-tool/GrammarParser.php
    A phplib/third-party/PHP-parsing-tool/Parser.php
    A phplib/third-party/PHP-parsing-tool/RegexUtil.php
    A phplib/third-party/PHP-parsing-tool/SyntaxTreeNode/Base.php
    A phplib/third-party/PHP-parsing-tool/SyntaxTreeNode/Branch.php
    A phplib/third-party/PHP-parsing-tool/SyntaxTreeNode/Leaf.php
    A phplib/third-party/PHP-parsing-tool/SyntaxTreeNode/LeafTime.php
    A phplib/third-party/PHP-parsing-tool/SyntaxTreeNode/Numeric.php
    A phplib/third-party/PHP-parsing-tool/SyntaxTreeNode/PredefinedString.php
    A phplib/third-party/PHP-parsing-tool/SyntaxTreeNode/Root.php
    A phplib/third-party/PHP-parsing-tool/SyntaxTreeNode/Series.php
    M templates/bits/ifArray.tpl
    M templates/bits/phpConstants.tpl
    M templates/bits/structStatus.tpl
    A templates/bits/structStatusRadio.tpl
    M templates/editEntry.tpl
    M templates/editTree.tpl
    M templates/search.tpl
    A tools/fixDex98Trees.php
    R tools/migrateEtymologies.php
    A tools/old/migrateEtymologies.php
    A tools/old/structureDex98.php
    A tools/old/structureDor.php
    R tools/structureDor.php
    M wwwbase/admin/index.php
    M wwwbase/ajax/meaningMention.php
    M wwwbase/css/paradigm.css
    M wwwbase/editEntry.php
    M wwwbase/editTree.php
    A wwwbase/js/autoload/search.js
    M wwwbase/js/hotkeys.js
    M wwwbase/js/meaningTree.js

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


  Commit: 3e2702fae14f1878d811bef735309792118a279a
      https://github.com/dexonline/dexonline/commit/3e2702fae14f1878d811bef735309792118a279a
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2016-12-22 (Thu, 22 Dec 2016)

  Changed paths:
    M templates/bits/meaningTree.tpl

  Log Message:
  -----------
  Fix broken links from synonyms.


  Commit: c7a3fdbd48b5889feeda3329256fc9ada89120b6
      https://github.com/dexonline/dexonline/commit/c7a3fdbd48b5889feeda3329256fc9ada89120b6
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2016-12-24 (Sat, 24 Dec 2016)

  Changed paths:
    M templates/bits/meaningTree.tpl

  Log Message:
  -----------
  Mark primary and secondary meanings. Addresses #537.


  Commit: 3c496316aabe1793c5dc35c4ac69b9cccc1624ce
      https://github.com/dexonline/dexonline/commit/3c496316aabe1793c5dc35c4ac69b9cccc1624ce
  Author: Sonia Frâncu <sonia at andriu.ro>
  Date:   2016-12-26 (Mon, 26 Dec 2016)

  Changed paths:
    M wwwbase/css/meaningTree.css

  Log Message:
  -----------
  Refs #537: add gray colour for main trees


  Commit: 6ff22f660549d1e846b6c2f2dc18026cef1ebeac
      https://github.com/dexonline/dexonline/commit/6ff22f660549d1e846b6c2f2dc18026cef1ebeac
  Author: Sonia Frâncu <sonia at andriu.ro>
  Date:   2016-12-26 (Mon, 26 Dec 2016)

  Changed paths:
    M wwwbase/css/meaningTree.css

  Log Message:
  -----------
  Refs #537: more focus on primary meanings


  Commit: 85c406b66d82f97c555ec3417ee600439a06cb8b
      https://github.com/dexonline/dexonline/commit/85c406b66d82f97c555ec3417ee600439a06cb8b
  Author: Sonia Frâncu <sonia at andriu.ro>
  Date:   2016-12-28 (Wed, 28 Dec 2016)

  Changed paths:
    M wwwbase/css/meaningTree.css

  Log Message:
  -----------
  Refs #537: more focus on meanings


  Commit: 1faeba9906bab32f752f9aa91f1628fa1fa05a37
      https://github.com/dexonline/dexonline/commit/1faeba9906bab32f752f9aa91f1628fa1fa05a37
  Author: Sonia Frâncu <sonia at andriu.ro>
  Date:   2016-12-28 (Wed, 28 Dec 2016)

  Changed paths:
    M wwwbase/css/meaningTree.css

  Log Message:
  -----------
  Refs #537 more focus on examples


  Commit: 01f2a737ccfece5f9f800c4c30db78778e8e5f07
      https://github.com/dexonline/dexonline/commit/01f2a737ccfece5f9f800c4c30db78778e8e5f07
  Author: Sonia Frâncu <sonia at andriu.ro>
  Date:   2016-12-28 (Wed, 28 Dec 2016)

  Changed paths:
    M wwwbase/css/meaningTree.css

  Log Message:
  -----------
  Refs #537 adapt trees for responsive design


  Commit: 0aaaff794d3935ca41860d1e31f9e2b7ea4b0595
      https://github.com/dexonline/dexonline/commit/0aaaff794d3935ca41860d1e31f9e2b7ea4b0595
  Author: Sonia Frâncu <sonia at andriu.ro>
  Date:   2016-12-28 (Wed, 28 Dec 2016)

  Changed paths:
    M wwwbase/css/meaningTree.css

  Log Message:
  -----------
  Refs #537 fix space between 2 synonyms


  Commit: 1f3c9a9bae6fab0c86feef12fb0be30353a81d78
      https://github.com/dexonline/dexonline/commit/1f3c9a9bae6fab0c86feef12fb0be30353a81d78
  Author: Sonia Frâncu <sonia at andriu.ro>
  Date:   2016-12-28 (Wed, 28 Dec 2016)

  Changed paths:
    M templates/search/trees.tpl
    M wwwbase/css/meaningTree.css

  Log Message:
  -----------
  Refs #537 style etymology


  Commit: 064cfb17a41fe9b6e649ae5a584d805230648707
      https://github.com/dexonline/dexonline/commit/064cfb17a41fe9b6e649ae5a584d805230648707
  Author: Sonia Frâncu <sonia at andriu.ro>
  Date:   2016-12-28 (Wed, 28 Dec 2016)

  Changed paths:
    M wwwbase/css/meaningTree.css

  Log Message:
  -----------
  Refs #537 simpler syntax for targeting meanings


  Commit: 6ffc625958d868064b948b3f6283b77931ce8ac3
      https://github.com/dexonline/dexonline/commit/6ffc625958d868064b948b3f6283b77931ce8ac3
  Author: Sonia Frâncu <sonia at andriu.ro>
  Date:   2016-12-30 (Fri, 30 Dec 2016)

  Changed paths:
    M wwwbase/css/meaningTree.css

  Log Message:
  -----------
  Refs #537 better spacing for example tag


  Commit: 830b185afca6b578a3a4c6e6be335b9c9a345368
      https://github.com/dexonline/dexonline/commit/830b185afca6b578a3a4c6e6be335b9c9a345368
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2016-12-30 (Fri, 30 Dec 2016)

  Changed paths:
    A patches/00202.sql
    M phplib/SearchResult.php
    M phplib/models/Association.php
    M phplib/models/EntryDefinition.php
    M phplib/models/Meaning.php
    M phplib/models/Tag.php
    M phplib/session.php
    M templates/admin/index.tpl
    M templates/admin/wotdTable.tpl
    M templates/bits/definition.tpl
    M templates/bits/navmenu.tpl
    A templates/bits/tagAncestors.tpl
    M templates/editEntry.tpl
    M templates/eticheta.tpl
    M templates/search/definitionList.tpl
    A tools/convertDiffTags.php
    R tools/fixDex98Trees.php
    A tools/old/fixDex98Trees.php
    A tools/structureDex09.php
    M tools/updateRandomWord.sh
    A wwwbase/admin/toggleWotdMode.php
    M wwwbase/css/autoload/index.css
    M wwwbase/editEntry.php
    M wwwbase/eticheta.php
    M wwwbase/istoria-definitiei.php
    M wwwbase/js/autoload/editEntry.js
    M wwwbase/js/hotkeys.js
    M wwwbase/js/select2Dev.js
    M wwwbase/search.php

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


  Commit: 4c6a9f10f51717079e9d0f5a05c257b94f1dcb92
      https://github.com/dexonline/dexonline/commit/4c6a9f10f51717079e9d0f5a05c257b94f1dcb92
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2016-12-30 (Fri, 30 Dec 2016)

  Changed paths:
    M dex.conf.sample
    M wwwbase/search.php

  Log Message:
  -----------
  Add a config option to hide meaning trees. Addresses #537.


  Commit: b32ab624acf494e6d85d3f531465849376558456
      https://github.com/dexonline/dexonline/commit/b32ab624acf494e6d85d3f531465849376558456
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2016-12-31 (Sat, 31 Dec 2016)

  Changed paths:
    M templates/editEntry.tpl
    M wwwbase/editEntry.php

  Log Message:
  -----------
  Show compact trees on the entry edit page. Addresses #537.


Compare: https://github.com/dexonline/dexonline/compare/79ee131ac714...b32ab624acf4