[zanata/zanata-server] 2a997b: Add a new parameter includeAutomatedEntry to API g...

GitHub noreply at github.com
Tue Nov 17 08:55:31 UTC 2015 

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata-server
  Commit: 2a997ba9f310cf1e80464b48d6dbdfd80d213018
      https://github.com/zanata/zanata-server/commit/2a997ba9f310cf1e80464b48d6dbdfd80d213018
  Author: daisy-ycguo <guoyingc at cn.ibm.com>
  Date:   2015-11-11 (Wed, 11 Nov 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetHistoryDAO.java
    M zanata-war/src/main/java/org/zanata/rest/service/StatisticsServiceImpl.java
    M zanata-war/src/test/java/org/zanata/rest/service/StatisticsServiceImplTest.java

  Log Message:
  -----------
  Add a new parameter includeAutomatedEntry to API getContributionStatistics


  Commit: e808cfe1faf093117d7db9bd5cb9925cd7747317
      https://github.com/zanata/zanata-server/commit/e808cfe1faf093117d7db9bd5cb9925cd7747317
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-11-12 (Thu, 12 Nov 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Update zanata-api version


  Commit: 5912667c0f52b21cafd12bd699ea8089c8a14cf9
      https://github.com/zanata/zanata-server/commit/5912667c0f52b21cafd12bd699ea8089c8a14cf9
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-11-16 (Mon, 16 Nov 2015)

  Changed paths:
    A docs/images/glossary-edit-trans.png
    A docs/images/glossary-edit.png
    A docs/images/glossary-new-term-modal.png
    A docs/images/glossary-new-term.png
    A docs/images/glossary-page.png
    A docs/images/glossary-select-language.png
    M docs/images/glossary-upload-windows-po.png
    M docs/images/glossary-upload-windows.png
    M docs/images/glossary-upload.png
    M docs/release-notes.md
    M docs/user-guide/glossary/edit-glossaries.md
    A docs/user-guide/glossary/insert-term.md
    M docs/user-guide/glossary/upload-glossaries.md
    A docs/user-guide/system-admin/configuration/mac-installation.md
    M frontend/pom.xml
    A frontend/src/main/web/.gitignore
    A frontend/src/main/web/README.md
    A frontend/src/main/web/copy.sh
    A frontend/src/main/web/index.css
    A frontend/src/main/web/index.html
    A frontend/src/main/web/index.js
    A frontend/src/main/web/lib/actions/GlossaryActions.js
    A frontend/src/main/web/lib/actions/UserMatrixActions.js
    A frontend/src/main/web/lib/components/CalendarMonthMatrix.jsx
    A frontend/src/main/web/lib/components/CalendarPeriodHeading.jsx
    A frontend/src/main/web/lib/components/CategoryItemMatrix.jsx
    A frontend/src/main/web/lib/components/CategoryMatrixTable.jsx
    A frontend/src/main/web/lib/components/ContentStateFilter.jsx
    A frontend/src/main/web/lib/components/ContributionChart.jsx
    A frontend/src/main/web/lib/components/DayMatrix.jsx
    A frontend/src/main/web/lib/components/DropDown.jsx
    A frontend/src/main/web/lib/components/FilterableMatrixTable.jsx
    A frontend/src/main/web/lib/components/MessageModal.jsx
    A frontend/src/main/web/lib/components/RecentContributions.jsx
    A frontend/src/main/web/lib/components/RootContent.jsx
    A frontend/src/main/web/lib/components/SystemGlossary.jsx
    A frontend/src/main/web/lib/components/UserProfile.jsx
    A frontend/src/main/web/lib/components/glossary/ActionCell.jsx
    A frontend/src/main/web/lib/components/glossary/ColumnHeader.jsx
    A frontend/src/main/web/lib/components/glossary/DataTable.jsx
    A frontend/src/main/web/lib/components/glossary/DeleteEntryModal.jsx
    A frontend/src/main/web/lib/components/glossary/ImportModal.jsx
    A frontend/src/main/web/lib/components/glossary/InputCell.jsx
    A frontend/src/main/web/lib/components/glossary/LoadingCell.jsx
    A frontend/src/main/web/lib/components/glossary/NewEntryModal.jsx
    A frontend/src/main/web/lib/components/glossary/SourceActionCell.jsx
    A frontend/src/main/web/lib/components/glossary/__tests__/ActionCellTest.js
    A frontend/src/main/web/lib/constants/ActionTypes.js
    A frontend/src/main/web/lib/constants/Configs.js
    A frontend/src/main/web/lib/constants/Messages.js
    A frontend/src/main/web/lib/constants/Options.js
    A frontend/src/main/web/lib/constants/Views.js
    A frontend/src/main/web/lib/dispatchers/GlossaryDispatcher.js
    A frontend/src/main/web/lib/dispatchers/UserMatrixDispatcher.js
    A frontend/src/main/web/lib/stores/GlossaryAPIStore.js
    A frontend/src/main/web/lib/stores/GlossaryStore.js
    A frontend/src/main/web/lib/stores/UserMatrixStore.js
    A frontend/src/main/web/lib/stores/__mocks__/superagent.js
    A frontend/src/main/web/lib/stores/__tests__/GlossaryStoreTest.js
    A frontend/src/main/web/lib/stores/__tests__/UserMatrixStoreTest.js
    A frontend/src/main/web/lib/stores/testData/glossary/entries.json
    A frontend/src/main/web/lib/stores/testData/glossary/info.json
    A frontend/src/main/web/lib/stores/testData/stats/user/test-user.json
    A frontend/src/main/web/lib/utils/DateHelper.js
    A frontend/src/main/web/lib/utils/GlossaryHelper.js
    A frontend/src/main/web/lib/utils/StringUtils.js
    A frontend/src/main/web/lib/utils/__tests__/GlossaryHelperTest.js
    A frontend/src/main/web/lib/utils/__tests__/StringUtilsTest.js
    A frontend/src/main/web/package.json
    A frontend/src/main/web/preprocessor.js
    A frontend/src/main/web/server.js
    R frontend/src/main/web/user-profile-page/README.md
    R frontend/src/main/web/user-profile-page/copy.sh
    R frontend/src/main/web/user-profile-page/index.html
    R frontend/src/main/web/user-profile-page/index.js
    R frontend/src/main/web/user-profile-page/lib/actions/Actions.js
    R frontend/src/main/web/user-profile-page/lib/components/CalendarMonthMatrix.jsx
    R frontend/src/main/web/user-profile-page/lib/components/CalendarPeriodHeading.jsx
    R frontend/src/main/web/user-profile-page/lib/components/CategoryItemMatrix.jsx
    R frontend/src/main/web/user-profile-page/lib/components/CategoryMatrixTable.jsx
    R frontend/src/main/web/user-profile-page/lib/components/ContentStateFilter.jsx
    R frontend/src/main/web/user-profile-page/lib/components/ContributionChart.jsx
    R frontend/src/main/web/user-profile-page/lib/components/DayMatrix.jsx
    R frontend/src/main/web/user-profile-page/lib/components/DropDown.jsx
    R frontend/src/main/web/user-profile-page/lib/components/FilterableMatrixTable.jsx
    R frontend/src/main/web/user-profile-page/lib/components/RecentContributions.jsx
    R frontend/src/main/web/user-profile-page/lib/constants/ActionTypes.js
    R frontend/src/main/web/user-profile-page/lib/constants/Configs.js
    R frontend/src/main/web/user-profile-page/lib/constants/Options.js
    R frontend/src/main/web/user-profile-page/lib/dispatchers/UserMatrixDispatcher.js
    R frontend/src/main/web/user-profile-page/lib/stores/UserMatrixStore.js
    R frontend/src/main/web/user-profile-page/lib/stores/__mocks__/superagent.js
    R frontend/src/main/web/user-profile-page/lib/stores/__tests__/UserMatrixStoreTest.js
    R frontend/src/main/web/user-profile-page/lib/stores/userStats.json
    R frontend/src/main/web/user-profile-page/lib/utils/DateHelper.js
    R frontend/src/main/web/user-profile-page/npm-shrinkwrap.json
    R frontend/src/main/web/user-profile-page/package.json
    R frontend/src/main/web/user-profile-page/preprocessor.js
    R frontend/src/main/web/user-profile-page/server.js
    R frontend/src/main/web/user-profile-page/webpack.config.js
    R frontend/src/main/web/user-profile-page/webpack.prod.config.js
    A frontend/src/main/web/webpack.config.js
    A frontend/src/main/web/webpack.prod.config.js
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    R functional-test/src/main/java/org/zanata/page/glossary/GlossaryPage.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/ProjectMaintainerTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryAdminTest.java
    R functional-test/src/test/java/org/zanata/feature/glossary/GlossaryDeleteTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryPushTest.java
    M functional-test/src/test/java/org/zanata/feature/testharness/TestPlan.java
    M mkdocs.yml
    M pom.xml
    M zanata-model/src/main/java/org/zanata/model/HGlossaryEntry.java
    M zanata-model/src/main/java/org/zanata/model/HGlossaryTerm.java
    R zanata-model/src/main/java/org/zanata/model/HTermComment.java
    A zanata-model/src/main/java/org/zanata/util/GlossaryUtil.java
    M zanata-model/src/main/java/org/zanata/util/ZanataEntities.java
    M zanata-overlay/common/bin/zanata-installer/InstallZanata.groovy
    M zanata-test-war/src/main/java/org/zanata/util/SampleProjectProfile.java
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/ZanataInit.java
    M zanata-war/src/main/java/org/zanata/action/GlossaryAction.java
    M zanata-war/src/main/java/org/zanata/action/ProfileHome.java
    M zanata-war/src/main/java/org/zanata/dao/GlossaryDAO.java
    A zanata-war/src/main/java/org/zanata/exception/AjaxViewExpiredExceptionHandler.java
    A zanata-war/src/main/java/org/zanata/exception/AjaxViewExpiredExceptionHandlerFactory.java
    A zanata-war/src/main/java/org/zanata/exception/DuplicateGlossaryEntryException.java
    A zanata-war/src/main/java/org/zanata/liquibase/custom/GenerateHashForGlossaryEntry.java
    A zanata-war/src/main/java/org/zanata/liquibase/custom/MigrateHTermCommentToString.java
    A zanata-war/src/main/java/org/zanata/rest/editor/dto/Permission.java
    M zanata-war/src/main/java/org/zanata/rest/editor/dto/User.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/service/GlossaryFileService.java
    M zanata-war/src/main/java/org/zanata/service/impl/GlossaryFileServiceImpl.java
    M zanata-war/src/main/java/org/zanata/util/CommonMarkRenderer.java
    M zanata-war/src/main/java/org/zanata/util/DateUtil.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/GlossaryDetailsPresenter.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/server/rpc/GetGlossaryDetailsHandler.java
    M 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/rpc/UpdateGlossaryTermAction.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.8.xml
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/resources/org/zanata/email/templates/email_request_to_join_language.vm
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/jboss-deployment-structure.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
    M zanata-war/src/main/webapp/WEB-INF/faces-config.xml
    R zanata-war/src/main/webapp/WEB-INF/layout/glossary/upload_glossary_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    A zanata-war/src/main/webapp/WEB-INF/template/template_ui.xhtml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    A zanata-war/src/main/webapp/error/viewexpiredexception.xhtml
    M zanata-war/src/main/webapp/glossary/view.xhtml
    M zanata-war/src/main/webapp/profile/home.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/dto/UserTest.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
    A zanata-war/src/test/java/org/zanata/service/impl/GlossaryFileServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/LockManagerServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/util/CommonMarkRendererTest.java
    A zanata-war/src/test/java/org/zanata/util/Repeat.java
    A zanata-war/src/test/java/org/zanata/util/RepeatRule.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/GlossaryDetailsPresenterTest.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/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 remote-tracking branch 'origin' into automatedEntry


  Commit: cb5db743596d26266fa49b38589979ee249ffc7e
      https://github.com/zanata/zanata-server/commit/cb5db743596d26266fa49b38589979ee249ffc7e
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-11-17 (Tue, 17 Nov 2015)

  Changed paths:
    M pom.xml
    M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetHistoryDAO.java
    M zanata-war/src/main/java/org/zanata/rest/service/StatisticsServiceImpl.java
    M zanata-war/src/test/java/org/zanata/rest/service/StatisticsServiceImplTest.java

  Log Message:
  -----------
  Merge pull request #1029 from daisy-ycguo/automatedEntry

Add a new parameter includeAutomatedEntry to API getContributionStatistics


Compare: https://github.com/zanata/zanata-server/compare/7ac5b6ce1de3...cb5db743596d

More information about the zanata-commits mailing list