[dev] [CatalinFrancu/dexonline] c6d8da: Move some paradigm info into Lexem object properti...

GitHub via Dev dev at dexonline.ro
Mon Jun 16 15:39:08 EEST 2014


  Branch: refs/heads/master
  Home:   https://github.com/CatalinFrancu/dexonline
  Commit: c6d8dafdbdadc008365817b3077c683aa43e2427
      https://github.com/CatalinFrancu/dexonline/commit/c6d8dafdbdadc008365817b3077c683aa43e2427
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2014-02-23 (Sun, 23 Feb 2014)

  Changed paths:
    M phplib/models/Lexem.php
    M phplib/models/LexemSource.php
    M templates/common/bits/lexemTags.ihtml
    M templates/common/bits/multiParadigm.ihtml
    M wwwbase/paradigm.php

  Log Message:
  -----------
  Move some paradigm info into Lexem object properties.
This avoids the need to maintain a parallel dictionary structure.
Paradigm info is loaded lazily.


  Commit: 722ed775af0b53e30a2260d7c5cc07e46473c0d4
      https://github.com/CatalinFrancu/dexonline/commit/722ed775af0b53e30a2260d7c5cc07e46473c0d4
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2014-02-23 (Sun, 23 Feb 2014)

  Changed paths:
    M phplib/models/InflectedForm.php
    M phplib/models/Lexem.php
    M templates/common/bits/multiParadigm.ihtml
    M wwwbase/paradigm.php
    M wwwbase/search.php

  Log Message:
  -----------
  move inflected forms map to a property on the Lexem object


  Commit: 1515751e84e8edae51f555776d2fc2faeb931cb4
      https://github.com/CatalinFrancu/dexonline/commit/1515751e84e8edae51f555776d2fc2faeb931cb4
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2014-02-24 (Mon, 24 Feb 2014)

  Changed paths:
    M phplib/models/InflectedForm.php
    M phplib/models/Lexem.php
    M templates/common/update3Lexems.ihtml
    M templates/flex/mergeLexems.ihtml
    M templates/xmldump/lexem.ihtml
    M tools/dumpDatabaseXml.php
    M wwwbase/deprecated/update3.php
    M wwwbase/flex/mergeLexems.php
    M wwwbase/modele-flexiune.php

  Log Message:
  -----------
  Rewrite some queries to use Lexem properties instead of hash maps.


  Commit: c96d460253fdd929fc4bd7c37604c4c893c51500
      https://github.com/CatalinFrancu/dexonline/commit/c96d460253fdd929fc4bd7c37604c4c893c51500
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2014-02-24 (Mon, 24 Feb 2014)

  Changed paths:
    A patches/00117.sql
    M phplib/models/BaseObject.php
    M phplib/models/Definition.php
    M phplib/models/Lexem.php
    A phplib/models/LexemModel.php
    M phplib/models/LexemSource.php
    R templates/admin/definitionMigrate.ihtml
    A templates/common/bits/lexemModel.ihtml
    A templates/common/bits/lexemSources.ihtml
    R templates/common/bits/lexemTags.ihtml
    M templates/common/bits/locInfo.ihtml
    M templates/common/bits/multiParadigm.ihtml
    M templates/common/paradigm/6.0/paradigm.ihtml
    M templates/common/paradigm/6.0/paradigmA.ihtml
    M templates/common/paradigm/6.0/paradigmI.ihtml
    M templates/common/paradigm/6.0/paradigmN.ihtml
    M templates/common/paradigm/6.0/paradigmP.ihtml
    M templates/common/paradigm/6.0/paradigmT.ihtml
    M templates/common/paradigm/6.0/paradigmV.ihtml
    R wwwbase/admin/definitionMigrate.php
    M wwwbase/admin/index.php
    M wwwbase/admin/lexemSearch.php
    M wwwbase/paradigm.php
    M wwwbase/search.php
    M wwwbase/styles/common.css
    M wwwbase/styles/paradigm.css
    M wwwbase/styles/polar.css
    M wwwbase/styles/zepu.css

  Log Message:
  -----------
  Add the LexemModel table so lexems can have multiple paradigms.
Convert some code. Work in progress.


  Commit: 36d3a4092b98bb7fc2424e5941dc1c09af6f0965
      https://github.com/CatalinFrancu/dexonline/commit/36d3a4092b98bb7fc2424e5941dc1c09af6f0965
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2014-04-30 (Wed, 30 Apr 2014)

  Changed paths:
    R patches/00117.sql
    A patches/00118.sql

  Log Message:
  -----------
  rename patch


  Commit: 7bac073dfbbe059e7889886443498178c26d4792
      https://github.com/CatalinFrancu/dexonline/commit/7bac073dfbbe059e7889886443498178c26d4792
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2014-04-30 (Wed, 30 Apr 2014)

  Changed paths:
    M phplib/models/Lexem.php
    M phplib/models/LexemSource.php
    M templates/common/bits/lexemTags.ihtml
    M templates/common/bits/multiParadigm.ihtml
    M wwwbase/paradigm.php

  Log Message:
  -----------
  Move some paradigm info into Lexem object properties.
This avoids the need to maintain a parallel dictionary structure.
Paradigm info is loaded lazily.


  Commit: f86197b048c74b3ca79e50d78e86d6a7fd2c17f0
      https://github.com/CatalinFrancu/dexonline/commit/f86197b048c74b3ca79e50d78e86d6a7fd2c17f0
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2014-04-30 (Wed, 30 Apr 2014)

  Changed paths:
    M phplib/models/InflectedForm.php
    M phplib/models/Lexem.php
    M templates/common/bits/multiParadigm.ihtml
    M wwwbase/paradigm.php
    M wwwbase/search.php

  Log Message:
  -----------
  move inflected forms map to a property on the Lexem object


  Commit: 6863f0618acd1c48fcb633886dc94a83a18c2f0f
      https://github.com/CatalinFrancu/dexonline/commit/6863f0618acd1c48fcb633886dc94a83a18c2f0f
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2014-04-30 (Wed, 30 Apr 2014)

  Changed paths:
    M phplib/models/InflectedForm.php
    M phplib/models/Lexem.php
    M templates/common/update3Lexems.ihtml
    M templates/flex/mergeLexems.ihtml
    M templates/xmldump/lexem.ihtml
    M tools/dumpDatabaseXml.php
    M wwwbase/deprecated/update3.php
    M wwwbase/flex/mergeLexems.php
    M wwwbase/modele-flexiune.php

  Log Message:
  -----------
  Rewrite some queries to use Lexem properties instead of hash maps.


  Commit: 09c317e8e789a765ccb19789d8df5f7511a71c09
      https://github.com/CatalinFrancu/dexonline/commit/09c317e8e789a765ccb19789d8df5f7511a71c09
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2014-04-30 (Wed, 30 Apr 2014)

  Changed paths:
    M phplib/models/BaseObject.php
    M phplib/models/Definition.php
    M phplib/models/Lexem.php
    A phplib/models/LexemModel.php
    M phplib/models/LexemSource.php
    R templates/admin/definitionMigrate.ihtml
    A templates/common/bits/lexemModel.ihtml
    A templates/common/bits/lexemSources.ihtml
    R templates/common/bits/lexemTags.ihtml
    M templates/common/bits/locInfo.ihtml
    M templates/common/bits/multiParadigm.ihtml
    M templates/common/paradigm/6.0/paradigm.ihtml
    M templates/common/paradigm/6.0/paradigmA.ihtml
    M templates/common/paradigm/6.0/paradigmI.ihtml
    M templates/common/paradigm/6.0/paradigmN.ihtml
    M templates/common/paradigm/6.0/paradigmP.ihtml
    M templates/common/paradigm/6.0/paradigmT.ihtml
    M templates/common/paradigm/6.0/paradigmV.ihtml
    R wwwbase/admin/definitionMigrate.php
    M wwwbase/admin/index.php
    M wwwbase/admin/lexemSearch.php
    M wwwbase/paradigm.php
    M wwwbase/search.php
    M wwwbase/styles/common.css
    M wwwbase/styles/paradigm.css
    M wwwbase/styles/polar.css
    M wwwbase/styles/zepu.css

  Log Message:
  -----------
  Add the LexemModel table so lexems can have multiple paradigms.
Convert some code. Work in progress.


  Commit: 0c58488033a077e98b3113e0e1a7ce206ece19bb
      https://github.com/CatalinFrancu/dexonline/commit/0c58488033a077e98b3113e0e1a7ce206ece19bb
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2014-04-30 (Wed, 30 Apr 2014)

  Changed paths:
    R patches/00117.sql
    A patches/00118.sql

  Log Message:
  -----------
  rename patch


  Commit: fcd0f026abf38c121e1e64b8f251aee8d8c1485d
      https://github.com/CatalinFrancu/dexonline/commit/fcd0f026abf38c121e1e64b8f251aee8d8c1485d
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2014-04-30 (Wed, 30 Apr 2014)

  Changed paths:
    M patches/00118.sql

  Log Message:
  -----------
  Fix merge conflict


  Commit: ef0a138b45efa2084f8d793797c83262e047c55a
      https://github.com/CatalinFrancu/dexonline/commit/ef0a138b45efa2084f8d793797c83262e047c55a
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2014-04-30 (Wed, 30 Apr 2014)

  Changed paths:
    A patches/00117.sql

  Log Message:
  -----------
  Ooops, accidentally deteled a patch file during merge


  Commit: 81244f1923e726682354718a614b60193a33d541
      https://github.com/CatalinFrancu/dexonline/commit/81244f1923e726682354718a614b60193a33d541
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2014-04-30 (Wed, 30 Apr 2014)

  Changed paths:
    M phplib/session.php

  Log Message:
  -----------
  Remove transitional code.


  Commit: 20f55dc0108beda0e784725ec4cc1c5d1071d065
      https://github.com/CatalinFrancu/dexonline/commit/20f55dc0108beda0e784725ec4cc1c5d1071d065
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2014-04-30 (Wed, 30 Apr 2014)

  Changed paths:
    M patches/00118.sql
    A patches/00119.sql
    M phplib/AdminStringUtil.php
    R phplib/Structure.php
    M phplib/models/LexemModel.php
    M phplib/models/WikiArticle.php
    R phplib/structure/dex98.php
    M templates/common/bits/lexemModel.ihtml
    M templates/common/bits/multiParadigm.ihtml
    M templates/common/modele-flexiune.ihtml
    M templates/xmldump/lexem.ihtml
    R tools/addScribanAsterisk.php
    R tools/bulk/fixMultiLexems.php
    M tools/bulk/importDefinitions.php
    R tools/bulk/loadBulkWotD.php
    R tools/concede.php
    R tools/killOrphanPhpProcesses.php
    A tools/old/addScribanAsterisk.php
    A tools/old/concede.php
    A tools/old/fixMultiLexems.php
    A tools/old/killOrphanPhpProcesses.php
    A tools/old/loadBulkWotD.php
    M tools/rebuildScrabbleForms.php
    M tools/test.php
    R wwwbase/ajax/structureLoad.php
    M wwwbase/modele-flexiune.php
    M wwwbase/paradigm.php
    M wwwbase/search.php
    M wwwbase/tipuri-modele.php

  Log Message:
  -----------
  More work on the multiple LexemModels


  Commit: 22b4901c4714d33ad71575bc1983df244ed9595e
      https://github.com/CatalinFrancu/dexonline/commit/22b4901c4714d33ad71575bc1983df244ed9595e
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2014-04-30 (Wed, 30 Apr 2014)

  Changed paths:
    M wwwbase/modele-flexiune.php

  Log Message:
  -----------
  update comment


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

  Changed paths:
    M templates/common/faq.ihtml
    A templates/common/licenta.ihtml
    A wwwbase/licenta.php

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


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

  Changed paths:
    M templates/admin/lexemEdit.ihtml
    R templates/common/bits/similarModel.ihtml
    M wwwbase/admin/lexemEdit.php
    M wwwbase/js/lexemEdit.js

  Log Message:
  -----------
  some work on lexemEdit.ihtml and tabbed models


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

  Changed paths:
    M phplib/models/LexemModel.php
    R phplib/smarty/Config_File.class.php
    M phplib/smarty/Smarty.class.php
    A phplib/smarty/SmartyBC.class.php
    R phplib/smarty/Smarty_Compiler.class.php
    M phplib/smarty/debug.tpl
    R phplib/smarty/internals/core.assemble_plugin_filepath.php
    R phplib/smarty/internals/core.assign_smarty_interface.php
    R phplib/smarty/internals/core.create_dir_structure.php
    R phplib/smarty/internals/core.display_debug_console.php
    R phplib/smarty/internals/core.get_include_path.php
    R phplib/smarty/internals/core.get_microtime.php
    R phplib/smarty/internals/core.get_php_resource.php
    R phplib/smarty/internals/core.is_secure.php
    R phplib/smarty/internals/core.is_trusted.php
    R phplib/smarty/internals/core.load_plugins.php
    R phplib/smarty/internals/core.load_resource_plugin.php
    R phplib/smarty/internals/core.process_cached_inserts.php
    R phplib/smarty/internals/core.process_compiled_include.php
    R phplib/smarty/internals/core.read_cache_file.php
    R phplib/smarty/internals/core.rm_auto.php
    R phplib/smarty/internals/core.rmdir.php
    R phplib/smarty/internals/core.run_insert_handler.php
    R phplib/smarty/internals/core.smarty_include_php.php
    R phplib/smarty/internals/core.write_cache_file.php
    R phplib/smarty/internals/core.write_compiled_include.php
    R phplib/smarty/internals/core.write_compiled_resource.php
    R phplib/smarty/internals/core.write_file.php
    M phplib/smarty/plugins/block.textformat.php
    R phplib/smarty/plugins/compiler.assign.php
    R phplib/smarty/plugins/function.assign_debug_info.php
    R phplib/smarty/plugins/function.config_load.php
    M phplib/smarty/plugins/function.counter.php
    M phplib/smarty/plugins/function.cycle.php
    R phplib/smarty/plugins/function.debug.php
    R phplib/smarty/plugins/function.eval.php
    M phplib/smarty/plugins/function.fetch.php
    M phplib/smarty/plugins/function.html_checkboxes.php
    M phplib/smarty/plugins/function.html_image.php
    M phplib/smarty/plugins/function.html_options.php
    M phplib/smarty/plugins/function.html_radios.php
    M phplib/smarty/plugins/function.html_select_date.php
    M phplib/smarty/plugins/function.html_select_time.php
    M phplib/smarty/plugins/function.html_table.php
    M phplib/smarty/plugins/function.mailto.php
    M phplib/smarty/plugins/function.math.php
    R phplib/smarty/plugins/function.popup.php
    R phplib/smarty/plugins/function.popup_init.php
    M phplib/smarty/plugins/modifier.capitalize.php
    R phplib/smarty/plugins/modifier.cat.php
    R phplib/smarty/plugins/modifier.count_characters.php
    R phplib/smarty/plugins/modifier.count_paragraphs.php
    R phplib/smarty/plugins/modifier.count_sentences.php
    R phplib/smarty/plugins/modifier.count_words.php
    M phplib/smarty/plugins/modifier.date_format.php
    M phplib/smarty/plugins/modifier.debug_print_var.php
    R phplib/smarty/plugins/modifier.default.php
    M phplib/smarty/plugins/modifier.escape.php
    R phplib/smarty/plugins/modifier.indent.php
    R phplib/smarty/plugins/modifier.lower.php
    R phplib/smarty/plugins/modifier.nl2br.php
    M phplib/smarty/plugins/modifier.regex_replace.php
    M phplib/smarty/plugins/modifier.replace.php
    M phplib/smarty/plugins/modifier.spacify.php
    R phplib/smarty/plugins/modifier.string_format.php
    R phplib/smarty/plugins/modifier.strip.php
    R phplib/smarty/plugins/modifier.strip_tags.php
    M phplib/smarty/plugins/modifier.truncate.php
    R phplib/smarty/plugins/modifier.upper.php
    R phplib/smarty/plugins/modifier.wordwrap.php
    A phplib/smarty/plugins/modifiercompiler.cat.php
    A phplib/smarty/plugins/modifiercompiler.count_characters.php
    A phplib/smarty/plugins/modifiercompiler.count_paragraphs.php
    A phplib/smarty/plugins/modifiercompiler.count_sentences.php
    A phplib/smarty/plugins/modifiercompiler.count_words.php
    A phplib/smarty/plugins/modifiercompiler.default.php
    A phplib/smarty/plugins/modifiercompiler.escape.php
    A phplib/smarty/plugins/modifiercompiler.from_charset.php
    A phplib/smarty/plugins/modifiercompiler.indent.php
    A phplib/smarty/plugins/modifiercompiler.lower.php
    A phplib/smarty/plugins/modifiercompiler.noprint.php
    A phplib/smarty/plugins/modifiercompiler.string_format.php
    A phplib/smarty/plugins/modifiercompiler.strip.php
    A phplib/smarty/plugins/modifiercompiler.strip_tags.php
    A phplib/smarty/plugins/modifiercompiler.to_charset.php
    A phplib/smarty/plugins/modifiercompiler.unescape.php
    A phplib/smarty/plugins/modifiercompiler.upper.php
    A phplib/smarty/plugins/modifiercompiler.wordwrap.php
    M phplib/smarty/plugins/outputfilter.trimwhitespace.php
    M phplib/smarty/plugins/shared.escape_special_chars.php
    A phplib/smarty/plugins/shared.literal_compiler_param.php
    M phplib/smarty/plugins/shared.make_timestamp.php
    A phplib/smarty/plugins/shared.mb_str_replace.php
    A phplib/smarty/plugins/shared.mb_unicode.php
    A phplib/smarty/plugins/shared.mb_wordwrap.php
    A phplib/smarty/plugins/variablefilter.htmlspecialchars.php
    A phplib/smarty/sysplugins/smarty_cacheresource.php
    A phplib/smarty/sysplugins/smarty_cacheresource_custom.php
    A phplib/smarty/sysplugins/smarty_cacheresource_keyvaluestore.php
    A phplib/smarty/sysplugins/smarty_config_source.php
    A phplib/smarty/sysplugins/smarty_internal_cacheresource_file.php
    A phplib/smarty/sysplugins/smarty_internal_compile_append.php
    A phplib/smarty/sysplugins/smarty_internal_compile_assign.php
    A phplib/smarty/sysplugins/smarty_internal_compile_block.php
    A phplib/smarty/sysplugins/smarty_internal_compile_break.php
    A phplib/smarty/sysplugins/smarty_internal_compile_call.php
    A phplib/smarty/sysplugins/smarty_internal_compile_capture.php
    A phplib/smarty/sysplugins/smarty_internal_compile_config_load.php
    A phplib/smarty/sysplugins/smarty_internal_compile_continue.php
    A phplib/smarty/sysplugins/smarty_internal_compile_debug.php
    A phplib/smarty/sysplugins/smarty_internal_compile_eval.php
    A phplib/smarty/sysplugins/smarty_internal_compile_extends.php
    A phplib/smarty/sysplugins/smarty_internal_compile_for.php
    A phplib/smarty/sysplugins/smarty_internal_compile_foreach.php
    A phplib/smarty/sysplugins/smarty_internal_compile_function.php
    A phplib/smarty/sysplugins/smarty_internal_compile_if.php
    A phplib/smarty/sysplugins/smarty_internal_compile_include.php
    A phplib/smarty/sysplugins/smarty_internal_compile_include_php.php
    A phplib/smarty/sysplugins/smarty_internal_compile_insert.php
    A phplib/smarty/sysplugins/smarty_internal_compile_ldelim.php
    A phplib/smarty/sysplugins/smarty_internal_compile_nocache.php
    A phplib/smarty/sysplugins/smarty_internal_compile_private_block_plugin.php
    A phplib/smarty/sysplugins/smarty_internal_compile_private_function_plugin.php
    A phplib/smarty/sysplugins/smarty_internal_compile_private_modifier.php
    A phplib/smarty/sysplugins/smarty_internal_compile_private_object_block_function.php
    A phplib/smarty/sysplugins/smarty_internal_compile_private_object_function.php
    A phplib/smarty/sysplugins/smarty_internal_compile_private_print_expression.php
    A phplib/smarty/sysplugins/smarty_internal_compile_private_registered_block.php
    A phplib/smarty/sysplugins/smarty_internal_compile_private_registered_function.php
    A phplib/smarty/sysplugins/smarty_internal_compile_private_special_variable.php
    A phplib/smarty/sysplugins/smarty_internal_compile_rdelim.php
    A phplib/smarty/sysplugins/smarty_internal_compile_section.php
    A phplib/smarty/sysplugins/smarty_internal_compile_setfilter.php
    A phplib/smarty/sysplugins/smarty_internal_compile_while.php
    A phplib/smarty/sysplugins/smarty_internal_compilebase.php
    A phplib/smarty/sysplugins/smarty_internal_config.php
    A phplib/smarty/sysplugins/smarty_internal_config_file_compiler.php
    A phplib/smarty/sysplugins/smarty_internal_configfilelexer.php
    A phplib/smarty/sysplugins/smarty_internal_configfileparser.php
    A phplib/smarty/sysplugins/smarty_internal_data.php
    A phplib/smarty/sysplugins/smarty_internal_debug.php
    A phplib/smarty/sysplugins/smarty_internal_filter_handler.php
    A phplib/smarty/sysplugins/smarty_internal_function_call_handler.php
    A phplib/smarty/sysplugins/smarty_internal_get_include_path.php
    A phplib/smarty/sysplugins/smarty_internal_nocache_insert.php
    A phplib/smarty/sysplugins/smarty_internal_parsetree.php
    A phplib/smarty/sysplugins/smarty_internal_resource_eval.php
    A phplib/smarty/sysplugins/smarty_internal_resource_extends.php
    A phplib/smarty/sysplugins/smarty_internal_resource_file.php
    A phplib/smarty/sysplugins/smarty_internal_resource_php.php
    A phplib/smarty/sysplugins/smarty_internal_resource_registered.php
    A phplib/smarty/sysplugins/smarty_internal_resource_stream.php
    A phplib/smarty/sysplugins/smarty_internal_resource_string.php
    A phplib/smarty/sysplugins/smarty_internal_smartytemplatecompiler.php
    A phplib/smarty/sysplugins/smarty_internal_template.php
    A phplib/smarty/sysplugins/smarty_internal_templatebase.php
    A phplib/smarty/sysplugins/smarty_internal_templatecompilerbase.php
    A phplib/smarty/sysplugins/smarty_internal_templatelexer.php
    A phplib/smarty/sysplugins/smarty_internal_templateparser.php
    A phplib/smarty/sysplugins/smarty_internal_utility.php
    A phplib/smarty/sysplugins/smarty_internal_write_file.php
    A phplib/smarty/sysplugins/smarty_resource.php
    A phplib/smarty/sysplugins/smarty_resource_custom.php
    A phplib/smarty/sysplugins/smarty_resource_recompiled.php
    A phplib/smarty/sysplugins/smarty_resource_uncompiled.php
    A phplib/smarty/sysplugins/smarty_security.php
    M templates/admin/lexemEdit.ihtml
    M templates/admin/recentlyVisited.ihtml
    A templates/common/bits/lexemEditModel.ihtml
    M templates/common/bits/meaningTree.ihtml
    M wwwbase/admin/lexemEdit.php
    M wwwbase/js/lexemEdit.js
    M wwwbase/styles/lexemEdit.css

  Log Message:
  -----------
  Partial commit -- work on tabbed lexem models; upgrade to smarty3


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

  Changed paths:
    M templates/common/bits/multiParadigm.ihtml
    M templates/common/cuvinte.ihtml
    M templates/common/search.ihtml
    M templates/polar/pageLayout.ihtml
    M templates/zepu/pageLayout.ihtml
    M wwwbase/cuvinte.php

  Log Message:
  -----------
  various smarty3 fixes


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

  Changed paths:
    M templates/admin/lexemEdit.ihtml
    M templates/admin/pageLayout.ihtml
    M templates/common/bits/lexemEditModel.ihtml
    M wwwbase/admin/lexemEdit.php
    M wwwbase/ajax/getModelByLexemId.php
    M wwwbase/js/flex.js
    M wwwbase/js/lexemEdit.js
    M wwwbase/styles/lexemEdit.css

  Log Message:
  -----------
  Work on the tabbed lexem models


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

  Changed paths:
    M phplib/SmartyWrap.php
    M templates/admin/lexemEdit.ihtml
    M templates/common/bits/lexemEditModel.ihtml
    M wwwbase/admin/lexemEdit.php
    M wwwbase/js/lexemEdit.js
    M wwwbase/styles/lexemEdit.css
    A wwwbase/styles/smoothness-1.10.4/images/animated-overlay.gif
    A wwwbase/styles/smoothness-1.10.4/images/ui-bg_flat_0_aaaaaa_40x100.png
    A wwwbase/styles/smoothness-1.10.4/images/ui-bg_flat_75_ffffff_40x100.png
    A wwwbase/styles/smoothness-1.10.4/images/ui-bg_glass_55_fbf9ee_1x400.png
    A wwwbase/styles/smoothness-1.10.4/images/ui-bg_glass_65_ffffff_1x400.png
    A wwwbase/styles/smoothness-1.10.4/images/ui-bg_glass_75_dadada_1x400.png
    A wwwbase/styles/smoothness-1.10.4/images/ui-bg_glass_75_e6e6e6_1x400.png
    A wwwbase/styles/smoothness-1.10.4/images/ui-bg_glass_95_fef1ec_1x400.png
    A wwwbase/styles/smoothness-1.10.4/images/ui-bg_highlight-soft_75_cccccc_1x100.png
    A wwwbase/styles/smoothness-1.10.4/images/ui-icons_222222_256x240.png
    A wwwbase/styles/smoothness-1.10.4/images/ui-icons_2e83ff_256x240.png
    A wwwbase/styles/smoothness-1.10.4/images/ui-icons_454545_256x240.png
    A wwwbase/styles/smoothness-1.10.4/images/ui-icons_888888_256x240.png
    A wwwbase/styles/smoothness-1.10.4/images/ui-icons_cd0a0a_256x240.png
    A wwwbase/styles/smoothness-1.10.4/jquery-ui-1.10.4.custom.css
    A wwwbase/styles/smoothness-1.10.4/jquery-ui-1.10.4.custom.min.css

  Log Message:
  -----------
  Frontend for tabbed lexem models almost done


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

  Changed paths:
    M templates/admin/lexemEdit.ihtml
    M wwwbase/styles/lexemEdit.css

  Log Message:
  -----------
  Add visual indicator for sortable tabs


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

  Changed paths:
    M patches/00118.sql
    M templates/admin/lexemEdit.ihtml
    M templates/common/bits/lexemEditModel.ihtml
    M wwwbase/admin/lexemEdit.php
    M wwwbase/js/dex.js
    M wwwbase/js/lexemEdit.js
    M wwwbase/styles/lexemEdit.css

  Log Message:
  -----------
  move interface elements from Lexem to LexemModel


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

  Changed paths:
    R patches/00118.sql
    M patches/00119.sql
    A patches/00120.sql

  Log Message:
  -----------
  rename some patch files to prepare for a down merge


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

  Changed paths:
    A patches/00118.sql
    M patches/00119.sql
    R patches/00120.sql

  Log Message:
  -----------
  Revert previous commit...


  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


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

  Changed paths:
    M templates/common/bits/lexemEditModel.ihtml
    M wwwbase/js/lexemEdit.js

  Log Message:
  -----------
  replace checkbox array with a fake checkbox array that submits unchecked values


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

  Changed paths:
    M phplib/models/Source.php
    M templates/admin/lexemEdit.ihtml
    M templates/common/bits/lexemEditModel.ihtml
    M wwwbase/admin/lexemEdit.php
    M wwwbase/js/lexemEdit.js

  Log Message:
  -----------
  Move sources from Lexem to LexemModel


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

  Changed paths:
    M phplib/models/InflectedForm.php
    M phplib/models/Lexem.php
    M phplib/models/LexemModel.php
    M templates/common/bits/lexemEditModel.ihtml
    M wwwbase/admin/lexemEdit.php

  Log Message:
  -----------
  Work on lexem saving. Saving participles / long infinitives is very complex. Work in progress


  Commit: c95b38e1af95a1b81d58ac9b247be5bf17aa99e7
      https://github.com/CatalinFrancu/dexonline/commit/c95b38e1af95a1b81d58ac9b247be5bf17aa99e7
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2014-06-02 (Mon, 02 Jun 2014)

  Changed paths:
    M phplib/models/InflectedForm.php
    M phplib/models/Lexem.php
    M phplib/models/LexemModel.php
    M phplib/models/Meaning.php
    M phplib/models/Synonym.php
    M templates/admin/lexemEdit.ihtml
    M templates/common/bits/lexemEditModel.ihtml
    M templates/common/bits/lexemModel.ihtml
    M templates/common/paradigm/6.0/paradigmA.ihtml
    M templates/common/paradigm/6.0/paradigmN.ihtml
    M templates/common/paradigm/6.0/paradigmP.ihtml
    M templates/common/paradigm/6.0/paradigmV.ihtml
    M templates/common/search.ihtml
    M templates/common/update3Lexems.ihtml
    M templates/flex/mergeLexems.ihtml
    M templates/xmldump/lexem.ihtml
    M wwwbase/admin/lexemEdit.php
    M wwwbase/flex/mergeLexems.php
    M wwwbase/js/flex.js
    M wwwbase/js/lexemEdit.js
    M wwwbase/modele-flexiune.php
    M wwwbase/paradigm.php
    M wwwbase/search.php

  Log Message:
  -----------
  Finish work on lexemEdit.php


  Commit: e3c79bde995fd89800af7ed2395ad1b2c969bde0
      https://github.com/CatalinFrancu/dexonline/commit/e3c79bde995fd89800af7ed2395ad1b2c969bde0
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    M phplib/models/Definition.php
    M phplib/models/FullTextIndex.php

  Log Message:
  -----------
  Make the FullTextIndex work with LexemModels. Work in progress


  Commit: 66069e596c659f1f115ab568f9bfde83186c7e80
      https://github.com/CatalinFrancu/dexonline/commit/66069e596c659f1f115ab568f9bfde83186c7e80
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    M phplib/models/Lexem.php
    M phplib/models/LexemSource.php
    M templates/common/bits/lexemTags.ihtml
    M templates/common/bits/multiParadigm.ihtml
    M wwwbase/paradigm.php

  Log Message:
  -----------
  Move some paradigm info into Lexem object properties.
This avoids the need to maintain a parallel dictionary structure.
Paradigm info is loaded lazily.


  Commit: 5cd0f78ca0a99312d7c536c43b1bd0fc8061d140
      https://github.com/CatalinFrancu/dexonline/commit/5cd0f78ca0a99312d7c536c43b1bd0fc8061d140
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    M phplib/models/InflectedForm.php
    M phplib/models/Lexem.php
    M templates/common/bits/multiParadigm.ihtml
    M wwwbase/paradigm.php
    M wwwbase/search.php

  Log Message:
  -----------
  move inflected forms map to a property on the Lexem object


  Commit: 9a0ce97b7462339c601ccf45d563f04b2c0cab9b
      https://github.com/CatalinFrancu/dexonline/commit/9a0ce97b7462339c601ccf45d563f04b2c0cab9b
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    M phplib/models/InflectedForm.php
    M phplib/models/Lexem.php
    M templates/common/update3Lexems.ihtml
    M templates/flex/mergeLexems.ihtml
    M templates/xmldump/lexem.ihtml
    M tools/dumpDatabaseXml.php
    M wwwbase/deprecated/update3.php
    M wwwbase/flex/mergeLexems.php
    M wwwbase/modele-flexiune.php

  Log Message:
  -----------
  Rewrite some queries to use Lexem properties instead of hash maps.


  Commit: 36ea9f0f04749e6b55163e3e9cffe24ee629b422
      https://github.com/CatalinFrancu/dexonline/commit/36ea9f0f04749e6b55163e3e9cffe24ee629b422
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    M phplib/models/BaseObject.php
    M phplib/models/Definition.php
    M phplib/models/Lexem.php
    A phplib/models/LexemModel.php
    M phplib/models/LexemSource.php
    R templates/admin/definitionMigrate.ihtml
    A templates/common/bits/lexemModel.ihtml
    A templates/common/bits/lexemSources.ihtml
    R templates/common/bits/lexemTags.ihtml
    M templates/common/bits/locInfo.ihtml
    M templates/common/bits/multiParadigm.ihtml
    M templates/common/paradigm/6.0/paradigm.ihtml
    M templates/common/paradigm/6.0/paradigmA.ihtml
    M templates/common/paradigm/6.0/paradigmI.ihtml
    M templates/common/paradigm/6.0/paradigmN.ihtml
    M templates/common/paradigm/6.0/paradigmP.ihtml
    M templates/common/paradigm/6.0/paradigmT.ihtml
    M templates/common/paradigm/6.0/paradigmV.ihtml
    R wwwbase/admin/definitionMigrate.php
    M wwwbase/admin/index.php
    M wwwbase/admin/lexemSearch.php
    M wwwbase/paradigm.php
    M wwwbase/search.php
    M wwwbase/styles/common.css
    M wwwbase/styles/paradigm.css
    M wwwbase/styles/polar.css
    M wwwbase/styles/zepu.css

  Log Message:
  -----------
  Add the LexemModel table so lexems can have multiple paradigms.
Convert some code. Work in progress.


  Commit: def09cd2ace229cd76e443d7a50fa480b7c71629
      https://github.com/CatalinFrancu/dexonline/commit/def09cd2ace229cd76e443d7a50fa480b7c71629
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    R patches/00117.sql
    A patches/00118.sql

  Log Message:
  -----------
  rename patch


  Commit: a07d10508c805c617d0055a559b0ff7359959243
      https://github.com/CatalinFrancu/dexonline/commit/a07d10508c805c617d0055a559b0ff7359959243
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    A templates/common/bits/lexemTags.ihtml

  Log Message:
  -----------
  Move some paradigm info into Lexem object properties.
This avoids the need to maintain a parallel dictionary structure.
Paradigm info is loaded lazily.


  Commit: d122786036a0e14027ece07d9a935bc8c123e692
      https://github.com/CatalinFrancu/dexonline/commit/d122786036a0e14027ece07d9a935bc8c123e692
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

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

  Log Message:
  -----------
  move inflected forms map to a property on the Lexem object


  Commit: be3ca55941c65650cae57b4f3ba883115ee52cbb
      https://github.com/CatalinFrancu/dexonline/commit/be3ca55941c65650cae57b4f3ba883115ee52cbb
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    M phplib/models/Lexem.php

  Log Message:
  -----------
  Rewrite some queries to use Lexem properties instead of hash maps.


  Commit: 6aee76f9a03f023a5508e65c8a5e366cec8bd4dc
      https://github.com/CatalinFrancu/dexonline/commit/6aee76f9a03f023a5508e65c8a5e366cec8bd4dc
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    M phplib/models/Lexem.php
    R templates/common/bits/lexemTags.ihtml
    M wwwbase/search.php

  Log Message:
  -----------
  Add the LexemModel table so lexems can have multiple paradigms.
Convert some code. Work in progress.


  Commit: a959950e16f2a22dd2a4ffa4f9e5edfdf3d0cf1e
      https://github.com/CatalinFrancu/dexonline/commit/a959950e16f2a22dd2a4ffa4f9e5edfdf3d0cf1e
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    A patches/00117.sql

  Log Message:
  -----------
  Ooops, accidentally deteled a patch file during merge


  Commit: 06e4fbb078a838e88ae5afafb47bbb09411bd703
      https://github.com/CatalinFrancu/dexonline/commit/06e4fbb078a838e88ae5afafb47bbb09411bd703
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    M phplib/session.php

  Log Message:
  -----------
  Remove transitional code.


  Commit: 65cebf6d150d98c8d434042fae4a303e32747abc
      https://github.com/CatalinFrancu/dexonline/commit/65cebf6d150d98c8d434042fae4a303e32747abc
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    A patches/00119.sql
    M phplib/AdminStringUtil.php
    R phplib/Structure.php
    M phplib/models/LexemModel.php
    M phplib/models/WikiArticle.php
    R phplib/structure/dex98.php
    M templates/common/bits/lexemModel.ihtml
    M templates/common/bits/multiParadigm.ihtml
    M templates/common/modele-flexiune.ihtml
    M templates/xmldump/lexem.ihtml
    R tools/addScribanAsterisk.php
    R tools/bulk/fixMultiLexems.php
    M tools/bulk/importDefinitions.php
    R tools/bulk/loadBulkWotD.php
    R tools/concede.php
    R tools/killOrphanPhpProcesses.php
    A tools/old/addScribanAsterisk.php
    A tools/old/concede.php
    A tools/old/fixMultiLexems.php
    A tools/old/killOrphanPhpProcesses.php
    A tools/old/loadBulkWotD.php
    M tools/rebuildScrabbleForms.php
    M tools/test.php
    R wwwbase/ajax/structureLoad.php
    M wwwbase/modele-flexiune.php
    M wwwbase/paradigm.php
    M wwwbase/search.php
    M wwwbase/tipuri-modele.php

  Log Message:
  -----------
  More work on the multiple LexemModels


  Commit: 7c0cb1f389002bef97ff892c77773ebbd3f0fe78
      https://github.com/CatalinFrancu/dexonline/commit/7c0cb1f389002bef97ff892c77773ebbd3f0fe78
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    M wwwbase/modele-flexiune.php

  Log Message:
  -----------
  update comment


  Commit: 2e9e32de3d589de7beee981b709ec0047ceea292
      https://github.com/CatalinFrancu/dexonline/commit/2e9e32de3d589de7beee981b709ec0047ceea292
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    M templates/admin/lexemEdit.ihtml
    R templates/common/bits/similarModel.ihtml
    M wwwbase/admin/lexemEdit.php
    M wwwbase/js/lexemEdit.js

  Log Message:
  -----------
  some work on lexemEdit.ihtml and tabbed models


  Commit: dbfcd60a6786511c2d1f0f8f6bd085c8e73fd16b
      https://github.com/CatalinFrancu/dexonline/commit/dbfcd60a6786511c2d1f0f8f6bd085c8e73fd16b
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    M phplib/models/LexemModel.php
    R phplib/smarty/Config_File.class.php
    M phplib/smarty/Smarty.class.php
    A phplib/smarty/SmartyBC.class.php
    R phplib/smarty/Smarty_Compiler.class.php
    M phplib/smarty/debug.tpl
    R phplib/smarty/internals/core.assemble_plugin_filepath.php
    R phplib/smarty/internals/core.assign_smarty_interface.php
    R phplib/smarty/internals/core.create_dir_structure.php
    R phplib/smarty/internals/core.display_debug_console.php
    R phplib/smarty/internals/core.get_include_path.php
    R phplib/smarty/internals/core.get_microtime.php
    R phplib/smarty/internals/core.get_php_resource.php
    R phplib/smarty/internals/core.is_secure.php
    R phplib/smarty/internals/core.is_trusted.php
    R phplib/smarty/internals/core.load_plugins.php
    R phplib/smarty/internals/core.load_resource_plugin.php
    R phplib/smarty/internals/core.process_cached_inserts.php
    R phplib/smarty/internals/core.process_compiled_include.php
    R phplib/smarty/internals/core.read_cache_file.php
    R phplib/smarty/internals/core.rm_auto.php
    R phplib/smarty/internals/core.rmdir.php
    R phplib/smarty/internals/core.run_insert_handler.php
    R phplib/smarty/internals/core.smarty_include_php.php
    R phplib/smarty/internals/core.write_cache_file.php
    R phplib/smarty/internals/core.write_compiled_include.php
    R phplib/smarty/internals/core.write_compiled_resource.php
    R phplib/smarty/internals/core.write_file.php
    M phplib/smarty/plugins/block.textformat.php
    R phplib/smarty/plugins/compiler.assign.php
    R phplib/smarty/plugins/function.assign_debug_info.php
    R phplib/smarty/plugins/function.config_load.php
    M phplib/smarty/plugins/function.counter.php
    M phplib/smarty/plugins/function.cycle.php
    R phplib/smarty/plugins/function.debug.php
    R phplib/smarty/plugins/function.eval.php
    M phplib/smarty/plugins/function.fetch.php
    M phplib/smarty/plugins/function.html_checkboxes.php
    M phplib/smarty/plugins/function.html_image.php
    M phplib/smarty/plugins/function.html_options.php
    M phplib/smarty/plugins/function.html_radios.php
    M phplib/smarty/plugins/function.html_select_date.php
    M phplib/smarty/plugins/function.html_select_time.php
    M phplib/smarty/plugins/function.html_table.php
    M phplib/smarty/plugins/function.mailto.php
    M phplib/smarty/plugins/function.math.php
    R phplib/smarty/plugins/function.popup.php
    R phplib/smarty/plugins/function.popup_init.php
    M phplib/smarty/plugins/modifier.capitalize.php
    R phplib/smarty/plugins/modifier.cat.php
    R phplib/smarty/plugins/modifier.count_characters.php
    R phplib/smarty/plugins/modifier.count_paragraphs.php
    R phplib/smarty/plugins/modifier.count_sentences.php
    R phplib/smarty/plugins/modifier.count_words.php
    M phplib/smarty/plugins/modifier.date_format.php
    M phplib/smarty/plugins/modifier.debug_print_var.php
    R phplib/smarty/plugins/modifier.default.php
    M phplib/smarty/plugins/modifier.escape.php
    R phplib/smarty/plugins/modifier.indent.php
    R phplib/smarty/plugins/modifier.lower.php
    R phplib/smarty/plugins/modifier.nl2br.php
    M phplib/smarty/plugins/modifier.regex_replace.php
    M phplib/smarty/plugins/modifier.replace.php
    M phplib/smarty/plugins/modifier.spacify.php
    R phplib/smarty/plugins/modifier.string_format.php
    R phplib/smarty/plugins/modifier.strip.php
    R phplib/smarty/plugins/modifier.strip_tags.php
    M phplib/smarty/plugins/modifier.truncate.php
    R phplib/smarty/plugins/modifier.upper.php
    R phplib/smarty/plugins/modifier.wordwrap.php
    A phplib/smarty/plugins/modifiercompiler.cat.php
    A phplib/smarty/plugins/modifiercompiler.count_characters.php
    A phplib/smarty/plugins/modifiercompiler.count_paragraphs.php
    A phplib/smarty/plugins/modifiercompiler.count_sentences.php
    A phplib/smarty/plugins/modifiercompiler.count_words.php
    A phplib/smarty/plugins/modifiercompiler.default.php
    A phplib/smarty/plugins/modifiercompiler.escape.php
    A phplib/smarty/plugins/modifiercompiler.from_charset.php
    A phplib/smarty/plugins/modifiercompiler.indent.php
    A phplib/smarty/plugins/modifiercompiler.lower.php
    A phplib/smarty/plugins/modifiercompiler.noprint.php
    A phplib/smarty/plugins/modifiercompiler.string_format.php
    A phplib/smarty/plugins/modifiercompiler.strip.php
    A phplib/smarty/plugins/modifiercompiler.strip_tags.php
    A phplib/smarty/plugins/modifiercompiler.to_charset.php
    A phplib/smarty/plugins/modifiercompiler.unescape.php
    A phplib/smarty/plugins/modifiercompiler.upper.php
    A phplib/smarty/plugins/modifiercompiler.wordwrap.php
    M phplib/smarty/plugins/outputfilter.trimwhitespace.php
    M phplib/smarty/plugins/shared.escape_special_chars.php
    A phplib/smarty/plugins/shared.literal_compiler_param.php
    M phplib/smarty/plugins/shared.make_timestamp.php
    A phplib/smarty/plugins/shared.mb_str_replace.php
    A phplib/smarty/plugins/shared.mb_unicode.php
    A phplib/smarty/plugins/shared.mb_wordwrap.php
    A phplib/smarty/plugins/variablefilter.htmlspecialchars.php
    A phplib/smarty/sysplugins/smarty_cacheresource.php
    A phplib/smarty/sysplugins/smarty_cacheresource_custom.php
    A phplib/smarty/sysplugins/smarty_cacheresource_keyvaluestore.php
    A phplib/smarty/sysplugins/smarty_config_source.php
    A phplib/smarty/sysplugins/smarty_internal_cacheresource_file.php
    A phplib/smarty/sysplugins/smarty_internal_compile_append.php
    A phplib/smarty/sysplugins/smarty_internal_compile_assign.php
    A phplib/smarty/sysplugins/smarty_internal_compile_block.php
    A phplib/smarty/sysplugins/smarty_internal_compile_break.php
    A phplib/smarty/sysplugins/smarty_internal_compile_call.php
    A phplib/smarty/sysplugins/smarty_internal_compile_capture.php
    A phplib/smarty/sysplugins/smarty_internal_compile_config_load.php
    A phplib/smarty/sysplugins/smarty_internal_compile_continue.php
    A phplib/smarty/sysplugins/smarty_internal_compile_debug.php
    A phplib/smarty/sysplugins/smarty_internal_compile_eval.php
    A phplib/smarty/sysplugins/smarty_internal_compile_extends.php
    A phplib/smarty/sysplugins/smarty_internal_compile_for.php
    A phplib/smarty/sysplugins/smarty_internal_compile_foreach.php
    A phplib/smarty/sysplugins/smarty_internal_compile_function.php
    A phplib/smarty/sysplugins/smarty_internal_compile_if.php
    A phplib/smarty/sysplugins/smarty_internal_compile_include.php
    A phplib/smarty/sysplugins/smarty_internal_compile_include_php.php
    A phplib/smarty/sysplugins/smarty_internal_compile_insert.php
    A phplib/smarty/sysplugins/smarty_internal_compile_ldelim.php
    A phplib/smarty/sysplugins/smarty_internal_compile_nocache.php
    A phplib/smarty/sysplugins/smarty_internal_compile_private_block_plugin.php
    A phplib/smarty/sysplugins/smarty_internal_compile_private_function_plugin.php
    A phplib/smarty/sysplugins/smarty_internal_compile_private_modifier.php
    A phplib/smarty/sysplugins/smarty_internal_compile_private_object_block_function.php
    A phplib/smarty/sysplugins/smarty_internal_compile_private_object_function.php
    A phplib/smarty/sysplugins/smarty_internal_compile_private_print_expression.php
    A phplib/smarty/sysplugins/smarty_internal_compile_private_registered_block.php
    A phplib/smarty/sysplugins/smarty_internal_compile_private_registered_function.php
    A phplib/smarty/sysplugins/smarty_internal_compile_private_special_variable.php
    A phplib/smarty/sysplugins/smarty_internal_compile_rdelim.php
    A phplib/smarty/sysplugins/smarty_internal_compile_section.php
    A phplib/smarty/sysplugins/smarty_internal_compile_setfilter.php
    A phplib/smarty/sysplugins/smarty_internal_compile_while.php
    A phplib/smarty/sysplugins/smarty_internal_compilebase.php
    A phplib/smarty/sysplugins/smarty_internal_config.php
    A phplib/smarty/sysplugins/smarty_internal_config_file_compiler.php
    A phplib/smarty/sysplugins/smarty_internal_configfilelexer.php
    A phplib/smarty/sysplugins/smarty_internal_configfileparser.php
    A phplib/smarty/sysplugins/smarty_internal_data.php
    A phplib/smarty/sysplugins/smarty_internal_debug.php
    A phplib/smarty/sysplugins/smarty_internal_filter_handler.php
    A phplib/smarty/sysplugins/smarty_internal_function_call_handler.php
    A phplib/smarty/sysplugins/smarty_internal_get_include_path.php
    A phplib/smarty/sysplugins/smarty_internal_nocache_insert.php
    A phplib/smarty/sysplugins/smarty_internal_parsetree.php
    A phplib/smarty/sysplugins/smarty_internal_resource_eval.php
    A phplib/smarty/sysplugins/smarty_internal_resource_extends.php
    A phplib/smarty/sysplugins/smarty_internal_resource_file.php
    A phplib/smarty/sysplugins/smarty_internal_resource_php.php
    A phplib/smarty/sysplugins/smarty_internal_resource_registered.php
    A phplib/smarty/sysplugins/smarty_internal_resource_stream.php
    A phplib/smarty/sysplugins/smarty_internal_resource_string.php
    A phplib/smarty/sysplugins/smarty_internal_smartytemplatecompiler.php
    A phplib/smarty/sysplugins/smarty_internal_template.php
    A phplib/smarty/sysplugins/smarty_internal_templatebase.php
    A phplib/smarty/sysplugins/smarty_internal_templatecompilerbase.php
    A phplib/smarty/sysplugins/smarty_internal_templatelexer.php
    A phplib/smarty/sysplugins/smarty_internal_templateparser.php
    A phplib/smarty/sysplugins/smarty_internal_utility.php
    A phplib/smarty/sysplugins/smarty_internal_write_file.php
    A phplib/smarty/sysplugins/smarty_resource.php
    A phplib/smarty/sysplugins/smarty_resource_custom.php
    A phplib/smarty/sysplugins/smarty_resource_recompiled.php
    A phplib/smarty/sysplugins/smarty_resource_uncompiled.php
    A phplib/smarty/sysplugins/smarty_security.php
    M templates/admin/lexemEdit.ihtml
    M templates/admin/recentlyVisited.ihtml
    A templates/common/bits/lexemEditModel.ihtml
    M templates/common/bits/meaningTree.ihtml
    M wwwbase/admin/lexemEdit.php
    M wwwbase/js/lexemEdit.js
    M wwwbase/styles/lexemEdit.css

  Log Message:
  -----------
  Partial commit -- work on tabbed lexem models; upgrade to smarty3


  Commit: d60928e0fe2ffb0276d1764f7a5461956602258a
      https://github.com/CatalinFrancu/dexonline/commit/d60928e0fe2ffb0276d1764f7a5461956602258a
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    M templates/common/bits/multiParadigm.ihtml
    M templates/common/cuvinte.ihtml
    M templates/common/search.ihtml
    M templates/polar/pageLayout.ihtml
    M templates/zepu/pageLayout.ihtml
    M wwwbase/cuvinte.php

  Log Message:
  -----------
  various smarty3 fixes


  Commit: fe676d84c30e6c4031ab4bf2a4ab616b0bdc103f
      https://github.com/CatalinFrancu/dexonline/commit/fe676d84c30e6c4031ab4bf2a4ab616b0bdc103f
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    M templates/admin/lexemEdit.ihtml
    M templates/admin/pageLayout.ihtml
    M templates/common/bits/lexemEditModel.ihtml
    M wwwbase/admin/lexemEdit.php
    M wwwbase/ajax/getModelByLexemId.php
    M wwwbase/js/flex.js
    M wwwbase/js/lexemEdit.js
    M wwwbase/styles/lexemEdit.css

  Log Message:
  -----------
  Work on the tabbed lexem models


  Commit: a4c5fc55c03d1f6d205f1d95ca9ecfcc7cbaee41
      https://github.com/CatalinFrancu/dexonline/commit/a4c5fc55c03d1f6d205f1d95ca9ecfcc7cbaee41
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    M phplib/SmartyWrap.php
    M templates/admin/lexemEdit.ihtml
    M templates/common/bits/lexemEditModel.ihtml
    M wwwbase/admin/lexemEdit.php
    M wwwbase/js/lexemEdit.js
    M wwwbase/styles/lexemEdit.css
    A wwwbase/styles/smoothness-1.10.4/images/animated-overlay.gif
    A wwwbase/styles/smoothness-1.10.4/images/ui-bg_flat_0_aaaaaa_40x100.png
    A wwwbase/styles/smoothness-1.10.4/images/ui-bg_flat_75_ffffff_40x100.png
    A wwwbase/styles/smoothness-1.10.4/images/ui-bg_glass_55_fbf9ee_1x400.png
    A wwwbase/styles/smoothness-1.10.4/images/ui-bg_glass_65_ffffff_1x400.png
    A wwwbase/styles/smoothness-1.10.4/images/ui-bg_glass_75_dadada_1x400.png
    A wwwbase/styles/smoothness-1.10.4/images/ui-bg_glass_75_e6e6e6_1x400.png
    A wwwbase/styles/smoothness-1.10.4/images/ui-bg_glass_95_fef1ec_1x400.png
    A wwwbase/styles/smoothness-1.10.4/images/ui-bg_highlight-soft_75_cccccc_1x100.png
    A wwwbase/styles/smoothness-1.10.4/images/ui-icons_222222_256x240.png
    A wwwbase/styles/smoothness-1.10.4/images/ui-icons_2e83ff_256x240.png
    A wwwbase/styles/smoothness-1.10.4/images/ui-icons_454545_256x240.png
    A wwwbase/styles/smoothness-1.10.4/images/ui-icons_888888_256x240.png
    A wwwbase/styles/smoothness-1.10.4/images/ui-icons_cd0a0a_256x240.png
    A wwwbase/styles/smoothness-1.10.4/jquery-ui-1.10.4.custom.css
    A wwwbase/styles/smoothness-1.10.4/jquery-ui-1.10.4.custom.min.css

  Log Message:
  -----------
  Frontend for tabbed lexem models almost done


  Commit: 0743451c18d7a652e6b2ad2b118b8bd9ab0f055b
      https://github.com/CatalinFrancu/dexonline/commit/0743451c18d7a652e6b2ad2b118b8bd9ab0f055b
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    M templates/admin/lexemEdit.ihtml
    M wwwbase/styles/lexemEdit.css

  Log Message:
  -----------
  Add visual indicator for sortable tabs


  Commit: 661dc16fe686d682352caf73e8138be8634a7356
      https://github.com/CatalinFrancu/dexonline/commit/661dc16fe686d682352caf73e8138be8634a7356
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    M patches/00118.sql
    M templates/admin/lexemEdit.ihtml
    M templates/common/bits/lexemEditModel.ihtml
    M wwwbase/admin/lexemEdit.php
    M wwwbase/js/dex.js
    M wwwbase/js/lexemEdit.js
    M wwwbase/styles/lexemEdit.css

  Log Message:
  -----------
  move interface elements from Lexem to LexemModel


  Commit: 528eea63e772d3aadac2295f8986981be0aadde7
      https://github.com/CatalinFrancu/dexonline/commit/528eea63e772d3aadac2295f8986981be0aadde7
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    R patches/00118.sql
    M patches/00119.sql
    A patches/00120.sql

  Log Message:
  -----------
  rename some patch files to prepare for a down merge


  Commit: b18dcb07f9b02530321dc9926b525eff7404903d
      https://github.com/CatalinFrancu/dexonline/commit/b18dcb07f9b02530321dc9926b525eff7404903d
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    A patches/00118.sql
    M patches/00119.sql
    R patches/00120.sql

  Log Message:
  -----------
  Revert previous commit...


  Commit: c98da4b98fceb336f4a4d6d21ec005fb0b96cc3a
      https://github.com/CatalinFrancu/dexonline/commit/c98da4b98fceb336f4a4d6d21ec005fb0b96cc3a
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    M templates/common/bits/lexemEditModel.ihtml
    M wwwbase/js/lexemEdit.js

  Log Message:
  -----------
  replace checkbox array with a fake checkbox array that submits unchecked values


  Commit: d4d01f57423bb60d0e68b7b89325f7667ae98abc
      https://github.com/CatalinFrancu/dexonline/commit/d4d01f57423bb60d0e68b7b89325f7667ae98abc
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    M phplib/models/Source.php
    M templates/admin/lexemEdit.ihtml
    M templates/common/bits/lexemEditModel.ihtml
    M wwwbase/admin/lexemEdit.php
    M wwwbase/js/lexemEdit.js

  Log Message:
  -----------
  Move sources from Lexem to LexemModel


  Commit: 1f5fed15a1577b27ea411c596facc72de2377c52
      https://github.com/CatalinFrancu/dexonline/commit/1f5fed15a1577b27ea411c596facc72de2377c52
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    M phplib/models/InflectedForm.php
    M phplib/models/Lexem.php
    M phplib/models/LexemModel.php
    M templates/common/bits/lexemEditModel.ihtml
    M wwwbase/admin/lexemEdit.php

  Log Message:
  -----------
  Work on lexem saving. Saving participles / long infinitives is very complex. Work in progress


  Commit: b01de639957bd7d5f84b288de0d4303b07ecfa83
      https://github.com/CatalinFrancu/dexonline/commit/b01de639957bd7d5f84b288de0d4303b07ecfa83
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    M phplib/models/InflectedForm.php
    M phplib/models/Lexem.php
    M phplib/models/LexemModel.php
    M phplib/models/Meaning.php
    M phplib/models/Synonym.php
    M templates/admin/lexemEdit.ihtml
    M templates/common/bits/lexemEditModel.ihtml
    M templates/common/bits/lexemModel.ihtml
    M templates/common/paradigm/6.0/paradigmA.ihtml
    M templates/common/paradigm/6.0/paradigmN.ihtml
    M templates/common/paradigm/6.0/paradigmP.ihtml
    M templates/common/paradigm/6.0/paradigmV.ihtml
    M templates/common/search.ihtml
    M templates/common/update3Lexems.ihtml
    M templates/flex/mergeLexems.ihtml
    M templates/xmldump/lexem.ihtml
    M wwwbase/admin/lexemEdit.php
    M wwwbase/flex/mergeLexems.php
    M wwwbase/js/flex.js
    M wwwbase/js/lexemEdit.js
    M wwwbase/modele-flexiune.php
    M wwwbase/paradigm.php
    M wwwbase/search.php

  Log Message:
  -----------
  Finish work on lexemEdit.php


  Commit: 4b816216a86a02e4abb14fcf5e96d62d53e023ef
      https://github.com/CatalinFrancu/dexonline/commit/4b816216a86a02e4abb14fcf5e96d62d53e023ef
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    M phplib/models/Definition.php
    M phplib/models/FullTextIndex.php

  Log Message:
  -----------
  Make the FullTextIndex work with LexemModels. Work in progress


  Commit: 17f38a18ef811dde0bcc6f16d32bcc7791468087
      https://github.com/CatalinFrancu/dexonline/commit/17f38a18ef811dde0bcc6f16d32bcc7791468087
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    M phplib/models/Lexem.php

  Log Message:
  -----------
  pull from master


  Commit: 07f1e3b363d759e31affe1f64fe180418191a7eb
      https://github.com/CatalinFrancu/dexonline/commit/07f1e3b363d759e31affe1f64fe180418191a7eb
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    M phplib/models/Definition.php
    M phplib/models/FullTextIndex.php
    M phplib/util.php
    M tools/rebuildFullTextIndex.php

  Log Message:
  -----------
  Fix full text search


  Commit: 3e119b2ca8076a7c1a606ccbfbc3d0b0fb26e2ef
      https://github.com/CatalinFrancu/dexonline/commit/3e119b2ca8076a7c1a606ccbfbc3d0b0fb26e2ef
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2014-06-11 (Wed, 11 Jun 2014)

  Changed paths:
    M templates/common/scrabble-flexiune.ihtml
    M tools/rebuildScrabbleForms.php
    M wwwbase/scrabble-flexiune.php
    M wwwbase/scrabble-loc.php

  Log Message:
  -----------
  Convert scrabble stuff to use LexemModels


  Commit: be6200301b9a4320c0b2607e79533aa98cbc8b9e
      https://github.com/CatalinFrancu/dexonline/commit/be6200301b9a4320c0b2607e79533aa98cbc8b9e
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2014-06-11 (Wed, 11 Jun 2014)

  Changed paths:
    M phplib/SmartyWrap.php
    M phplib/models/LexemModel.php
    M templates/common/bits/ifArray.ihtml
    M templates/common/bits/lexemEditModel.ihtml
    M templates/common/modele-flexiune.ihtml
    A templates/common/paradigm/4.0/lexemInfo.ihtml
    M templates/common/paradigm/4.0/paradigm.ihtml
    M templates/common/paradigm/4.0/paradigmA.ihtml
    M templates/common/paradigm/4.0/paradigmI.ihtml
    M templates/common/paradigm/4.0/paradigmN.ihtml
    M templates/common/paradigm/4.0/paradigmP.ihtml
    M templates/common/paradigm/4.0/paradigmV.ihtml
    A templates/common/paradigm/4.1/lexemInfo.ihtml
    M templates/common/paradigm/4.1/paradigm.ihtml
    M templates/common/paradigm/4.1/paradigmA.ihtml
    M templates/common/paradigm/4.1/paradigmI.ihtml
    M templates/common/paradigm/4.1/paradigmN.ihtml
    M templates/common/paradigm/4.1/paradigmP.ihtml
    M templates/common/paradigm/4.1/paradigmV.ihtml
    A templates/common/paradigm/5.0/lexemInfo.ihtml
    M templates/common/paradigm/5.0/paradigmA.ihtml
    M templates/common/paradigm/5.0/paradigmI.ihtml
    M templates/common/paradigm/5.0/paradigmN.ihtml
    M templates/common/paradigm/5.0/paradigmP.ihtml
    M templates/common/paradigm/5.0/paradigmV.ihtml
    M wwwbase/admin/lexemEdit.php
    M wwwbase/ajax/getModelTypesForLocVersion.php
    M wwwbase/js/flex.js
    M wwwbase/js/lexemEdit.js
    A wwwbase/js/modelDropdown.js
    M wwwbase/modele-flexiune.php

  Log Message:
  -----------
  Unify the Javascript and Ajax for the LOC version + model type + model number dropdowns. Fix paradigm display for old LOC versions


  Commit: 7a282719d015df887eb202fa35340cb27f8893eb
      https://github.com/CatalinFrancu/dexonline/commit/7a282719d015df887eb202fa35340cb27f8893eb
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2014-06-12 (Thu, 12 Jun 2014)

  Changed paths:
    M phplib/models/Lexem.php
    M phplib/models/LexemModel.php
    M templates/admin/index.ihtml
    M templates/admin/lexemList.ihtml
    M templates/common/bits/structStatus.ihtml
    M templates/common/modele-flexiune.ihtml
    M templates/flex/editModel.ihtml
    M wwwbase/admin/index.php
    M wwwbase/flex/editModel.php
    M wwwbase/js/lexemEdit.js
    M wwwbase/js/modelDropdown.js

  Log Message:
  -----------
  More work on lexem models. Partial commit - editModel.php doesn't quite work yet.


  Commit: 8bdcbf2722970d2c5d4bdf3ad5c0309afd8d252b
      https://github.com/CatalinFrancu/dexonline/commit/8bdcbf2722970d2c5d4bdf3ad5c0309afd8d252b
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2014-06-13 (Fri, 13 Jun 2014)

  Changed paths:
    M phplib/models/FlexModel.php
    M phplib/models/LexemModel.php
    M templates/flex/cloneModel.ihtml
    M templates/flex/deleteModel.ihtml
    M templates/flex/placeAccents.ihtml
    M templates/flex/viewLexemsWithComments.ihtml
    M wwwbase/admin/definitionEdit.php
    M wwwbase/ajax/deleteDefinition.php
    M wwwbase/contribuie.php
    M wwwbase/flex/cloneModel.php
    M wwwbase/flex/deleteModel.php
    M wwwbase/flex/editModel.php
    M wwwbase/flex/placeAccents.php
    M wwwbase/flex/viewLexemsWithoutAccents.php
    M wwwbase/flex/viewTemporaryLexems.php

  Log Message:
  -----------
  More work on LexemModels. Almost done.


  Commit: 94aba5752fef1ba1ea2085c8082f4588fa70260b
      https://github.com/CatalinFrancu/dexonline/commit/94aba5752fef1ba1ea2085c8082f4588fa70260b
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2014-06-16 (Mon, 16 Jun 2014)

  Changed paths:
    M docs/schema.txt
    M phplib/FtpUtil.php
    M templates/admin/definitionEdit.ihtml
    M templates/flex/bulkLabel.ihtml
    M templates/flex/mergeLexems.ihtml
    M templates/xmldump/lexem.ihtml
    M tools/bulk/importDefinitions.php
    M tools/freezeLocVersion.php
    M wwwbase/admin/definitionEdit.php
    M wwwbase/admin/lexemEdit.php
    M wwwbase/admin/lexemSearch.php
    M wwwbase/admin/properNouns.php
    M wwwbase/flex/bulkLabel.php
    M wwwbase/flex/bulkLabelSelectSuffix.php
    M wwwbase/flex/mergeLexems.php

  Log Message:
  -----------
  Finish implementation of LexemModels


  Commit: 40dd194960e318a3746aaea5dc9a66b1d005f20b
      https://github.com/CatalinFrancu/dexonline/commit/40dd194960e318a3746aaea5dc9a66b1d005f20b
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2014-06-16 (Mon, 16 Jun 2014)

  Changed paths:
    M phplib/SmartyWrap.php
    M templates/zepu/index.ihtml
    M templates/zepu/pageLayout.ihtml
    M templates/zepu/search.ihtml
    M tools/cssSprite.php
    R wwwbase/img/sprite2.png
    A wwwbase/img/sprite3.png
    R wwwbase/img/zepu/shadows/shadow216.png
    R wwwbase/img/zepu/shadows/shadow350.png
    R wwwbase/img/zepu/shadows/shadow538.png
    R wwwbase/img/zepu/shadows/shadow875.png
    M wwwbase/styles/common.css
    M wwwbase/styles/hangman.css
    M wwwbase/styles/mill.css
    M wwwbase/styles/polar.css
    M wwwbase/styles/zepu.css

  Log Message:
  -----------
  Merge from master into paradigm


Compare: https://github.com/CatalinFrancu/dexonline/compare/b79ff6c4969e...40dd194960e3


More information about the Dev mailing list