[zanata/zanata] 38361c: Project iteration group - entity and db changelog

GitHub noreply at github.com
Fri Apr 20 05:40:31 UTC 2012


  Branch: refs/heads/integration/master
  Home:   https://github.com/zanata/zanata
  Commit: 38361c1e3ea52006a782d19b2fd03ec801e12d2a
      https://github.com/zanata/zanata/commit/38361c1e3ea52006a782d19b2fd03ec801e12d2a
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-04-10 (Tue, 10 Apr 2012)

  Changed paths:
    A server/zanata-model/src/main/java/org/zanata/model/HIterationGroup.java
    M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.6a.xml

  Log Message:
  -----------
  Project iteration group - entity and db changelog


  Commit: 0731debe53462e97664ba1c6149cc44a4085a54c
      https://github.com/zanata/zanata/commit/0731debe53462e97664ba1c6149cc44a4085a54c
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-04-10 (Tue, 10 Apr 2012)

  Changed paths:
    A server/zanata-war/src/main/java/org/zanata/action/VersionGroupAction.java
    A server/zanata-war/src/main/java/org/zanata/service/VersionGroupService.java
    A server/zanata-war/src/main/java/org/zanata/service/impl/VersionGroupServiceImpl.java
    M server/zanata-war/src/main/resources/messages.properties
    M server/zanata-war/src/main/webapp/WEB-INF/layout/menu.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/pages.xml
    M server/zanata-war/src/main/webapp/admin/home.xhtml
    A server/zanata-war/src/main/webapp/admin/versiongroupmanager.xhtml

  Log Message:
  -----------
  Version group support - work in progress


  Commit: 0307a4ac7a5534a16536e217e3a61ad87a5c71ef
      https://github.com/zanata/zanata/commit/0307a4ac7a5534a16536e217e3a61ad87a5c71ef
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-04-11 (Wed, 11 Apr 2012)

  Changed paths:
    M server/zanata-war/src/main/resources/messages.properties
    M server/zanata-war/src/main/webapp/admin/versiongroupmanager.xhtml

  Log Message:
  -----------
  Project iteration group - work in progress


  Commit: f2ad51b717ffa18ed0f3dfe836cc7bc1b48445b7
      https://github.com/zanata/zanata/commit/f2ad51b717ffa18ed0f3dfe836cc7bc1b48445b7
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-04-11 (Wed, 11 Apr 2012)

  Changed paths:
    A server/zanata-war/src/main/java/org/zanata/dao/VersionGroupDAO.java
    M server/zanata-war/src/main/java/org/zanata/service/impl/VersionGroupServiceImpl.java
    M server/zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    M server/zanata-war/src/test/jboss-embedded-bootstrap/META-INF/persistence.xml
    M server/zanata-war/src/test/resources/META-INF/persistence.xml

  Log Message:
  -----------
  Iteration group - work in progress: implemented list of groups table


  Commit: d097eaf6bc96420d68e210d8598b0a4dea6924f3
      https://github.com/zanata/zanata/commit/d097eaf6bc96420d68e210d8598b0a4dea6924f3
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-04-11 (Wed, 11 Apr 2012)

  Changed paths:
    R server/zanata-war/src/main/java/org/zanata/action/VersionGroupAction.java
    A server/zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java
    M server/zanata-war/src/main/java/org/zanata/dao/VersionGroupDAO.java
    M server/zanata-war/src/main/java/org/zanata/service/VersionGroupService.java
    M server/zanata-war/src/main/java/org/zanata/service/impl/VersionGroupServiceImpl.java
    M server/zanata-war/src/main/resources/messages.properties
    A server/zanata-war/src/main/webapp/WEB-INF/layout/version_group_details_form.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/pages.xml
    A server/zanata-war/src/main/webapp/admin/versiongroupdetails.xhtml
    M server/zanata-war/src/main/webapp/admin/versiongroupmanager.xhtml

  Log Message:
  -----------
  Project version group - implemented add group by admin


  Commit: 64a029789418eb98753239eded3ac65e4982e8cb
      https://github.com/zanata/zanata/commit/64a029789418eb98753239eded3ac65e4982e8cb
  Author: Alex Eng <loones1595 at gmail.com>
  Date:   2012-04-12 (Thu, 12 Apr 2012)

  Changed paths:
    M server/zanata-model/src/main/java/org/zanata/model/HIterationGroup.java
    M server/zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java
    M server/zanata-war/src/main/java/org/zanata/dao/VersionGroupDAO.java
    M server/zanata-war/src/main/java/org/zanata/service/VersionGroupService.java
    M server/zanata-war/src/main/java/org/zanata/service/impl/VersionGroupServiceImpl.java
    M server/zanata-war/src/main/resources/messages.properties
    M server/zanata-war/src/main/webapp/WEB-INF/layout/menu.xhtml
    R server/zanata-war/src/main/webapp/WEB-INF/layout/version_group_details_form.xhtml
    A server/zanata-war/src/main/webapp/WEB-INF/layout/version_group_edit_form.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/pages.xml
    M server/zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    M server/zanata-war/src/main/webapp/admin/home.xhtml
    R server/zanata-war/src/main/webapp/admin/versiongroupdetails.xhtml
    R server/zanata-war/src/main/webapp/admin/versiongroupmanager.xhtml
    A server/zanata-war/src/main/webapp/version-group/create_version_group.xhtml
    A server/zanata-war/src/main/webapp/version-group/home.xhtml
    A server/zanata-war/src/main/webapp/version-group/version_group.xhtml

  Log Message:
  -----------
  Iteration group: work in progress: implementing maintainers for iteration group


  Commit: 68fba86166b8bddac0bb1f179b560f956c98913f
      https://github.com/zanata/zanata/commit/68fba86166b8bddac0bb1f179b560f956c98913f
  Author: Alex Eng <loones1595 at gmail.com>
  Date:   2012-04-12 (Thu, 12 Apr 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java
    M server/zanata-war/src/main/resources/messages.properties
    M server/zanata-war/src/main/webapp/WEB-INF/layout/version_group_edit_form.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/pages.xml
    M server/zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    A server/zanata-war/src/main/webapp/version-group/assign_maintainer.xhtml
    A server/zanata-war/src/main/webapp/version-group/edit.xhtml
    M server/zanata-war/src/main/webapp/version-group/version_group.xhtml

  Log Message:
  -----------
  Iteration group: work in progress: implementing maintainers


  Commit: 7dbbb606ecc53d631867c3fdaede3557912dc2ea
      https://github.com/zanata/zanata/commit/7dbbb606ecc53d631867c3fdaede3557912dc2ea
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-04-15 (Sun, 15 Apr 2012)

  Changed paths:
    M server/zanata-model/src/main/java/org/zanata/model/HIterationGroup.java
    M server/zanata-model/src/main/java/org/zanata/model/HPerson.java
    M server/zanata-war/src/main/java/org/zanata/action/AccountSearchAction.java
    M server/zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java
    A server/zanata-war/src/main/java/org/zanata/action/VersionGroupMaintainerManageAction.java
    M server/zanata-war/src/main/java/org/zanata/dao/VersionGroupDAO.java
    M server/zanata-war/src/main/resources/messages.properties
    M server/zanata-war/src/main/resources/security.drl
    M server/zanata-war/src/main/webapp/WEB-INF/layout/version_group_edit_form.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/pages.xml
    M server/zanata-war/src/main/webapp/project/assign_maintainer.xhtml
    M server/zanata-war/src/main/webapp/project/maintainerdetail.xhtml
    M server/zanata-war/src/main/webapp/version-group/assign_maintainer.xhtml
    M server/zanata-war/src/main/webapp/version-group/create_version_group.xhtml
    M server/zanata-war/src/main/webapp/version-group/edit.xhtml
    A server/zanata-war/src/main/webapp/version-group/maintainerdetail.xhtml
    M server/zanata-war/src/main/webapp/version-group/version_group.xhtml

  Log Message:
  -----------
  Project iteration grouping - add maintainers, edit group details


  Commit: 3ddf15f75ccc7c9bfcf49280c90471262e8764d1
      https://github.com/zanata/zanata/commit/3ddf15f75ccc7c9bfcf49280c90471262e8764d1
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-04-15 (Sun, 15 Apr 2012)

  Changed paths:
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/glossary/push/GlossaryPushCommand.java
    M common/zanata-common-api/src/main/java/org/zanata/rest/client/IGlossaryResource.java
    M common/zanata-rest-client/src/test/java/org/zanata/rest/client/TestProxyFactory.java
    M server/zanata-model/src/main/java/org/zanata/model/HGlossaryTerm.java
    M server/zanata-model/src/main/java/org/zanata/model/HTermComment.java
    M server/zanata-war/src/main/java/org/zanata/rest/service/GlossaryService.java
    M server/zanata-war/src/main/java/org/zanata/seam/interceptor/MonitoringWrapper.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java
    M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.6a.xml
    M server/zanata-war/src/main/resources/messages.properties
    M server/zanata-war/src/main/webapp-jboss/WEB-INF/jboss-web.xml
    M server/zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/menu.xhtml
    M server/zanata-war/src/main/webapp/admin/home.xhtml
    M server/zanata-war/src/test/java/org/zanata/model/HGlossaryEntryJPATest.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/GlossaryRestTest.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/GlossaryServiceSeamTest.java
    M server/zanata-war/src/test/resources/AllIntegrationTests.tng.xml
    R zanata-mead.spec.tmpl

  Log Message:
  -----------
  Merge branch 'master' into rhbz800869


  Commit: 08bdf8e95d82bab114682a7a29f52c171ded09d0
      https://github.com/zanata/zanata/commit/08bdf8e95d82bab114682a7a29f52c171ded09d0
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-04-15 (Sun, 15 Apr 2012)

  Changed paths:
    M server/zanata-model/src/main/java/org/zanata/model/HIterationGroup.java
    A server/zanata-war/src/main/java/org/zanata/action/VersionGroupAction.java
    M server/zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java
    M server/zanata-war/src/main/java/org/zanata/dao/VersionGroupDAO.java
    M server/zanata-war/src/main/java/org/zanata/service/VersionGroupService.java
    M server/zanata-war/src/main/java/org/zanata/service/impl/VersionGroupServiceImpl.java
    M server/zanata-war/src/main/resources/messages.properties
    M server/zanata-war/src/main/webapp/WEB-INF/layout/menu.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/version_group_edit_form.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/pages.xml
    M server/zanata-war/src/main/webapp/version-group/assign_maintainer.xhtml
    M server/zanata-war/src/main/webapp/version-group/create_version_group.xhtml
    M server/zanata-war/src/main/webapp/version-group/edit.xhtml
    M server/zanata-war/src/main/webapp/version-group/home.xhtml
    M server/zanata-war/src/main/webapp/version-group/maintainerdetail.xhtml
    M server/zanata-war/src/main/webapp/version-group/version_group.xhtml

  Log Message:
  -----------
  Project iteration grouping: work in progress, implementing search


  Commit: c6420a1334c81e72693d266cfac73dde8909b9de
      https://github.com/zanata/zanata/commit/c6420a1334c81e72693d266cfac73dde8909b9de
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-04-16 (Mon, 16 Apr 2012)

  Changed paths:
    A brew.repo
    A server/zanata-model/src/main/java/org/zanata/hibernate/search/GroupSearchBridge.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    M server/zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java
    M server/zanata-war/src/main/java/org/zanata/action/VersionGroupMaintainerManageAction.java
    M server/zanata-war/src/main/java/org/zanata/dao/VersionGroupDAO.java
    M server/zanata-war/src/main/java/org/zanata/service/VersionGroupService.java
    M server/zanata-war/src/main/java/org/zanata/service/impl/VersionGroupServiceImpl.java
    M server/zanata-war/src/main/webapp/META-INF/MANIFEST.MF
    M server/zanata-war/src/main/webapp/language/language.xhtml

  Log Message:
  -----------
  Project version group - work in progress: project search


  Commit: dfbc215a572e3839887fe8a0bede387f8f7abb3e
      https://github.com/zanata/zanata/commit/dfbc215a572e3839887fe8a0bede387f8f7abb3e
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-04-16 (Mon, 16 Apr 2012)

  Changed paths:
    M server/zanata-model/src/main/java/org/zanata/hibernate/search/GroupSearchBridge.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    M server/zanata-war/src/main/java/org/zanata/action/ProjectSearch.java
    M server/zanata-war/src/main/java/org/zanata/action/VersionGroupAction.java
    M server/zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java
    M server/zanata-war/src/main/java/org/zanata/dao/VersionGroupDAO.java
    M server/zanata-war/src/main/java/org/zanata/service/VersionGroupService.java
    M server/zanata-war/src/main/java/org/zanata/service/impl/VersionGroupServiceImpl.java
    M server/zanata-war/src/main/webapp/version-group/version_group.xhtml

  Log Message:
  -----------
  Project version group: work in progress, implementing project slug search


  Commit: 693af05af1ea5c675f930ca8bb9419682dbbf216
      https://github.com/zanata/zanata/commit/693af05af1ea5c675f930ca8bb9419682dbbf216
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-04-16 (Mon, 16 Apr 2012)

  Changed paths:
    M server/zanata-model/src/main/java/org/zanata/hibernate/search/GroupSearchBridge.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    M server/zanata-war/src/main/java/org/zanata/action/VersionGroupAction.java
    M server/zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.java
    M server/zanata-war/src/main/java/org/zanata/dao/VersionGroupDAO.java
    M server/zanata-war/src/main/java/org/zanata/service/VersionGroupService.java
    M server/zanata-war/src/main/java/org/zanata/service/impl/VersionGroupServiceImpl.java
    M server/zanata-war/src/main/webapp/version-group/version_group.xhtml

  Log Message:
  -----------
  Project version group: work in progress, implementing search UI


  Commit: 13bbbfec3559d03106ac5b22b1bb49d703a66ea4
      https://github.com/zanata/zanata/commit/13bbbfec3559d03106ac5b22b1bb49d703a66ea4
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-04-16 (Mon, 16 Apr 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/action/VersionGroupAction.java
    M server/zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.java
    M server/zanata-war/src/main/java/org/zanata/service/VersionGroupService.java
    M server/zanata-war/src/main/java/org/zanata/service/impl/VersionGroupServiceImpl.java
    M server/zanata-war/src/main/resources/messages.properties
    M server/zanata-war/src/main/webapp/version-group/version_group.xhtml

  Log Message:
  -----------
  Project version group: work in progress


  Commit: 8bc60060a0c0a3b1189daa8c94dd75ad55431217
      https://github.com/zanata/zanata/commit/8bc60060a0c0a3b1189daa8c94dd75ad55431217
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-04-16 (Mon, 16 Apr 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
    M server/zanata-war/src/main/java/org/zanata/action/ProjectAction.java
    R server/zanata-war/src/main/java/org/zanata/action/ProjectIterationAction.java
    M server/zanata-war/src/main/java/org/zanata/action/ProjectIterationZipFileAction.java
    M server/zanata-war/src/main/java/org/zanata/action/ProjectMaintainerManageAction.java
    M server/zanata-war/src/main/java/org/zanata/action/SlugHome.java
    M server/zanata-war/src/main/java/org/zanata/action/VersionGroupAction.java
    M server/zanata-war/src/main/java/org/zanata/action/VersionGroupMaintainerManageAction.java
    M server/zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
    M server/zanata-war/src/main/java/org/zanata/rest/service/GlossaryService.java
    M server/zanata-war/src/main/java/org/zanata/rest/service/TranslationResourcesService.java
    R server/zanata-war/src/main/java/org/zanata/security/BaseSecurityChecker.java
    R server/zanata-war/src/main/java/org/zanata/security/SecurityChecker.java
    M server/zanata-war/src/main/java/org/zanata/service/LocaleService.java
    M server/zanata-war/src/main/java/org/zanata/service/impl/LocaleServiceImpl.java
    M server/zanata-war/src/main/webapp/META-INF/MANIFEST.MF
    M server/zanata-war/src/main/webapp/WEB-INF/layout/search_panel.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/pages.xml
    M server/zanata-war/src/main/webapp/iteration/view.xhtml
    M server/zanata-war/src/main/webapp/language/language.xhtml
    M server/zanata-war/src/main/webapp/project/assign_maintainer.xhtml
    M server/zanata-war/src/main/webapp/project/home.xhtml
    M server/zanata-war/src/main/webapp/project/maintainerdetail.xhtml
    M server/zanata-war/src/main/webapp/project/project.xhtml
    M server/zanata-war/src/main/webapp/version-group/assign_maintainer.xhtml
    M server/zanata-war/src/main/webapp/version-group/maintainerdetail.xhtml
    M server/zanata-war/src/main/webapp/version-group/version_group.xhtml

  Log Message:
  -----------
  Merge branch 'master' into rhbz800869

Conflicts:
	server/zanata-war/src/main/webapp/META-INF/MANIFEST.MF
	server/zanata-war/src/main/webapp/language/language.xhtml


  Commit: 140526505c2cf406ccfd4554fc9193bbd28acabf
      https://github.com/zanata/zanata/commit/140526505c2cf406ccfd4554fc9193bbd28acabf
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-04-16 (Mon, 16 Apr 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/action/VersionGroupMaintainerManageAction.java
    M server/zanata-war/src/main/resources/security.drl
    M server/zanata-war/src/main/webapp/WEB-INF/pages.xml
    M server/zanata-war/src/main/webapp/version-group/home.xhtml

  Log Message:
  -----------
  Project version group: fix security problem after refactoring


  Commit: 40d95ee2ba6f0e023d5399ad7cd10deb607ea93c
      https://github.com/zanata/zanata/commit/40d95ee2ba6f0e023d5399ad7cd10deb607ea93c
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-04-17 (Tue, 17 Apr 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/action/ProjectAction.java
    M server/zanata-war/src/main/java/org/zanata/action/VersionGroupAction.java
    M server/zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java
    M server/zanata-war/src/main/java/org/zanata/service/VersionGroupService.java
    M server/zanata-war/src/main/java/org/zanata/service/impl/VersionGroupServiceImpl.java
    M server/zanata-war/src/main/webapp/WEB-INF/pages.xml
    M server/zanata-war/src/main/webapp/language/language.xhtml
    M server/zanata-war/src/main/webapp/project/assign_maintainer.xhtml
    M server/zanata-war/src/main/webapp/version-group/assign_maintainer.xhtml
    M server/zanata-war/src/main/webapp/version-group/version_group.xhtml

  Log Message:
  -----------
  project version group: work in progress: implementing new layout for maintainers


  Commit: 2678458e66a2578c222b9ea54f492b92f82905ca
      https://github.com/zanata/zanata/commit/2678458e66a2578c222b9ea54f492b92f82905ca
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-04-17 (Tue, 17 Apr 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/action/PasswordResetRequestAction.java
    M server/zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
    M server/zanata-war/src/main/java/org/zanata/dao/AccountDAO.java
    A server/zanata-war/src/main/java/org/zanata/service/UserAccountService.java
    A server/zanata-war/src/main/java/org/zanata/service/impl/UserAccountServiceImpl.java
    M server/zanata-war/src/main/webapp/WEB-INF/pages.xml
    M server/zanata-war/src/main/webapp/iteration/view.xhtml

  Log Message:
  -----------
  Merge branch 'master' into rhbz800869


  Commit: e65e3107d9a6b708d5b23acaa609251ee4428b0c
      https://github.com/zanata/zanata/commit/e65e3107d9a6b708d5b23acaa609251ee4428b0c
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-04-17 (Tue, 17 Apr 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/action/ProjectAction.java
    M server/zanata-war/src/main/java/org/zanata/action/ProjectMaintainerManageAction.java
    M server/zanata-war/src/main/java/org/zanata/action/VersionGroupMaintainerManageAction.java
    M server/zanata-war/src/main/resources/messages.properties
    A server/zanata-war/src/main/webapp/WEB-INF/layout/add_maintainer_form.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/pages.xml
    M server/zanata-war/src/main/webapp/language/language.xhtml
    M server/zanata-war/src/main/webapp/project/assign_maintainer.xhtml
    R server/zanata-war/src/main/webapp/project/maintainerdetail.xhtml
    M server/zanata-war/src/main/webapp/stylesheet/zanata.css
    M server/zanata-war/src/main/webapp/version-group/assign_maintainer.xhtml
    R server/zanata-war/src/main/webapp/version-group/maintainerdetail.xhtml
    M server/zanata-war/src/main/webapp/version-group/version_group.xhtml

  Log Message:
  -----------
  Project version group: implemented popup panel for adding new maintainer


  Commit: 309b19d0f52199d4a7862204f2e7cf4eadc0b32e
      https://github.com/zanata/zanata/commit/309b19d0f52199d4a7862204f2e7cf4eadc0b32e
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-04-17 (Tue, 17 Apr 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorPresenter.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenter.java

  Log Message:
  -----------
  Merge branch 'master' into rhbz800869


  Commit: 241e4fa074e78cb6b3553079a3b378b525711d00
      https://github.com/zanata/zanata/commit/241e4fa074e78cb6b3553079a3b378b525711d00
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-04-17 (Tue, 17 Apr 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/action/VersionGroupMaintainerManageAction.java
    M server/zanata-war/src/main/java/org/zanata/service/impl/VersionGroupServiceImpl.java
    M server/zanata-war/src/main/resources/messages.properties
    A server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/crystal_project/_16x16/actions/button_cancel.png
    A server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/crystal_project/_16x16/actions/button_ok.png
    A server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/crystal_project/_16x16/actions/edit_user.png
    A server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/crystal_project/_16x16/actions/help.png
    A server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/crystal_project/_16x16/actions/lin_agt_wrench.png
    A server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/crystal_project/_16x16/actions/search.png
    A server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/crystal_project/_16x16/apps/kdf.png
    A server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/crystal_project/_16x16/apps/kllckety.png
    A server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/crystal_project/_16x16/apps/locale.png
    A server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/crystal_project/_16x16/filesystems/folder_home.png
    M server/zanata-war/src/main/webapp/WEB-INF/layout/add_maintainer_form.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/menu.xhtml
    M server/zanata-war/src/main/webapp/project/assign_maintainer.xhtml
    M server/zanata-war/src/main/webapp/project/project.xhtml
    M server/zanata-war/src/main/webapp/stylesheet/zanata.css
    M server/zanata-war/src/main/webapp/version-group/assign_maintainer.xhtml
    M server/zanata-war/src/main/webapp/version-group/version_group.xhtml

  Log Message:
  -----------
  project version group: add new icon for menu, implemented maintainers new UI


  Commit: 064644c2064e26efe6dd54d1fb18bd70e7cc124d
      https://github.com/zanata/zanata/commit/064644c2064e26efe6dd54d1fb18bd70e7cc124d
  Author: Alex Eng <loones1595 at gmail.com>
  Date:   2012-04-18 (Wed, 18 Apr 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/action/VersionGroupAction.java
    M server/zanata-war/src/main/java/org/zanata/action/VersionGroupMaintainerManageAction.java
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/cell_middle_bg.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/cell_top_bg.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/menu_active_bg.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/panel-header-bg.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/photos.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/silk/cross.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/silk/help.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/silk/home.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/silk/photos.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/silk/tick.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/silk/user.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/silk/world.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/silk/wrench.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/silk/zoom.png
    M server/zanata-war/src/main/webapp/WEB-INF/layout/add_maintainer_form.xhtml
    M server/zanata-war/src/main/webapp/version-group/home.xhtml
    M server/zanata-war/src/main/webapp/version-group/version_group.xhtml

  Log Message:
  -----------
  project version group: implemented filtering by group name, removed unused images


  Commit: 29647352bf660f3c8827d8864fbea8aedd24b9e3
      https://github.com/zanata/zanata/commit/29647352bf660f3c8827d8864fbea8aedd24b9e3
  Author: Alex Eng <loones1595 at gmail.com>
  Date:   2012-04-18 (Wed, 18 Apr 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/Resources.java
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/approved_unit.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/configure.png
    A server/zanata-war/src/main/resources/org/zanata/webtrans/images/crystal_project/_16x16/actions/info.png
    A server/zanata-war/src/main/resources/org/zanata/webtrans/images/crystal_project/_16x16/filesystems/file_doc.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/error_unit.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/first_page_disabled.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/first_page_old.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/fuzzy_unit.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/last_page_disabled.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/last_page_old.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/new_unit.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/next_page_disabled.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/next_page_old.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/no_page.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/pin.gif
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/prev_page_disabled.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/prev_page_old.png
    A server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/crystal_project/_16x16/actions/messagebox_critical.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/error.gif
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/silk/folder.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/silk/information.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/silk/page_white_text.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/silk/user.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/silk/world.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/tm_view.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/unpin.gif
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/x2.png
    M server/zanata-war/src/main/webapp/WEB-INF/layout/edit.xhtml

  Log Message:
  -----------
  Remove unused image file


  Commit: f4ac932ac98e00ecc488a2c612215c58562bd592
      https://github.com/zanata/zanata/commit/f4ac932ac98e00ecc488a2c612215c58562bd592
  Author: Alex Eng <loones1595 at gmail.com>
  Date:   2012-04-18 (Wed, 18 Apr 2012)

  Changed paths:
    M server/zanata-war/src/main/resources/messages.properties
    M server/zanata-war/src/main/webapp/admin/rolemanager.xhtml
    M server/zanata-war/src/main/webapp/admin/usermanager.xhtml
    M server/zanata-war/src/main/webapp/version-group/home.xhtml

  Log Message:
  -----------
  Centered align admin page


  Commit: 89292486d76fe04ede059ca6716e85940b338e07
      https://github.com/zanata/zanata/commit/89292486d76fe04ede059ca6716e85940b338e07
  Author: Alex Eng <loones1595 at gmail.com>
  Date:   2012-04-18 (Wed, 18 Apr 2012)

  Changed paths:
    M common/zanata-adapter-po/src/main/java/org/zanata/adapter/po/PoReader2.java
    M common/zanata-adapter-po/src/test/java/org/zanata/adapter/po/PoReader2Test.java
    M common/zanata-common-util/src/main/java/org/zanata/util/StringUtil.java
    M server/zanata-model/pom.xml
    A server/zanata-model/src/main/java/org/zanata/hibernate/search/CaseSensitiveNgramAnalyzer.java
    A server/zanata-model/src/main/java/org/zanata/hibernate/search/ConfigurableNgramAnalyzer.java
    A server/zanata-model/src/main/java/org/zanata/hibernate/search/ContainingWorkspaceBridge.java
    M server/zanata-model/src/main/java/org/zanata/hibernate/search/DefaultNgramAnalyzer.java
    A server/zanata-model/src/main/java/org/zanata/hibernate/search/IndexFieldLabels.java
    A server/zanata-model/src/main/java/org/zanata/hibernate/search/StringListBridge.java
    A server/zanata-model/src/main/java/org/zanata/hibernate/search/ULowerCaseFilter.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M server/zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java
    M server/zanata-war/src/main/java/org/zanata/rest/service/TranslationResourcesService.java
    A server/zanata-war/src/main/java/org/zanata/search/FilterConstraints.java
    A server/zanata-war/src/main/java/org/zanata/service/TextFlowSearchService.java
    A server/zanata-war/src/main/java/org/zanata/service/TranslationService.java
    A server/zanata-war/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java
    A server/zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransClientModule.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/history/HistoryToken.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/MainView.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.ui.xml
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/view/SearchResultsView.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/view/SearchResultsView.ui.xml
    A server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetProjectTransUnitListsHandler.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ReplaceTextHandler.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransUnit.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetProjectTransUnitLists.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetProjectTransUnitListsResult.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/ReplaceText.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/UpdateTransUnit.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/util/TextFlowFilterImpl.java
    M server/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
    M server/zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/DocumentListPresenterTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTransUnitCommand.java
    A server/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/ReplaceTextHandlerTest.java

  Log Message:
  -----------
  Merge branch 'master' into rhbz800869

Conflicts:
	server/zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java


  Commit: 5179c937fdd6987faa4253c7e29fb8456b3a5a9f
      https://github.com/zanata/zanata/commit/5179c937fdd6987faa4253c7e29fb8456b3a5a9f
  Author: Alex Eng <loones1595 at gmail.com>
  Date:   2012-04-18 (Wed, 18 Apr 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/action/VersionGroupAction.java
    M server/zanata-war/src/main/resources/messages.properties
    M server/zanata-war/src/main/webapp/project/home.xhtml
    M server/zanata-war/src/main/webapp/search.xhtml
    M server/zanata-war/src/main/webapp/version-group/home.xhtml
    M server/zanata-war/src/main/webapp/version-group/version_group.xhtml

  Log Message:
  -----------
  project version group: rename project name column


  Commit: 1e2c25c1e030f97d8337a9122d17e5b16a84a69f
      https://github.com/zanata/zanata/commit/1e2c25c1e030f97d8337a9122d17e5b16a84a69f
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-04-19 (Thu, 19 Apr 2012)

  Changed paths:
    M client/pom.xml
    M client/zanata-adapter-properties/pom.xml
    M client/zanata-adapter-xliff/pom.xml
    M client/zanata-client-ant-po/pom.xml
    M client/zanata-client-ant-properties/pom.xml
    M client/zanata-client-commands/pom.xml
    M client/zanata-maven-plugin/pom.xml
    M common/pom.xml
    M common/zanata-adapter-po/pom.xml
    M common/zanata-adapter-po/src/main/java/org/zanata/adapter/po/PoWriter2.java
    M common/zanata-common-api/pom.xml
    M common/zanata-common-util/pom.xml
    M common/zanata-rest-client/pom.xml
    M pom.xml
    M server/pom.xml
    M server/zanata-model/pom.xml
    M server/zanata-war/pom.xml
    M server/zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/SearchResultsView.java
    M server/zanata-war/src/main/webapp/project/project.xhtml
    M server/zanata-war/src/main/webapp/stylesheet/zanata.css
    M server/zanata-war/src/test/java/org/zanata/dao/TextFlowTargetDAOTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java
    A server/zanata-war/src/test/resources/org/zanata/test/model/ClearAllTables.dbunit.xml
    M zanata-parent/pom.xml

  Log Message:
  -----------
  Merge branch 'master' into rhbz800869


  Commit: 4bf41623fb8b16eb1f9bba81ed979cac7b25e78a
      https://github.com/zanata/zanata/commit/4bf41623fb8b16eb1f9bba81ed979cac7b25e78a
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-04-19 (Thu, 19 Apr 2012)

  Changed paths:
    M client/zanata-maven-plugin/demo-glossary/compendium/pom.xml
    M client/zanata-maven-plugin/demo-glossary/compendium/zanata.xml
    M server/zanata-war/eclipse/launch/webtrans-dummy.launch
    M server/zanata-war/eclipse/launch/webtrans-jboss.launch
    M server/zanata-war/pom.xml
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableResources.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/Resources.java
    A server/zanata-war/src/main/resources/images/banner_bg.png
    A server/zanata-war/src/main/resources/images/bar_background.png
    A server/zanata-war/src/main/resources/images/crystal_project/_16x16/actions/2rightarrow.png
    A server/zanata-war/src/main/resources/images/crystal_project/_16x16/actions/3floppy_unmount.png
    A server/zanata-war/src/main/resources/images/crystal_project/_16x16/actions/button_cancel.png
    A server/zanata-war/src/main/resources/images/crystal_project/_16x16/actions/button_ok.png
    A server/zanata-war/src/main/resources/images/crystal_project/_16x16/actions/edit_user.png
    A server/zanata-war/src/main/resources/images/crystal_project/_16x16/actions/flag.png
    A server/zanata-war/src/main/resources/images/crystal_project/_16x16/actions/help.png
    A server/zanata-war/src/main/resources/images/crystal_project/_16x16/actions/info.png
    A server/zanata-war/src/main/resources/images/crystal_project/_16x16/actions/lin_agt_wrench.png
    A server/zanata-war/src/main/resources/images/crystal_project/_16x16/actions/messagebox_critical.png
    A server/zanata-war/src/main/resources/images/crystal_project/_16x16/actions/search.png
    A server/zanata-war/src/main/resources/images/crystal_project/_16x16/apps/kdf.png
    A server/zanata-war/src/main/resources/images/crystal_project/_16x16/apps/kllckety.png
    A server/zanata-war/src/main/resources/images/crystal_project/_16x16/apps/locale.png
    A server/zanata-war/src/main/resources/images/crystal_project/_16x16/filesystems/file_doc.png
    A server/zanata-war/src/main/resources/images/crystal_project/_16x16/filesystems/folder_home.png
    A server/zanata-war/src/main/resources/images/crystal_project/_16x16/mimetypes/templates.png
    A server/zanata-war/src/main/resources/images/favicon.ico
    A server/zanata-war/src/main/resources/images/first_entry.png
    A server/zanata-war/src/main/resources/images/first_page.png
    A server/zanata-war/src/main/resources/images/footer_background.png
    A server/zanata-war/src/main/resources/images/last_entry.png
    A server/zanata-war/src/main/resources/images/last_page.png
    A server/zanata-war/src/main/resources/images/loader.gif
    A server/zanata-war/src/main/resources/images/loading-lg.gif
    A server/zanata-war/src/main/resources/images/loading.gif
    A server/zanata-war/src/main/resources/images/logo.png
    A server/zanata-war/src/main/resources/images/msgerror.png
    A server/zanata-war/src/main/resources/images/msginfo.png
    A server/zanata-war/src/main/resources/images/msgwarn.png
    A server/zanata-war/src/main/resources/images/next_entry.png
    A server/zanata-war/src/main/resources/images/next_mode.png
    A server/zanata-war/src/main/resources/images/next_page.png
    A server/zanata-war/src/main/resources/images/prev_entry.png
    A server/zanata-war/src/main/resources/images/prev_mode.png
    A server/zanata-war/src/main/resources/images/prev_page.png
    A server/zanata-war/src/main/resources/images/redo.png
    A server/zanata-war/src/main/resources/images/redo_disabled.png
    A server/zanata-war/src/main/resources/images/undo.png
    A server/zanata-war/src/main/resources/images/undo_disabled.png
    A server/zanata-war/src/main/resources/images/validate.png
    A server/zanata-war/src/main/resources/images/x.png
    A server/zanata-war/src/main/resources/images/z-logo-16px.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/banner_bg.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/crystal_project/_16x16/actions/2rightarrow.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/crystal_project/_16x16/actions/3floppy_unmount.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/crystal_project/_16x16/actions/button_cancel.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/crystal_project/_16x16/actions/flag.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/crystal_project/_16x16/actions/info.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/crystal_project/_16x16/filesystems/file_doc.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/crystal_project/_16x16/mimetypes/templates.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/first_entry.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/first_page.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/last_entry.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/last_page.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/loader.gif
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/next_entry.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/next_mode.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/next_page.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/prev_entry.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/prev_mode.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/prev_page.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/bar_background.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/crystal_project/_16x16/actions/button_cancel.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/crystal_project/_16x16/actions/button_ok.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/crystal_project/_16x16/actions/edit_user.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/crystal_project/_16x16/actions/help.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/crystal_project/_16x16/actions/lin_agt_wrench.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/crystal_project/_16x16/actions/messagebox_critical.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/crystal_project/_16x16/actions/search.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/crystal_project/_16x16/apps/kdf.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/crystal_project/_16x16/apps/kllckety.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/crystal_project/_16x16/apps/locale.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/crystal_project/_16x16/filesystems/folder_home.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/crystal_project/_16x16/mimetypes/templates.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/favicon.ico
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/footer_background.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/loading-lg.gif
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/loading.gif
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/logo.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/msgerror.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/msginfo.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/msgwarn.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/redo.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/redo_disabled.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/undo.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/undo_disabled.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/validate.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/x.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/z-logo-16px.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/public/images/bottom_left.gif
    R server/zanata-war/src/main/resources/org/zanata/webtrans/public/images/bottom_repeat.gif
    R server/zanata-war/src/main/resources/org/zanata/webtrans/public/images/bottom_right.gif
    R server/zanata-war/src/main/resources/org/zanata/webtrans/public/images/left_repeat.gif
    R server/zanata-war/src/main/resources/org/zanata/webtrans/public/images/right_repeat.gif
    R server/zanata-war/src/main/resources/org/zanata/webtrans/public/images/top_left.gif
    R server/zanata-war/src/main/resources/org/zanata/webtrans/public/images/top_repeat.gif
    R server/zanata-war/src/main/resources/org/zanata/webtrans/public/images/top_right.gif
    M server/zanata-war/src/main/webapp/META-INF/MANIFEST.MF
    M server/zanata-war/src/main/webapp/WEB-INF/layout/edit.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/loading.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/menu.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/project_edit_form.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/version_group_edit_form.xhtml
    M server/zanata-war/src/main/webapp/account/register.xhtml
    M server/zanata-war/src/main/webapp/admin/server_configuration.xhtml
    M server/zanata-war/src/main/webapp/language/request_to_join.xhtml
    M server/zanata-war/src/main/webapp/profile/edit.xhtml
    M server/zanata-war/src/main/webapp/stylesheet/zanata.css

  Log Message:
  -----------
  Relocate images into /resources/images


  Commit: 8c769fe98e197be75eae44eccad44b75003abb45
      https://github.com/zanata/zanata/commit/8c769fe98e197be75eae44eccad44b75003abb45
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-04-19 (Thu, 19 Apr 2012)

  Changed paths:
    R server/zanata-war/src/main/resources/org/zanata/webtrans/public/tu_bg_approved_left.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/public/tu_bg_approved_right.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/public/tu_bg_error_left.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/public/tu_bg_error_right.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/public/tu_bg_fuzzy_left.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/public/tu_bg_fuzzy_right.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/public/tu_bg_new_left.png
    R server/zanata-war/src/main/resources/org/zanata/webtrans/public/tu_bg_new_right.png

  Log Message:
  -----------
  Remove unused images


  Commit: 97fc325b1956e07aa9be8fcb82cc70bcb654395f
      https://github.com/zanata/zanata/commit/97fc325b1956e07aa9be8fcb82cc70bcb654395f
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-04-19 (Thu, 19 Apr 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetProjectTransUnitListsHandler.java
    M server/zanata-war/src/main/webapp/stylesheet/zanata.css

  Log Message:
  -----------
  Merge branch 'master' into rhbz800869


Compare: https://github.com/zanata/zanata/compare/84d8f0e...97fc325


More information about the zanata-commits mailing list