Branch: refs/heads/ZNTA-1101-project-glossary
Home: https://github.com/zanata/zanata-server
Commit: dcef28960df3852dcc9d5aea271c714bc864c204
https://github.com/zanata/zanata-server/commit/dcef28960df3852dcc9d5aea271c714bc864c204
Author: Alex Eng <a...@redhat.com>
Date: 2016-07-05 (Tue, 05 Jul 2016)
Changed paths:
M zanata-model/src/main/java/org/zanata/model/Glossary.java
M zanata-model/src/main/java/org/zanata/model/HProject.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/util/GlossaryUtil.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/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/resources/messages.properties
M
zanata-war/src/main/webapp/WEB-INF/layout/project/person-permissions-modal.xhtml
M
zanata-war/src/test/java/org/zanata/service/impl/GlossaryFileServiceImplTest.java
Log Message:
-----------
WIP: refactor api for glossary post
Commit: 8c227a113fbf53a18309d5dbfdb37774d528e48f
https://github.com/zanata/zanata-server/commit/8c227a113fbf53a18309d5dbfdb37774d528e48f
Author: Alex Eng <a...@redhat.com>
Date: 2016-07-05 (Tue, 05 Jul 2016)
Changed paths:
M docs/release-notes.md
M frontend/src/main/web/src/actions/profile.js
M frontend/src/main/web/src/containers/Glossary/ImportModal.js
M frontend/src/main/web/src/containers/Glossary/ViewHeader.js
M frontend/src/main/web/src/containers/UserProfile/index.jsx
M frontend/src/main/web/webpack.config.js
M zanata-model/src/main/java/org/zanata/model/HGlossaryEntry.java
M zanata-model/src/main/java/org/zanata/util/GlossaryUtil.java
M zanata-war/src/main/java/org/zanata/dao/GlossaryDAO.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/service/impl/GlossaryFileServiceImpl.java
M zanata-war/src/main/resources/db/changelogs/db.changelog-4.0.xml
M zanata-war/src/main/webapp/account/login.xhtml
M
zanata-war/src/test/java/org/zanata/service/impl/GlossaryFileServiceImplTest.java
M
zanata-war/src/test/resources/org/zanata/test/model/GlossaryData.dbunit.xml
Log Message:
-----------
Merge branch 'master' into ZNTA-1101-project-glossary
Compare:
https://github.com/zanata/zanata-server/compare/897c61aaca53...8c227a113fbf
_______________________________________________
zanata-commits mailing list
zanata-commits@redhat.com
https://www.redhat.com/mailman/listinfo/zanata-commits