[zanata/zanata-tests] d27fb8: Merge branch 'master' of github.com:zanata/zanata-...

[GitHub]

  Branch: refs/heads/wip
  Home:   https://github.com/zanata/zanata-tests
  Commit: d27fb800d761af474bc3d2c7f34f6927ad111c33
      https://github.com/zanata/zanata-tests/commit/d27fb800d761af474bc3d2c7f34f6927ad111c33
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2012-02-08 (Wed, 08 Feb 2012)

  Changed paths:
    M selenium/src/functions/ui-map.js
    M selenium/src/test-suites/Project/CreateProject.html
    M selenium/src/test-suites/Project/CreateVersion.html
    M selenium/src/test-suites/TranslationEditor/Issue50/CleanPage2EntryLast.html

  Log Message:
  -----------
  Merge branch 'master' of github.com:zanata/zanata-tests


  Commit: 5c0d184d8d932cdb28429e959f43fbcef0162f71
      https://github.com/zanata/zanata-tests/commit/5c0d184d8d932cdb28429e959f43fbcef0162f71
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2012-02-20 (Mon, 20 Feb 2012)

  Changed paths:
    M test.cfg

  Log Message:
  -----------
  test.cfg: add def.usersys as server profile


  Commit: 096789a1fecfe30c2bea504ffeb41d6c154e14ff
      https://github.com/zanata/zanata-tests/commit/096789a1fecfe30c2bea504ffeb41d6c154e14ff
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2012-02-27 (Mon, 27 Feb 2012)

  Changed paths:
    A scripts/get_project.pl
    R scripts/get_project.pl
    M scripts/pomXml_generate.pl
    M scripts/pomXml_insert_zanata.pl
    M test.cfg

  Log Message:
  -----------
  Merge branch 'wip'


  Commit: 712bfeaf954f1e99965fc921fc8e840dc5b00763
      https://github.com/zanata/zanata-tests/commit/712bfeaf954f1e99965fc921fc8e840dc5b00763
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2012-02-28 (Tue, 28 Feb 2012)

  Changed paths:
    A scripts/get_project.pl
    R scripts/get_project.pl
    M scripts/pomXml_generate.pl
    M scripts/pomXml_insert_zanata.pl
    M test.cfg

  Log Message:
  -----------
  Merge branch 'master' of github.com:zanata/zanata-tests


  Commit: 1be2f236074e045746fd65c31b7f4e38e652508f
      https://github.com/zanata/zanata-tests/commit/1be2f236074e045746fd65c31b7f4e38e652508f
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2012-06-12 (Tue, 12 Jun 2012)

  Changed paths:
    M CMakeLists.txt
    M RestTest.cmake
    A scripts/Zanata/XML.pm
    M scripts/compare_translation_dir.sh
    M scripts/get_project.pl
    A scripts/zanata_xml_append
    A scripts/zanatac
    M selenium/src/CMakeLists.txt
    M selenium/src/functions/ui-map.js
    M selenium/src/initial_setup/ManageLanguages.html.in
    M test.cfg
    A zanata.prjmant.ini

  Log Message:
  -----------
  Merge branch 'wip'


  Commit: 9e11cfb76ea950d7d37793a1bd188e42dbfe36a8
      https://github.com/zanata/zanata-tests/commit/9e11cfb76ea950d7d37793a1bd188e42dbfe36a8
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2012-06-15 (Fri, 15 Jun 2012)

  Changed paths:
    M .gitignore
    M selenium/src/CMakeLists.txt
    M test.cfg

  Log Message:
  -----------
  Merge branch 'wip'


  Commit: 39508e41d7194c30eac3f7b0c67138aabc84e7a0
      https://github.com/zanata/zanata-tests/commit/39508e41d7194c30eac3f7b0c67138aabc84e7a0
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2012-06-17 (Sun, 17 Jun 2012)

  Changed paths:
    M test.cfg

  Log Message:
  -----------
  Merge branch 'wip'


  Commit: 92dd900fcd07d3fb83a730ecc707dbb4727c193a
      https://github.com/zanata/zanata-tests/commit/92dd900fcd07d3fb83a730ecc707dbb4727c193a
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2012-06-18 (Mon, 18 Jun 2012)

  Changed paths:
    M RestTest.cmake
    M scripts/zanatac
    M test.cfg

  Log Message:
  -----------
  Merge branch 'wip'


  Commit: c4d08eadd7d4bcc8c2303922a019c6dd760dc58c
      https://github.com/zanata/zanata-tests/commit/c4d08eadd7d4bcc8c2303922a019c6dd760dc58c
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2012-06-19 (Tue, 19 Jun 2012)

  Changed paths:
    M CMakeLists.txt
    M RestTest.cmake

  Log Message:
  -----------
  Merge branch 'wip'


  Commit: 47dd107b5ee301ff60c7493155128524004ba0be
      https://github.com/zanata/zanata-tests/commit/47dd107b5ee301ff60c7493155128524004ba0be
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2012-06-19 (Tue, 19 Jun 2012)

  Changed paths:
    A scripts/CTest2JUnit.pl
    A scripts/CTest2JUnit.xsl
    A scripts/rest_mvn_run.sh

  Log Message:
  -----------
  Merge branch 'wip'


  Commit: 9c8684512a62bfc57b77298c11f486ae11d6b1d8
      https://github.com/zanata/zanata-tests/commit/9c8684512a62bfc57b77298c11f486ae11d6b1d8
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2012-06-19 (Tue, 19 Jun 2012)

  Changed paths:
    M scripts/rest_mvn_run.sh

  Log Message:
  -----------
  Merge branch 'wip'


  Commit: 3818041bf9b8f2b1cd42282222e68d4fb1fa641e
      https://github.com/zanata/zanata-tests/commit/3818041bf9b8f2b1cd42282222e68d4fb1fa641e
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2012-06-19 (Tue, 19 Jun 2012)

  Changed paths:
    R scripts/Zanata/XML.pm
    R scripts/generate_zanata_xml.sh
    R scripts/import.pl
    R scripts/manage_variable.pl
    R scripts/pomXml_generate.pl
    R scripts/pomXml_insert_zanata.pl
    M scripts/rest_mvn_run.sh
    R scripts/switch_version.pl
    R scripts/zanata_xml_append

  Log Message:
  -----------
  Merge branch 'wip'


  Commit: a07698a93e79076ae8e671ec75282eb0fc71efc8
      https://github.com/zanata/zanata-tests/commit/a07698a93e79076ae8e671ec75282eb0fc71efc8
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2012-06-19 (Tue, 19 Jun 2012)

  Changed paths:
    M scripts/CTest2JUnit.xsl

  Log Message:
  -----------
  Merge branch 'wip'


  Commit: 38ca3096abcb03b3cccd8493f01ef79a5738319e
      https://github.com/zanata/zanata-tests/commit/38ca3096abcb03b3cccd8493f01ef79a5738319e
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2012-06-20 (Wed, 20 Jun 2012)

  Changed paths:
    M scripts/CTest2JUnit.xsl

  Log Message:
  -----------
  Merge branch 'wip'


  Commit: e9405e43cf147c3b5a867dcaefce37469e79bfe3
      https://github.com/zanata/zanata-tests/commit/e9405e43cf147c3b5a867dcaefce37469e79bfe3
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2012-06-21 (Thu, 21 Jun 2012)

  Changed paths:
    M .gitignore
    M CMakeLists.txt
    R RestTest.cmake
    A client-tests/CMakeLists.txt
    A client-tests/compendium.csv
    A client-tests/mvn/CMakeLists.txt
    A client-tests/py/CMakeLists.txt
    M scripts/rest_mvn_run.sh
    M scripts/zanatac
    M selenium/src/CMakeLists.txt
    M test.cfg
    A utils.cmake

  Log Message:
  -----------
  Merge branch 'wip'

Conflicts:
	test.cfg


  Commit: 243ca18ba8b513485a70b6a480f2a87276356e1e
      https://github.com/zanata/zanata-tests/commit/243ca18ba8b513485a70b6a480f2a87276356e1e
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2012-06-21 (Thu, 21 Jun 2012)

  Changed paths:
    M scripts/CTest2JUnit.xsl

  Log Message:
  -----------
  Merge branch 'wip'


  Commit: 26b294c5dde23ca805f9a12104cd3a3528167a01
      https://github.com/zanata/zanata-tests/commit/26b294c5dde23ca805f9a12104cd3a3528167a01
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2012-06-25 (Mon, 25 Jun 2012)

  Changed paths:
    M test.cfg

  Log Message:
  -----------
  Merge branch 'wip'


  Commit: 3c858328b5de039e27b93830eeced4fa34b8b525
      https://github.com/zanata/zanata-tests/commit/3c858328b5de039e27b93830eeced4fa34b8b525
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2012-06-25 (Mon, 25 Jun 2012)

  Changed paths:
    M test.cfg

  Log Message:
  -----------
  Merge branch 'wip'


  Commit: ae0e8645333c8afe6eafd18b6dfb3e378d104564
      https://github.com/zanata/zanata-tests/commit/ae0e8645333c8afe6eafd18b6dfb3e378d104564
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2012-06-26 (Tue, 26 Jun 2012)

  Changed paths:
    M test.cfg

  Log Message:
  -----------
  Merge branch 'wip'


  Commit: 6641f5bcb5ef60aadcf6bc550d9503362b48cf97
      https://github.com/zanata/zanata-tests/commit/6641f5bcb5ef60aadcf6bc550d9503362b48cf97
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2012-07-24 (Tue, 24 Jul 2012)

  Changed paths:
    M scripts/get_project.pl
    M selenium/src/CMakeLists.txt
    A selenium/src/initial_setup/CMakeLists.txt
    M selenium/src/initial_setup/ServerConfiguration.html.in
    M test.cfg
    M utils.cmake

  Log Message:
  -----------
  Merge branch 'wip'


  Commit: d4b0c696d4dfb9f178b5251cb5f44d22b4a34043
      https://github.com/zanata/zanata-tests/commit/d4b0c696d4dfb9f178b5251cb5f44d22b4a34043
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M selenium/src/initial_setup/CMakeLists.txt

  Log Message:
  -----------
  Merge branch 'wip'


Compare: https://github.com/zanata/zanata-tests/compare/451e7661fce6...d4b0c696d4df