[zanata/zanata-server] f245c4: Merge remote-tracking branch 'origin/master' into ...
GitHub
noreply at github.com
Thu Oct 16 00:27:07 UTC 2014
Branch: refs/heads/infinispan
Home: https://github.com/zanata/zanata-server
Commit: f245c4a6c664c6aca687c09c7550a60683fdb8da
https://github.com/zanata/zanata-server/commit/f245c4a6c664c6aca687c09c7550a60683fdb8da
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2014-10-16 (Thu, 16 Oct 2014)
Changed paths:
M .gitignore
M functional-test/pom.xml
M functional-test/src/main/java/org/zanata/page/AbstractPage.java
M functional-test/src/main/java/org/zanata/page/BasePage.java
M functional-test/src/main/java/org/zanata/page/CorePage.java
M functional-test/src/main/java/org/zanata/page/WebDriverFactory.java
M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
M functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.java
M functional-test/src/main/java/org/zanata/page/administration/EditHomeContentPage.java
M functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
M functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
M functional-test/src/main/java/org/zanata/page/administration/ManageSearchPage.java
M functional-test/src/main/java/org/zanata/page/administration/ManageUserPage.java
M functional-test/src/main/java/org/zanata/page/administration/TranslationMemoryPage.java
M functional-test/src/main/java/org/zanata/page/dashboard/DashboardActivityTab.java
M functional-test/src/main/java/org/zanata/page/dashboard/DashboardBasePage.java
M functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardClientTab.java
M functional-test/src/main/java/org/zanata/page/googleaccount/GooglePermissionsPage.java
M functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java
M functional-test/src/main/java/org/zanata/page/groups/VersionGroupPage.java
M functional-test/src/main/java/org/zanata/page/groups/VersionGroupsPage.java
A functional-test/src/main/java/org/zanata/page/languages/ContactTeamPage.java
A functional-test/src/main/java/org/zanata/page/languages/LanguagePage.java
A functional-test/src/main/java/org/zanata/page/languages/LanguagesPage.java
M functional-test/src/main/java/org/zanata/page/projects/ProjectAboutPage.java
M functional-test/src/main/java/org/zanata/page/projects/ProjectBasePage.java
M functional-test/src/main/java/org/zanata/page/projects/ProjectVersionsPage.java
M functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java
M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectLanguagesTab.java
M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectPermissionsTab.java
M functional-test/src/main/java/org/zanata/page/projectversion/CreateVersionPage.java
M functional-test/src/main/java/org/zanata/page/projectversion/VersionBasePage.java
M functional-test/src/main/java/org/zanata/page/projectversion/VersionDocumentsPage.java
M functional-test/src/main/java/org/zanata/page/projectversion/VersionLanguagesPage.java
M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionDocumentsTab.java
M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionLanguagesTab.java
M functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
M functional-test/src/main/java/org/zanata/util/Constants.java
M functional-test/src/main/java/org/zanata/util/WebElementUtil.java
M functional-test/src/main/java/org/zanata/workflow/LoginWorkFlow.java
A functional-test/src/test/java/org/zanata/feature/editor/TranslationHistoryTest.java
A functional-test/src/test/java/org/zanata/feature/language/ContactLanguageTeamTest.java
M functional-test/src/test/resources/setup.properties
M pom.xml
M zanata-model/pom.xml
M zanata-test-war/pom.xml
A zanata-war/etc/scripts/enableLanguage.groovy
M zanata-war/pom.xml
R zanata-war/src/main/java/org/zanata/action/PasswordChangeAction.java
M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.java
M zanata-war/src/main/java/org/zanata/i18n/Messages.java
A zanata-war/src/main/java/org/zanata/rest/editor/MediaTypes.java
A zanata-war/src/main/java/org/zanata/rest/editor/dto/EditorTextFlow.java
A zanata-war/src/main/java/org/zanata/rest/editor/dto/Locale.java
A zanata-war/src/main/java/org/zanata/rest/editor/dto/TransUnit.java
A zanata-war/src/main/java/org/zanata/rest/editor/dto/TransUnitStatus.java
A zanata-war/src/main/java/org/zanata/rest/editor/dto/TransUnits.java
A zanata-war/src/main/java/org/zanata/rest/editor/dto/TranslationData.java
A zanata-war/src/main/java/org/zanata/rest/editor/dto/User.java
A zanata-war/src/main/java/org/zanata/rest/editor/service/LocalesService.java
A zanata-war/src/main/java/org/zanata/rest/editor/service/ProjectService.java
A zanata-war/src/main/java/org/zanata/rest/editor/service/ProjectVersionService.java
A zanata-war/src/main/java/org/zanata/rest/editor/service/StatisticsService.java
A zanata-war/src/main/java/org/zanata/rest/editor/service/TextFlowService.java
A zanata-war/src/main/java/org/zanata/rest/editor/service/TransUnitService.java
A zanata-war/src/main/java/org/zanata/rest/editor/service/TransUnitUtils.java
A zanata-war/src/main/java/org/zanata/rest/editor/service/TranslationService.java
A zanata-war/src/main/java/org/zanata/rest/editor/service/UserService.java
A zanata-war/src/main/java/org/zanata/rest/editor/service/resource/LocalesResource.java
A zanata-war/src/main/java/org/zanata/rest/editor/service/resource/ProjectResource.java
A zanata-war/src/main/java/org/zanata/rest/editor/service/resource/ProjectVersionResource.java
A zanata-war/src/main/java/org/zanata/rest/editor/service/resource/StatisticResource.java
A zanata-war/src/main/java/org/zanata/rest/editor/service/resource/TextFlowResource.java
A zanata-war/src/main/java/org/zanata/rest/editor/service/resource/TransUnitResource.java
A zanata-war/src/main/java/org/zanata/rest/editor/service/resource/TranslationResource.java
A zanata-war/src/main/java/org/zanata/rest/editor/service/resource/UserResource.java
M zanata-war/src/main/java/org/zanata/rest/service/ProjectService.java
M zanata-war/src/main/java/org/zanata/search/FilterConstraintToQuery.java
M zanata-war/src/main/java/org/zanata/service/GravatarService.java
M zanata-war/src/main/java/org/zanata/service/TranslationService.java
M zanata-war/src/main/java/org/zanata/service/TranslationStateCache.java
M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/GravatarServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/StatisticsServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
M zanata-war/src/main/java/org/zanata/webtrans/client/Application.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/TranslationHistoryDisplay.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/util/ContentStateToStyleUtil.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/view/WorkspaceUsersView.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitsNavigationService.java
M zanata-war/src/main/resources/messages.properties
A zanata-war/src/main/resources/messages_br.properties
A zanata-war/src/main/resources/messages_cs.properties
A zanata-war/src/main/resources/messages_fr.properties
A zanata-war/src/main/resources/messages_hu.properties
A zanata-war/src/main/resources/messages_it.properties
A zanata-war/src/main/resources/messages_ja.properties
A zanata-war/src/main/resources/messages_pt_BR.properties
A zanata-war/src/main/resources/messages_uk.properties
A zanata-war/src/main/resources/messages_zh_TW_Hant.properties
M zanata-war/src/main/webapp/WEB-INF/faces-config.xml
M zanata-war/src/main/webapp/WEB-INF/layout/version-group/settings-tab.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/account/changepassword.xhtml
A zanata-war/src/main/webapp/app/config.json
A zanata-war/src/main/webapp/app/css/app.css
A zanata-war/src/main/webapp/app/css/libs.css
A zanata-war/src/main/webapp/app/images/logo-loader/loader.svg
A zanata-war/src/main/webapp/app/images/logo-loader/logo.svg
A zanata-war/src/main/webapp/app/index.html
A zanata-war/src/main/webapp/app/js/app.js
A zanata-war/src/main/webapp/app/js/libs.js
A zanata-war/src/main/webapp/app/js/templates.js
A zanata-war/src/main/webapp/app/maps/app.js.map
A zanata-war/src/main/webapp/app/maps/libs.js.map
A zanata-war/src/main/webapp/app/translations/de.json
A zanata-war/src/main/webapp/app/translations/fr.json
A zanata-war/src/main/webapp/app/translations/locales
M zanata-war/src/main/webapp/glossary/view.xhtml
M zanata-war/src/main/webapp/language/contact_coordinator.xhtml
M zanata-war/src/main/webapp/language/home.xhtml
A zanata-war/src/test/groovy/org/zanata/GroovyScriptFunctionTest.groovy
A zanata-war/src/test/java/org/zanata/rest/editor/dto/EditorTextFlowTest.java
A zanata-war/src/test/java/org/zanata/rest/editor/dto/LocaleTest.java
A zanata-war/src/test/java/org/zanata/rest/editor/dto/TransUnitStatusTest.java
A zanata-war/src/test/java/org/zanata/rest/editor/dto/TransUnitTest.java
A zanata-war/src/test/java/org/zanata/rest/editor/dto/TranslationDataTest.java
A zanata-war/src/test/java/org/zanata/rest/editor/dto/UserTest.java
A zanata-war/src/test/java/org/zanata/rest/editor/service/LocalesServiceTest.java
M zanata-war/src/test/java/org/zanata/rest/service/ResourceServiceRestTest.java
M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
M zanata-war/src/test/java/org/zanata/rest/service/TranslationServiceRestTest.java
M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceUnitTest.java
M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandlerTest.java
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into infinispan
More information about the zanata-commits
mailing list