Branch: refs/heads/ZNTA-1101-project-glossary Home: https://github.com/zanata/zanata-server Commit: ee21b1e2adb8a2656b977fb81cf7fcf1dcb655a4 https://github.com/zanata/zanata-server/commit/ee21b1e2adb8a2656b977fb81cf7fcf1dcb655a4 Author: Alex Eng <a...@redhat.com> Date: 2016-06-10 (Fri, 10 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/ProjectService.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/ProjectResource.java M zanata-war/src/main/java/org/zanata/rest/service/GlossaryService.java M zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java M zanata-war/src/main/resources/db/changelogs/db.changelog-4.0.xml Log Message: ----------- Merge branch 'ZNTA-153-glossary-export' into ZNTA-1101-project-glossary
_______________________________________________ zanata-commits mailing list zanata-commits@redhat.com https://www.redhat.com/mailman/listinfo/zanata-commits