[zanata/zanata-server] 93ad43: Merge branch 'master' into ZNTA-1101-project-gloss...
GitHub
noreply at github.com
Wed Jun 29 05:33:58 UTC 2016
Branch: refs/heads/ZNTA-1101-project-glossary
Home: https://github.com/zanata/zanata-server
Commit: 93ad4395bd57d78f2d1d09dbafdf57615ad7c9bf
https://github.com/zanata/zanata-server/commit/93ad4395bd57d78f2d1d09dbafdf57615ad7c9bf
Author: Alex Eng <aeng at redhat.com>
Date: 2016-06-29 (Wed, 29 Jun 2016)
Changed paths:
M README.md
A docker/Dockerfile
A docker/README.md
A docker/conf/admin-user-setup.sql
A docker/conf/standalone.xml
A docker/rundb.sh
A docker/rundev.sh
A docs/favicon.ico
M docs/release-notes.md
M docs/user-guide/system-admin/configuration/infinispan.md
M frontend/README.md
R frontend/src/main/web/README.md
M frontend/src/main/web/npm-shrinkwrap.json
M frontend/src/main/web/package.json
M frontend/src/main/web/src/actions/common.js
M frontend/src/main/web/src/actions/explore.js
M frontend/src/main/web/src/actions/glossary.js
A frontend/src/main/web/src/actions/profile.js
R frontend/src/main/web/src/actions/userMatrix.js
M frontend/src/main/web/src/components/EditableText.js
M frontend/src/main/web/src/components/Header.jsx
M frontend/src/main/web/src/components/Heading.jsx
M frontend/src/main/web/src/components/Icon/index.jsx
M frontend/src/main/web/src/components/Link.jsx
M frontend/src/main/web/src/components/LoaderText/index.jsx
A frontend/src/main/web/src/components/LogoLoader/index.css
A frontend/src/main/web/src/components/LogoLoader/index.js
A frontend/src/main/web/src/components/LogoLoader/logo.svg
M frontend/src/main/web/src/components/Modal/index.jsx
M frontend/src/main/web/src/components/Nav.jsx
M frontend/src/main/web/src/components/NavItem.jsx
M frontend/src/main/web/src/components/Notification.js
M frontend/src/main/web/src/components/Overlay/index.jsx
M frontend/src/main/web/src/components/OverlayTrigger/index.jsx
M frontend/src/main/web/src/components/Page.jsx
M frontend/src/main/web/src/components/Row.js
M frontend/src/main/web/src/components/ScrollView.jsx
M frontend/src/main/web/src/components/TableCell.js
M frontend/src/main/web/src/components/TableRow.js
M frontend/src/main/web/src/components/TextInput.jsx
M frontend/src/main/web/src/components/Tooltip/index.jsx
M frontend/src/main/web/src/components/View.jsx
R frontend/src/main/web/src/constants/ActionTypes.js
M frontend/src/main/web/src/constants/Options.js
M frontend/src/main/web/src/containers/App.js
M frontend/src/main/web/src/containers/Explore/GroupTeaser.jsx
M frontend/src/main/web/src/containers/Explore/ProjectTeaser.jsx
M frontend/src/main/web/src/containers/Explore/TeaserList.jsx
M frontend/src/main/web/src/containers/Explore/TeaserListHeader.jsx
M frontend/src/main/web/src/containers/Explore/UserTeaser.jsx
M frontend/src/main/web/src/containers/Explore/index.js
M frontend/src/main/web/src/containers/Glossary/DeleteAllEntriesModal.jsx
M frontend/src/main/web/src/containers/Glossary/DeleteEntryModal.jsx
M frontend/src/main/web/src/containers/Glossary/Entry.js
M frontend/src/main/web/src/containers/Glossary/EntryModal.js
M frontend/src/main/web/src/containers/Glossary/ExportModal.js
M frontend/src/main/web/src/containers/Glossary/ImportModal.js
M frontend/src/main/web/src/containers/Glossary/NewEntryModal.js
M frontend/src/main/web/src/containers/Glossary/ViewHeader.js
M frontend/src/main/web/src/containers/Glossary/index.js
M frontend/src/main/web/src/containers/Root.js
M frontend/src/main/web/src/containers/UserProfile/CalendarMonthMatrix.jsx
M frontend/src/main/web/src/containers/UserProfile/CalendarPeriodHeading.jsx
M frontend/src/main/web/src/containers/UserProfile/CategoryItemMatrix.jsx
M frontend/src/main/web/src/containers/UserProfile/CategoryMatrixTable.jsx
M frontend/src/main/web/src/containers/UserProfile/ContentStateFilter.jsx
M frontend/src/main/web/src/containers/UserProfile/ContributionChart.jsx
M frontend/src/main/web/src/containers/UserProfile/DayMatrix.jsx
M frontend/src/main/web/src/containers/UserProfile/FilterableMatrixTable.jsx
M frontend/src/main/web/src/containers/UserProfile/RecentContributions.jsx
M frontend/src/main/web/src/containers/UserProfile/index.jsx
R frontend/src/main/web/src/dispatchers/UserMatrixDispatcher.js
M frontend/src/main/web/src/index.js
M frontend/src/main/web/src/legacy.js
M frontend/src/main/web/src/reducers/common.js
M frontend/src/main/web/src/reducers/explore.js
M frontend/src/main/web/src/reducers/glossary.js
M frontend/src/main/web/src/reducers/index.js
A frontend/src/main/web/src/reducers/profile.js
R frontend/src/main/web/src/stores/UserMatrixStore.js
R frontend/src/main/web/src/stores/__mocks__/superagent.js
R frontend/src/main/web/src/stores/__tests__/UserMatrixStoreTest.js
R frontend/src/main/web/src/stores/testData/glossary/entries.json
R frontend/src/main/web/src/stores/testData/glossary/info.json
R frontend/src/main/web/src/stores/testData/stats/user/test-user.json
M frontend/src/main/web/src/utils/DateHelper.js
M frontend/src/main/web/src/utils/GlossaryHelper.js
M frontend/src/main/web/webpack.config.js
M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
M functional-test/src/main/java/org/zanata/page/projectversion/VersionDocumentsPage.java
M functional-test/src/test/java/org/zanata/feature/document/FileTypeUploadTest.java
A functional-test/src/test/java/org/zanata/feature/editor/TranslateTsTest.java
M functional-test/src/test/resources/conf/standalone.xml
M functional-test/src/test/resources/conf/standalone_wildfly.xml
M mkdocs.yml
M pom.xml
M zanata-model/pom.xml
M zanata-overlay/distros/eap-6/standalone/configuration/standalone-zanata.xml
M zanata-overlay/distros/wildfly/standalone/configuration/standalone-zanata.xml
M zanata-war/pom.xml
M zanata-war/src/main/java/org/zanata/action/AccountMergeAction.java
M zanata-war/src/main/java/org/zanata/action/ActivateAction.java
M zanata-war/src/main/java/org/zanata/action/ActivityAction.java
M zanata-war/src/main/java/org/zanata/action/AdminStatsAction.java
M zanata-war/src/main/java/org/zanata/action/ApplicationConfigurationAction.java
M zanata-war/src/main/java/org/zanata/action/AuthenticatedAccountHome.java
M zanata-war/src/main/java/org/zanata/action/AuthenticationEvents.java
M zanata-war/src/main/java/org/zanata/action/ConfigurationAction.java
M zanata-war/src/main/java/org/zanata/action/ContactAdminAction.java
M zanata-war/src/main/java/org/zanata/action/CopyTransAction.java
M zanata-war/src/main/java/org/zanata/action/CopyTransManager.java
M zanata-war/src/main/java/org/zanata/action/CopyTransOptionsModel.java
M zanata-war/src/main/java/org/zanata/action/CopyVersionManager.java
M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
M zanata-war/src/main/java/org/zanata/action/HomePage.java
M zanata-war/src/main/java/org/zanata/action/InactiveAccountAction.java
M zanata-war/src/main/java/org/zanata/action/LanguageAction.java
M zanata-war/src/main/java/org/zanata/action/LanguageContactCoordinatorAction.java
M zanata-war/src/main/java/org/zanata/action/LanguageJoinAction.java
M zanata-war/src/main/java/org/zanata/action/LanguageManagerAction.java
M zanata-war/src/main/java/org/zanata/action/LanguagesAction.java
M zanata-war/src/main/java/org/zanata/action/LocaleSelectorAction.java
M zanata-war/src/main/java/org/zanata/action/LoginAction.java
M zanata-war/src/main/java/org/zanata/action/MergeTransAction.java
M zanata-war/src/main/java/org/zanata/action/MergeTranslationsManager.java
M zanata-war/src/main/java/org/zanata/action/NewProfileAction.java
M zanata-war/src/main/java/org/zanata/action/PasswordResetAction.java
M zanata-war/src/main/java/org/zanata/action/PasswordResetRequestAction.java
M zanata-war/src/main/java/org/zanata/action/ProcessManagerAction.java
M zanata-war/src/main/java/org/zanata/action/ProfileAction.java
M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
M zanata-war/src/main/java/org/zanata/action/ProjectHomeAction.java
M zanata-war/src/main/java/org/zanata/action/ProjectIterationZipFileAction.java
M zanata-war/src/main/java/org/zanata/action/ProjectPermissionDialog.java
M zanata-war/src/main/java/org/zanata/action/RegisterAction.java
M zanata-war/src/main/java/org/zanata/action/ReindexAction.java
M zanata-war/src/main/java/org/zanata/action/RoleAction.java
M zanata-war/src/main/java/org/zanata/action/RoleAssignmentRuleAction.java
M zanata-war/src/main/java/org/zanata/action/RoleSearch.java
M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
M zanata-war/src/main/java/org/zanata/action/TranslationMemoryHome.java
M zanata-war/src/main/java/org/zanata/action/UserAction.java
M zanata-war/src/main/java/org/zanata/action/UserSearch.java
M zanata-war/src/main/java/org/zanata/action/UserSettingsAction.java
M zanata-war/src/main/java/org/zanata/action/ValidateEmailAction.java
M zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java
M zanata-war/src/main/java/org/zanata/action/VersionGroupHomeAction.java
M zanata-war/src/main/java/org/zanata/action/VersionGroupJoinAction.java
M zanata-war/src/main/java/org/zanata/action/VersionHome.java
M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
M zanata-war/src/main/java/org/zanata/adapter/FileFormatAdapter.java
M zanata-war/src/main/java/org/zanata/adapter/HTMLAdapter.java
M zanata-war/src/main/java/org/zanata/adapter/OkapiFilterAdapter.java
A zanata-war/src/main/java/org/zanata/adapter/TSAdapter.java
R zanata-war/src/main/java/org/zanata/cache/CacheContainerProducer.java
A zanata-war/src/main/java/org/zanata/cache/CacheManagerProducer.java
M zanata-war/src/main/java/org/zanata/exception/handler/AbstractExceptionHandler.java
M zanata-war/src/main/java/org/zanata/file/FileSystemPersistService.java
M zanata-war/src/main/java/org/zanata/jpa/EntityManagerProducer.java
R zanata-war/src/main/java/org/zanata/rest/editor/dto/Locale.java
M zanata-war/src/main/java/org/zanata/rest/editor/service/LocalesService.java
M zanata-war/src/main/java/org/zanata/rest/editor/service/ProjectService.java
M zanata-war/src/main/java/org/zanata/rest/editor/service/resource/ProjectResource.java
M zanata-war/src/main/java/org/zanata/rest/service/CopyTransResourceService.java
M zanata-war/src/main/java/org/zanata/rest/service/FileService.java
M zanata-war/src/main/java/org/zanata/rest/service/ProjectIterationLocalesService.java
M zanata-war/src/main/java/org/zanata/rest/service/ProjectLocalesService.java
M zanata-war/src/main/java/org/zanata/rest/service/ProjectVersionService.java
M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
M zanata-war/src/main/java/org/zanata/rest/service/StatisticsServiceImpl.java
M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
M zanata-war/src/main/java/org/zanata/rest/service/ZPathService.java
M zanata-war/src/main/java/org/zanata/security/AuthenticationManager.java
M zanata-war/src/main/java/org/zanata/security/ZanataCredentials.java
M zanata-war/src/main/java/org/zanata/security/ZanataIdentity.java
M zanata-war/src/main/java/org/zanata/security/ZanataOpenId.java
M zanata-war/src/main/java/org/zanata/security/openid/OpenIdAuthenticationResult.java
A zanata-war/src/main/java/org/zanata/security/openid/OpenIdProviderTypeHolder.java
M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/CopyVersionServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/EmailChangeService.java
M zanata-war/src/main/java/org/zanata/service/impl/EmailServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/GlossaryFileServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/IndexingServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/LanguageTeamServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/LocaleServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/MergeTranslationsServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/RegisterServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/RequestServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/SlugEntityServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TransMemoryMergeServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationArchiveServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationUpdatedManager.java
M zanata-war/src/main/java/org/zanata/service/impl/UserAccountServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/ValidationServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/VersionGroupServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/VersionStateCacheImpl.java
A zanata-war/src/main/java/org/zanata/ui/TransactionPhaseListener.java
M zanata-war/src/main/java/org/zanata/util/EssentialDataCreator.java
M zanata-war/src/main/java/org/zanata/util/HtmlUtil.java
M zanata-war/src/main/java/org/zanata/util/UrlUtil.java
M zanata-war/src/main/java/org/zanata/webtrans/client/Application.java
M zanata-war/src/main/resources/ehcache.xml
M zanata-war/src/main/resources/messages.properties
A zanata-war/src/main/resources/zanata-infinispan.xml
M zanata-war/src/main/webapp-jboss/WEB-INF/jboss-deployment-structure.xml
M zanata-war/src/main/webapp-jboss/WEB-INF/jboss-web.xml
M zanata-war/src/main/webapp/404.xhtml
M zanata-war/src/main/webapp/WEB-INF/faces-config.xml
M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/project/edit_form.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/version-group/edit_form.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/version-group/settings-tab.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/version/edit_form.xhtml
M zanata-war/src/main/webapp/account/login.xhtml
M zanata-war/src/main/webapp/account/register.xhtml
A zanata-war/src/main/webapp/app/bundle.css
A zanata-war/src/main/webapp/app/bundle.css.map
A zanata-war/src/main/webapp/app/bundle.js
A zanata-war/src/main/webapp/app/bundle.js.map
R zanata-war/src/main/webapp/app/config.json
R zanata-war/src/main/webapp/app/css/app.css
R zanata-war/src/main/webapp/app/css/libs.css
R zanata-war/src/main/webapp/app/images/logo-loader/loader.svg
R zanata-war/src/main/webapp/app/images/logo-loader/logo.svg
M zanata-war/src/main/webapp/app/index.html
R zanata-war/src/main/webapp/app/js/app.js
R zanata-war/src/main/webapp/app/js/libs.js
R zanata-war/src/main/webapp/app/js/templates.js
R zanata-war/src/main/webapp/app/maps/app.js.map
R zanata-war/src/main/webapp/app/maps/libs.js.map
R zanata-war/src/main/webapp/app/translations/de.json
R zanata-war/src/main/webapp/app/translations/fr.json
R zanata-war/src/main/webapp/app/translations/locales
M zanata-war/src/test/java/org/zanata/arquillian/Deployments.java
R zanata-war/src/test/java/org/zanata/rest/editor/dto/LocaleTest.java
M zanata-war/src/test/java/org/zanata/rest/editor/service/ProjectServiceTest.java
M zanata-war/src/test/java/org/zanata/rest/service/ProjectVersionServiceUnitTest.java
M zanata-war/src/test/java/org/zanata/rest/service/raw/TranslationResourceRestITCase.java
M zanata-war/src/test/resources/arquillian/standalone-arquillian-wildfly.xml
M zanata-war/src/test/resources/arquillian/standalone-arquillian.xml
Log Message:
-----------
Merge branch 'master' into ZNTA-1101-project-glossary
More information about the zanata-commits
mailing list