Branch: refs/heads/ZNTA-1101-project-glossary
Home: https://github.com/zanata/zanata-server
Commit: e5fdfa7e8bd873930acbdedb5dce4e0c9bdfb79b
https://github.com/zanata/zanata-server/commit/e5fdfa7e8bd873930acbdedb5dce4e0c9bdfb79b
Author: Alex Eng <a...@redhat.com>
Date: 2016-06-07 (Tue, 07 Jun 2016)
Changed paths:
A zanata-model/src/main/java/org/zanata/model/Glossary.java
M zanata-model/src/main/java/org/zanata/model/HGlossaryEntry.java
A zanata-model/src/main/java/org/zanata/model/HProjectGlossary.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/service/impl/GlossaryFileServiceImpl.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
M
zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateGlossaryTermHandler.java
M zanata-war/src/main/resources/db/changelogs/db.changelog-4.0.xml
M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
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/webtrans/server/rpc/GetGlossaryDetailsHandlerTest.java
M
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/GlossaryData.dbunit.xml
Log Message:
-----------
Project glossary database
Commit: b9a2c8ab1ae1e87ff993bd3e4ea9e72f60107575
https://github.com/zanata/zanata-server/commit/b9a2c8ab1ae1e87ff993bd3e4ea9e72f60107575
Author: Alex Eng <a...@redhat.com>
Date: 2016-06-07 (Tue, 07 Jun 2016)
Changed paths:
M frontend/src/main/web/index.html
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/glossary.js
M frontend/src/main/web/src/containers/Glossary/DeleteAllEntriesModal.jsx
A 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/ViewHeader.js
M frontend/src/main/web/src/reducers/glossary.js
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/service/GlossaryService.java
M zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java
Log Message:
-----------
Merge branch 'ZNTA-153-glossary-export' into ZNTA-1101-project-glossary
Compare:
https://github.com/zanata/zanata-server/compare/605404ad9185...b9a2c8ab1ae1
_______________________________________________
zanata-commits mailing list
zanata-commits@redhat.com
https://www.redhat.com/mailman/listinfo/zanata-commits