[zanata/zanata-server] 8a4b6a: Merge branch 'master' into ZNTA-1166-webhook
GitHub
noreply at github.com
Thu Sep 22 04:30:39 UTC 2016
Branch: refs/heads/ZNTA-1166-webhook
Home: https://github.com/zanata/zanata-server
Commit: 8a4b6acea7a42e89f8d1cc889ad6c17c22c94d41
https://github.com/zanata/zanata-server/commit/8a4b6acea7a42e89f8d1cc889ad6c17c22c94d41
Author: Alex Eng <aeng at redhat.com>
Date: 2016-09-22 (Thu, 22 Sep 2016)
Changed paths:
M docker/rundev.sh
M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryPushTest.java
M functional-test/src/test/java/org/zanata/feature/glossary/InvalidGlossaryPushTest.java
M zanata-frontend/src/frontend/app/actions/glossary.js
M zanata-frontend/src/frontend/app/components/Nav/index.jsx
M zanata-frontend/src/frontend/app/containers/App.js
M zanata-frontend/src/frontend/app/containers/Glossary/EntryModal.js
M zanata-frontend/src/frontend/app/containers/Glossary/ExportModal.js
M zanata-frontend/src/frontend/app/containers/Glossary/Header.jsx
M zanata-frontend/src/frontend/app/containers/Glossary/ImportModal.js
M zanata-frontend/src/frontend/app/containers/Glossary/ViewHeader.js
M zanata-frontend/src/frontend/app/containers/Glossary/index.js
M zanata-frontend/src/frontend/app/containers/Root.js
M zanata-frontend/src/frontend/app/legacy.js
M zanata-frontend/src/frontend/app/reducers/glossary.js
M zanata-frontend/src/frontend/app/utils/GlossaryHelper.js
A zanata-frontend/src/frontend/app/utils/UrlHelper.js
M zanata-frontend/src/frontend/npm-shrinkwrap.json
M zanata-model/src/main/java/org/zanata/hibernate/search/IndexFieldLabels.java
A zanata-model/src/main/java/org/zanata/model/Glossary.java
M zanata-model/src/main/java/org/zanata/model/HGlossaryEntry.java
M zanata-model/src/main/java/org/zanata/model/HGlossaryTerm.java
M zanata-model/src/main/java/org/zanata/model/HProject.java
A zanata-model/src/main/java/org/zanata/model/HProjectGlossary.java
M zanata-model/src/main/java/org/zanata/model/LocaleRole.java
M zanata-model/src/main/java/org/zanata/model/PersonProjectMemberships.java
M zanata-model/src/main/java/org/zanata/model/WebHook.java
M zanata-model/src/main/java/org/zanata/util/GlossaryUtil.java
M zanata-model/src/main/java/org/zanata/util/ZanataEntities.java
M zanata-war/src/main/java/org/zanata/action/ProjectHomeAction.java
M zanata-war/src/main/java/org/zanata/action/ProjectPermissionDialog.java
M zanata-war/src/main/java/org/zanata/dao/GlossaryDAO.java
M zanata-war/src/main/java/org/zanata/rest/editor/service/UserService.java
M zanata-war/src/main/java/org/zanata/rest/editor/service/resource/UserResource.java
M zanata-war/src/main/java/org/zanata/rest/service/GlossaryService.java
M zanata-war/src/main/java/org/zanata/rest/service/ProjectService.java
M zanata-war/src/main/java/org/zanata/security/SecurityFunctions.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/java/org/zanata/util/UrlUtil.java
M zanata-war/src/main/java/org/zanata/webtrans/client/Application.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/GlossaryDetailsPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/GlossaryPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/UiMessages.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryDetailsDisplay.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryDetailsView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryDetailsView.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryView.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetGlossaryDetailsHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetGlossaryHandler.java
R zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateGlossaryTermHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/model/GlossaryDetails.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/model/GlossaryResultItem.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetGlossary.java
R zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/UpdateGlossaryTermAction.java
R zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/UpdateGlossaryTermResult.java
M zanata-war/src/main/resources/db/changelogs/db.changelog-4.0.xml
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
M zanata-war/src/main/webapp/WEB-INF/layout/project/person-permissions-modal.xhtml
M zanata-war/src/main/webapp/project/project.xhtml
M zanata-war/src/test/java/org/zanata/dao/GlossaryDAOTest.java
M zanata-war/src/test/java/org/zanata/model/HGlossaryEntryJPATest.java
M zanata-war/src/test/java/org/zanata/rest/editor/service/UserServiceTest.java
M zanata-war/src/test/java/org/zanata/rest/service/raw/GlossaryRawRestITCase.java
M zanata-war/src/test/java/org/zanata/service/impl/GlossaryFileServiceImplTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/GlossaryDetailsPresenterTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/GlossaryPresenterTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetGlossaryCommand.java
M zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetGlossaryDetailsCommand.java
M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetGlossaryDetailsHandlerTest.java
M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetGlossaryHandlerJpaTest.java
R zanata-war/src/test/java/org/zanata/webtrans/server/rpc/UpdateGlossaryTermHandlerTest.java
M zanata-war/src/test/resources/META-INF/persistence.xml
M zanata-war/src/test/resources/arquillian/persistence.xml
M zanata-war/src/test/resources/org/zanata/test/model/ClearAllTables.dbunit.xml
M zanata-war/src/test/resources/org/zanata/test/model/GlossaryData.dbunit.xml
M zanata-war/src/test/resources/performance/GlossaryTest.dbunit.xml
Log Message:
-----------
Merge branch 'master' into ZNTA-1166-webhook
More information about the zanata-commits
mailing list