[zanata/zanata] 2248af: Work in progress: glossary upload via ui
GitHub
noreply at github.com
Fri Aug 31 03:53:19 UTC 2012
Branch: refs/heads/okapi-filters
Home: https://github.com/zanata/zanata
Commit: 2248af05b90ff0be1fb15a3dbb308fb172bd79d4
https://github.com/zanata/zanata/commit/2248af05b90ff0be1fb15a3dbb308fb172bd79d4
Author: Alex Eng <aeng at redhat.com>
Date: 2012-08-27 (Mon, 27 Aug 2012)
Changed paths:
M zanata-war/etc/gui-preview/template.xhtml
A zanata-war/src/main/java/org/zanata/action/GlossaryFilesAction.java
A zanata-war/src/main/java/org/zanata/service/GlossaryFileService.java
A zanata-war/src/main/java/org/zanata/service/impl/GlossaryFileServiceImpl.java
A zanata-war/src/main/resources/images/crystal_project/_16x16/apps/package_editors.png
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/resources/security.drl
M zanata-war/src/main/webapp/WEB-INF/layout/menu.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml
M zanata-war/src/main/webapp/WEB-INF/pages.xml
M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
R zanata-war/src/main/webapp/admin/glossary.xhtml
M zanata-war/src/main/webapp/admin/home.xhtml
M zanata-war/src/main/webapp/admin/languagemanager.xhtml
M zanata-war/src/main/webapp/admin/rolemanager.xhtml
M zanata-war/src/main/webapp/admin/usermanager.xhtml
A zanata-war/src/main/webapp/glossary/view.xhtml
M zanata-war/src/main/webapp/help/view.xhtml
M zanata-war/src/main/webapp/home.xhtml
M zanata-war/src/main/webapp/iteration/copy_trans.xhtml
M zanata-war/src/main/webapp/iteration/files.xhtml
M zanata-war/src/main/webapp/iteration/view.xhtml
M zanata-war/src/main/webapp/language/home.xhtml
M zanata-war/src/main/webapp/language/language.xhtml
M zanata-war/src/main/webapp/profile/view.xhtml
M zanata-war/src/main/webapp/project/assign_maintainer.xhtml
M zanata-war/src/main/webapp/project/home.xhtml
M zanata-war/src/main/webapp/project/homepage_edit.xhtml
M zanata-war/src/main/webapp/project/project.xhtml
M zanata-war/src/main/webapp/version-group/assign_maintainer.xhtml
M zanata-war/src/main/webapp/version-group/home.xhtml
M zanata-war/src/main/webapp/version-group/version_group.xhtml
Log Message:
-----------
Work in progress: glossary upload via ui
Commit: 843ed6f1eb635408984107afd7118c06f591807c
https://github.com/zanata/zanata/commit/843ed6f1eb635408984107afd7118c06f591807c
Author: Alex Eng <aeng at redhat.com>
Date: 2012-08-28 (Tue, 28 Aug 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/rest/service/GlossaryService.java
M zanata-war/src/main/java/org/zanata/service/impl/GlossaryFileServiceImpl.java
Log Message:
-----------
Work in progress: glossary push via web
Commit: 05cb2e687dd3103dd94e1595593cee52f0991bc7
https://github.com/zanata/zanata/commit/05cb2e687dd3103dd94e1595593cee52f0991bc7
Author: Alex Eng <aeng at redhat.com>
Date: 2012-08-28 (Tue, 28 Aug 2012)
Changed paths:
M pom.xml
M zanata-war/pom.xml
M zanata-war/src/main/java/org/zanata/action/GlossaryFilesAction.java
M zanata-war/src/main/java/org/zanata/service/GlossaryFileService.java
M zanata-war/src/main/java/org/zanata/service/impl/GlossaryFileServiceImpl.java
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
M zanata-war/src/main/webapp/glossary/view.xhtml
Log Message:
-----------
work in progress, glossary upload via ui
Commit: 3319b7a5f6a2293e2a6aecda7b3ee6dcaec3fc28
https://github.com/zanata/zanata/commit/3319b7a5f6a2293e2a6aecda7b3ee6dcaec3fc28
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-08-29 (Wed, 29 Aug 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransHistoryDataProvider.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/LoadingListDataProvider.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.ui.xml
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenterTest.java
Log Message:
-----------
rhbz804871 - add close button to translation history popup
Commit: 5cf3c650dff9733a0443df3c97530b18d6f806b3
https://github.com/zanata/zanata/commit/5cf3c650dff9733a0443df3c97530b18d6f806b3
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-08-29 (Wed, 29 Aug 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsDisplay.java
M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitEditPresenter.java
M zanata-war/src/test/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenterTest.java
Log Message:
-----------
rhbz844820 - fix problem: user click on buttons at different row should ensure row selection event first
Commit: f1d719af9a6661f7ab29821a642ebde283348f38
https://github.com/zanata/zanata/commit/f1d719af9a6661f7ab29821a642ebde283348f38
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-08-29 (Wed, 29 Aug 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitDetailsPanel.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelView.ui.xml
Log Message:
-----------
rhbz844820 - fix css style for transUnitDetail and validation panel after merge
Commit: 7fe1ef9f9fce11f60c99efcc5dc9af2cc3b0ebae
https://github.com/zanata/zanata/commit/7fe1ef9f9fce11f60c99efcc5dc9af2cc3b0ebae
Author: Alex Eng <aeng at redhat.com>
Date: 2012-08-29 (Wed, 29 Aug 2012)
Changed paths:
R zanata-war/eclipse/launch/debug-jboss-zanata (1).launch
A zanata-war/src/main/java/org/zanata/action/GlossaryAction.java
R zanata-war/src/main/java/org/zanata/action/GlossaryFilesAction.java
R zanata-war/src/main/java/org/zanata/action/GlossaryStatsAction.java
M zanata-war/src/main/java/org/zanata/dao/GlossaryDAO.java
M zanata-war/src/main/java/org/zanata/service/impl/GlossaryFileServiceImpl.java
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/Resources.java
R zanata-war/src/main/resources/images/banner_bg.png
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/webapp/WEB-INF/layout/language_detail.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/menu.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml
M zanata-war/src/main/webapp/WEB-INF/pages.xml
M zanata-war/src/main/webapp/error.xhtml
M zanata-war/src/main/webapp/glossary/view.xhtml
M zanata-war/src/main/webapp/iteration/view.xhtml
M zanata-war/src/main/webapp/stylesheet/zanata.css
Log Message:
-----------
Implemented glossary upload/delete via ui
Commit: 1a8d67c2cbabf6752a6b699513d46353e850bd25
https://github.com/zanata/zanata/commit/1a8d67c2cbabf6752a6b699513d46353e850bd25
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-08-29 (Wed, 29 Aug 2012)
Changed paths:
R zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableResources.java
M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsView.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/TableEditorMessages.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/RevertTransUnitUpdateLink.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitDetailsPanel.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitDetailsPanel.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelView.ui.xml
Log Message:
-----------
rhbz844820 - change all image buttons to fontello css
Commit: 100fbdc00f70176945716899f29bce8786fa8fd2
https://github.com/zanata/zanata/commit/100fbdc00f70176945716899f29bce8786fa8fd2
Author: Alex Eng <aeng at redhat.com>
Date: 2012-08-29 (Wed, 29 Aug 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransStyles.java
M zanata-war/src/main/resources/org/zanata/webtrans/WebTransStyles.css
M zanata-war/src/main/webapp/stylesheet/zanata.css
M zanata-war/src/test/java/org/zanata/rest/service/GlossaryRestTest.java
Log Message:
-----------
Fix firefox css, fix test
Commit: 064688dd3bb7c2c3e1fb8c96dbf2f6ec1a09b273
https://github.com/zanata/zanata/commit/064688dd3bb7c2c3e1fb8c96dbf2f6ec1a09b273
Author: Alex Eng <aeng at redhat.com>
Date: 2012-08-29 (Wed, 29 Aug 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/ZanataInit.java
R zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableResources.java
M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsDisplay.java
M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsView.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransHistoryDataProvider.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitEditPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/TableEditorMessages.java
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/LoadingListDataProvider.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/RevertTransUnitUpdateLink.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitDetailsPanel.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitDetailsPanel.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelView.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspaceManagerImpl.java
M zanata-war/src/test/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenterTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenterTest.java
Log Message:
-----------
Merge branch 'integration/master' of github.com:zanata/zanata into integration/master
Commit: 6de879d9b84532b122bddb64c196408d4b8338c4
https://github.com/zanata/zanata/commit/6de879d9b84532b122bddb64c196408d4b8338c4
Author: Alex Eng <loones1595 at gmail.com>
Date: 2012-08-30 (Thu, 30 Aug 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SideMenuPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/NotificationView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/NotificationView.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/view/SideMenuView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/SideMenuView.ui.xml
Log Message:
-----------
Fix notification text color and position with new side menu
Commit: 16b0e11abb949bbd22c88dacbb89928219808cc1
https://github.com/zanata/zanata/commit/16b0e11abb949bbd22c88dacbb89928219808cc1
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-08-30 (Thu, 30 Aug 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsView.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/RevertTransUnitUpdateLink.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/UndoLink.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/NotificationView.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenterTest.java
Log Message:
-----------
rhbz844820 - change undo link to icon and adjust layout
Commit: 4e50c6498616270f2174d45f02524d62f8f56226
https://github.com/zanata/zanata/commit/4e50c6498616270f2174d45f02524d62f8f56226
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-08-30 (Thu, 30 Aug 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsDisplay.java
M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsView.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/UndoLink.java
M zanata-war/src/test/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenterTest.java
Log Message:
-----------
rhbz844820 - fix bug
- keyboard shortcut context is not set correctly
- undo icon insertion
- ensure row selection before copy source action
Commit: 719f44656cf6b73b53ac813315f0463700901314
https://github.com/zanata/zanata/commit/719f44656cf6b73b53ac813315f0463700901314
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-08-30 (Thu, 30 Aug 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/RevertTransUnitUpdateLink.java
Log Message:
-----------
rhbz844820 - add undo tooltip
Commit: 46e9a7eb37c7179f392e0314a04da250d37c4c79
https://github.com/zanata/zanata/commit/46e9a7eb37c7179f392e0314a04da250d37c4c79
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-08-30 (Thu, 30 Aug 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsView.ui.xml
Log Message:
-----------
rhbz844820 - style of buttons
Commit: 04c9fb9c70f730b1fdc9b487c93bfcfbad73c8c6
https://github.com/zanata/zanata/commit/04c9fb9c70f730b1fdc9b487c93bfcfbad73c8c6
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-08-30 (Thu, 30 Aug 2012)
Changed paths:
M pom.xml
M zanata-war/src/main/java/org/zanata/webtrans/Application.gwt.xml
Log Message:
-----------
rhbz844820 - remove gwt incubator dependency
Commit: cc71b4803e185224a1b5513cdb971ffad358c967
https://github.com/zanata/zanata/commit/cc71b4803e185224a1b5513cdb971ffad358c967
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-08-30 (Thu, 30 Aug 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/GetTransUnitActionContext.java
M zanata-war/src/main/java/org/zanata/webtrans/client/events/DocumentSelectionEvent.java
M zanata-war/src/main/java/org/zanata/webtrans/client/events/FilterViewEvent.java
M zanata-war/src/main/java/org/zanata/webtrans/client/service/NavigationController.java
M zanata-war/src/test/java/org/zanata/webtrans/client/service/NavigationControllerTest.java
Log Message:
-----------
rhbz844820 - fix bug change document will reset page count to wrong value
Commit: 367bf663a8b8b2eacdb1cfefc3e7acfa282fd613
https://github.com/zanata/zanata/commit/367bf663a8b8b2eacdb1cfefc3e7acfa282fd613
Author: David Mason <dr.d.mason at gmail.com>
Date: 2012-08-30 (Thu, 30 Aug 2012)
Changed paths:
M pom.xml
R zanata-war/eclipse/launch/debug-jboss-zanata (1).launch
M zanata-war/etc/gui-preview/template.xhtml
M zanata-war/pom.xml
A zanata-war/src/main/java/org/zanata/action/GlossaryAction.java
R zanata-war/src/main/java/org/zanata/action/GlossaryStatsAction.java
M zanata-war/src/main/java/org/zanata/dao/GlossaryDAO.java
M zanata-war/src/main/java/org/zanata/rest/service/GlossaryService.java
A zanata-war/src/main/java/org/zanata/service/GlossaryFileService.java
A zanata-war/src/main/java/org/zanata/service/impl/GlossaryFileServiceImpl.java
M zanata-war/src/main/java/org/zanata/webtrans/Application.gwt.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/GetTransUnitActionContext.java
R zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableResources.java
M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsDisplay.java
M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsView.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/events/DocumentSelectionEvent.java
M zanata-war/src/main/java/org/zanata/webtrans/client/events/FilterViewEvent.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SideMenuPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransHistoryDataProvider.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitEditPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/Resources.java
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/TableEditorMessages.java
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransStyles.java
M zanata-war/src/main/java/org/zanata/webtrans/client/service/NavigationController.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/LoadingListDataProvider.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/RevertTransUnitUpdateLink.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitDetailsPanel.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitDetailsPanel.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/UndoLink.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelView.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/view/NotificationView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/NotificationView.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/view/SideMenuView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/SideMenuView.ui.xml
R zanata-war/src/main/resources/images/banner_bg.png
A zanata-war/src/main/resources/images/crystal_project/_16x16/apps/package_editors.png
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/resources/org/zanata/webtrans/WebTransStyles.css
M zanata-war/src/main/resources/security.drl
M zanata-war/src/main/webapp/WEB-INF/layout/language_detail.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/menu.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml
M zanata-war/src/main/webapp/WEB-INF/pages.xml
M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
R zanata-war/src/main/webapp/admin/glossary.xhtml
M zanata-war/src/main/webapp/admin/home.xhtml
M zanata-war/src/main/webapp/admin/languagemanager.xhtml
M zanata-war/src/main/webapp/admin/rolemanager.xhtml
M zanata-war/src/main/webapp/admin/usermanager.xhtml
M zanata-war/src/main/webapp/error.xhtml
A zanata-war/src/main/webapp/glossary/view.xhtml
M zanata-war/src/main/webapp/help/view.xhtml
M zanata-war/src/main/webapp/home.xhtml
M zanata-war/src/main/webapp/iteration/copy_trans.xhtml
M zanata-war/src/main/webapp/iteration/files.xhtml
M zanata-war/src/main/webapp/iteration/view.xhtml
M zanata-war/src/main/webapp/language/home.xhtml
M zanata-war/src/main/webapp/language/language.xhtml
M zanata-war/src/main/webapp/profile/view.xhtml
M zanata-war/src/main/webapp/project/assign_maintainer.xhtml
M zanata-war/src/main/webapp/project/home.xhtml
M zanata-war/src/main/webapp/project/homepage_edit.xhtml
M zanata-war/src/main/webapp/project/project.xhtml
M zanata-war/src/main/webapp/stylesheet/zanata.css
M zanata-war/src/main/webapp/version-group/assign_maintainer.xhtml
M zanata-war/src/main/webapp/version-group/home.xhtml
M zanata-war/src/main/webapp/version-group/version_group.xhtml
M zanata-war/src/test/java/org/zanata/rest/service/GlossaryRestTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenterTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenterTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenterTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/service/NavigationControllerTest.java
Log Message:
-----------
Merge branch 'master' into okapi-filters
Compare: https://github.com/zanata/zanata/compare/9a01811461f9...367bf663a8b8
More information about the zanata-commits
mailing list