[zanata/zanata-server] 64bd70: Work in progress: enhanced reviewer implementation...
GitHub
noreply at github.com
Wed Jul 17 04:34:41 UTC 2013
Branch: refs/heads/integration/master
Home: https://github.com/zanata/zanata-server
Commit: 64bd70b08d9a9e813e336087a1b992078f65fd13
https://github.com/zanata/zanata-server/commit/64bd70b08d9a9e813e336087a1b992078f65fd13
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-03 (Wed, 03 Jul 2013)
Changed paths:
M zanata-model/src/main/java/org/zanata/model/HLocale.java
M zanata-model/src/main/java/org/zanata/model/HLocaleMember.java
M zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
M zanata-war/src/main/java/org/zanata/service/impl/LanguageTeamServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/RegisterServiceImpl.java
M zanata-war/src/main/java/org/zanata/util/EssentialDataCreator.java
A zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
M zanata-war/src/main/resources/db/db.changelog.xml
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/webapp/language/language.xhtml
M zanata-war/src/test/java/org/zanata/dao/LocaleMemberDAOITCase.java
Log Message:
-----------
Work in progress: enhanced reviewer implementation: https://bugzilla.redhat.com/show_bug.cgi?id=981067
Commit: 883926b218654dc7fc387edd278a6938a9387c24
https://github.com/zanata/zanata-server/commit/883926b218654dc7fc387edd278a6938a9387c24
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-04 (Thu, 04 Jul 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
M zanata-war/src/main/java/org/zanata/dao/LocaleMemberDAO.java
M zanata-war/src/main/java/org/zanata/service/LanguageTeamService.java
M zanata-war/src/main/java/org/zanata/service/impl/LanguageTeamServiceImpl.java
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/webapp/language/language.xhtml
M zanata-war/src/main/webapp/resources/css/zanata.css
Log Message:
-----------
Work in progress: enhanced reviewer implementation: https://bugzilla.redhat.com/show_bug.cgi?id=981067
Commit: 2cc56395908ffc7ccdab6c187435d353c5b8e915
https://github.com/zanata/zanata-server/commit/2cc56395908ffc7ccdab6c187435d353c5b8e915
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-04 (Thu, 04 Jul 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
M zanata-war/src/main/java/org/zanata/dao/PersonDAO.java
M zanata-war/src/main/webapp/language/language.xhtml
Log Message:
-----------
Work in progress: enhanced reviewer implementation: https://bugzilla.redhat.com/show_bug.cgi?id=981067
Commit: af83b0e9be5a9241a041df2eef3f9bf3cff9fca6
https://github.com/zanata/zanata-server/commit/af83b0e9be5a9241a041df2eef3f9bf3cff9fca6
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-07 (Sun, 07 Jul 2013)
Changed paths:
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/webapp/language/language.xhtml
M zanata-war/src/main/webapp/language/request_to_join.xhtml
Log Message:
-----------
Work in progress: enhanced reviewer implementation: https://bugzilla.redhat.com/show_bug.cgi?id=981067
Commit: f6eda7ba4c17c442871a469148d702af47cf031a
https://github.com/zanata/zanata-server/commit/f6eda7ba4c17c442871a469148d702af47cf031a
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-07 (Sun, 07 Jul 2013)
Changed paths:
A zanata-war/src/main/java/org/zanata/action/LanguageJoinAction.java
M zanata-war/src/main/java/org/zanata/service/EmailService.java
M zanata-war/src/main/resources/messages.properties
R zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join.xhtml
A zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join_language.xhtml
M zanata-war/src/main/webapp/language/request_to_join.xhtml
M zanata-war/src/main/webapp/resources/css/zanata.css
Log Message:
-----------
Implemented email request to join language team with roles
Commit: eb25d69be61ebb32a856ad50af6cd2117fabee65
https://github.com/zanata/zanata-server/commit/eb25d69be61ebb32a856ad50af6cd2117fabee65
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-08 (Mon, 08 Jul 2013)
Changed paths:
R zanata-war/src/main/java/org/zanata/action/LanguageJoinAction.java
A zanata-war/src/main/java/org/zanata/action/LanguageJoinUpdateRoleAction.java
M zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
M zanata-war/src/main/java/org/zanata/action/SendEmailAction.java
M zanata-war/src/main/java/org/zanata/service/EmailService.java
M zanata-war/src/main/java/org/zanata/service/LanguageTeamService.java
M zanata-war/src/main/java/org/zanata/service/impl/LanguageTeamServiceImpl.java
M zanata-war/src/main/resources/messages.properties
R zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join_language.xhtml
A zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join_update_role_language.xhtml
M zanata-war/src/main/webapp/WEB-INF/pages.xml
M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
M zanata-war/src/main/webapp/language/language.xhtml
R zanata-war/src/main/webapp/language/request_to_join.xhtml
A zanata-war/src/main/webapp/language/request_to_join_update_role.xhtml
Log Message:
-----------
Work in progress: enhanced reviewer implementation: https://bugzilla.redhat.com/show_bug.cgi?id=981067
Commit: 77c573b08fdf29408be5249fa5234caafa5a05cb
https://github.com/zanata/zanata-server/commit/77c573b08fdf29408be5249fa5234caafa5a05cb
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-09 (Tue, 09 Jul 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/LanguageJoinUpdateRoleAction.java
M zanata-war/src/main/java/org/zanata/action/SendEmailAction.java
M zanata-war/src/main/java/org/zanata/service/EmailService.java
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/resources/messages_ja.properties
M zanata-war/src/main/resources/messages_uk.properties
M zanata-war/src/main/resources/messages_zh_TW_Hant.properties
A zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_role_language.xhtml
M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join_group.xhtml
A zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join_language.xhtml
R zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join_update_role_language.xhtml
M zanata-war/src/main/webapp/WEB-INF/pages.xml
M zanata-war/src/main/webapp/language/language.xhtml
M zanata-war/src/main/webapp/language/request_to_join_update_role.xhtml
Log Message:
-----------
Implemented email request to join language team with roles
Commit: a034279807e4ed0b1fe4bdddb005800141aa3d3b
https://github.com/zanata/zanata-server/commit/a034279807e4ed0b1fe4bdddb005800141aa3d3b
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-09 (Tue, 09 Jul 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
M zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
M zanata-war/src/main/java/org/zanata/dao/PersonDAO.java
M zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorButtonsWidget.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsDisplay.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/model/UserWorkspaceContext.java
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/resources/messages_ja.properties
M zanata-war/src/main/resources/messages_uk.properties
M zanata-war/src/main/resources/messages_zh_TW_Hant.properties
M zanata-war/src/main/resources/security.drl
M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_role_language.xhtml
M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join_language.xhtml
M zanata-war/src/main/webapp/iteration/files.xhtml
M zanata-war/src/main/webapp/project/project.xhtml
Log Message:
-----------
Implement rules in workspace for reviewer role: https://bugzilla.redhat.com/show_bug.cgi?id=981067
Commit: 6af192792c53b9c323419d85762c1a7b80d6da34
https://github.com/zanata/zanata-server/commit/6af192792c53b9c323419d85762c1a7b80d6da34
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-09 (Tue, 09 Jul 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/model/UserWorkspaceContext.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/model/WorkspaceRestrictions.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/SearchResultsPresenterTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TargetContentsPresenterTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryPresenterTest.java
Log Message:
-----------
Fix unit test for new restrictions in workspace
Commit: 5b96ca4ceba12f6670df275dc2775900614d4b92
https://github.com/zanata/zanata-server/commit/5b96ca4ceba12f6670df275dc2775900614d4b92
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-09 (Tue, 09 Jul 2013)
Changed paths:
M functional-test/sample-projects/glossary/pom.xml
M functional-test/sample-projects/plural/pom.xml
M functional-test/src/main/java/org/zanata/page/projects/CreateVersionPage.java
M pom.xml
M zanata-model/pom.xml
M zanata-model/src/main/java/org/zanata/model/SimpleSourceContents.java
M zanata-model/src/main/java/org/zanata/model/SourceContents.java
M zanata-war/pom.xml
M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
A zanata-war/src/main/java/org/zanata/database/ConnectionWrapper.java
A zanata-war/src/main/java/org/zanata/database/ProxyUtil.java
A zanata-war/src/main/java/org/zanata/database/ResultSetWrapper.java
A zanata-war/src/main/java/org/zanata/database/StatementWrapper.java
A zanata-war/src/main/java/org/zanata/database/StreamingResultSetSQLException.java
A zanata-war/src/main/java/org/zanata/database/WrappedDatasourceConnectionProvider.java
A zanata-war/src/main/java/org/zanata/database/WrappedDriverManagerConnectionProvider.java
M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
M zanata-war/src/main/java/org/zanata/search/FilterConstraintToQuery.java
M zanata-war/src/main/java/org/zanata/search/FilterConstraints.java
M zanata-war/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java
A zanata-war/src/main/java/org/zanata/util/NullCloseable.java
M zanata-war/src/main/java/org/zanata/webtrans/client/events/FilterViewEvent.java
M zanata-war/src/main/java/org/zanata/webtrans/client/history/EditorTokens.java
M zanata-war/src/main/java/org/zanata/webtrans/client/history/HistoryToken.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransFilterPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/UserConfigHolder.java
M zanata-war/src/main/java/org/zanata/webtrans/client/service/GetTransUnitActionContext.java
M zanata-war/src/main/java/org/zanata/webtrans/client/service/GetTransUnitActionContextHolder.java
M zanata-war/src/main/java/org/zanata/webtrans/client/service/HistoryEventHandlerService.java
M zanata-war/src/main/java/org/zanata/webtrans/client/service/UserOptionsService.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SearchField.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterDisplay.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorView.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitsNavigationService.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/model/UserOptions.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitList.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitsNavigation.java
R zanata-war/src/main/resources-dev/components.properties
M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
M zanata-war/src/test/java/org/zanata/dao/TextFlowDAOTest.java
M zanata-war/src/test/java/org/zanata/dao/TextFlowStreamDAOTest.java
R zanata-war/src/test/java/org/zanata/dao/WrappedConnectionProvider.java
A zanata-war/src/test/java/org/zanata/database/WrappedConnectionProviderTest.java
R zanata-war/src/test/java/org/zanata/jdbc/ConnectionWrapper.java
R zanata-war/src/test/java/org/zanata/jdbc/ResultSetWrapper.java
R zanata-war/src/test/java/org/zanata/jdbc/StatementWrapper.java
R zanata-war/src/test/java/org/zanata/jdbc/StreamingResultSetSQLException.java
M zanata-war/src/test/java/org/zanata/search/FilterConstraintToQueryTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/history/HistoryTokenTests.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransFilterPresenterTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenterTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/service/GetTransUnitActionContextTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/service/UserOptionsServiceTest.java
M zanata-war/src/test/resources/META-INF/persistence.xml
M zanata-war/src/test/resources/arquillian.xml
M zanata-war/src/test/resources/arquillian/persistence.xml
Log Message:
-----------
Merge branch 'integration/master' into rhbz981067
Commit: 06a0a6ab2a716fdc0a6abfb3c780d7d36ea93e9f
https://github.com/zanata/zanata-server/commit/06a0a6ab2a716fdc0a6abfb3c780d7d36ea93e9f
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-10 (Wed, 10 Jul 2013)
Changed paths:
M functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
M functional-test/src/main/java/org/zanata/workflow/LanguageWorkFlow.java
M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersDetailedTest.java
M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java
M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryDeleteTest.java
M functional-test/src/test/java/org/zanata/feature/startNewProject/TranslatorJoinsLanguageTeamTest.java
M functional-test/src/test/resources/concordion/org/zanata/feature/administration/ManageUsers.html
M functional-test/src/test/resources/concordion/org/zanata/feature/zanata_with_data.sql
M functional-test/src/test/resources/create_translator_user.sql
M zanata-war/src/main/resources/messages.properties
Log Message:
-----------
Fix functional test for https://bugzilla.redhat.com/show_bug.cgi?id=981067
Commit: 10d1f864e753f49b567265b7812af58b08db11fc
https://github.com/zanata/zanata-server/commit/10d1f864e753f49b567265b7812af58b08db11fc
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-14 (Sun, 14 Jul 2013)
Changed paths:
M functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
M functional-test/src/test/resources/concordion/org/zanata/feature/administration/ManageUsers.html
M zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
M zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
M zanata-war/src/main/java/org/zanata/dao/PersonDAO.java
M zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java
M zanata-war/src/main/java/org/zanata/service/impl/RegisterServiceImpl.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorButtonsWidget.java
M zanata-war/src/main/resources/messages.properties
Log Message:
-----------
Refactor some coding as per suggested
Commit: c90317f8b59fec2ce7ca605c4c5cc1d01c4e55c1
https://github.com/zanata/zanata-server/commit/c90317f8b59fec2ce7ca605c4c5cc1d01c4e55c1
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-14 (Sun, 14 Jul 2013)
Changed paths:
M pom.xml
M zanata-model/pom.xml
M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
A zanata-model/src/main/java/org/zanata/model/HTextFlowTargetReviewComment.java
M zanata-war/pom.xml
M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
M zanata-war/src/main/java/org/zanata/action/CopyTransManager.java
M zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
M zanata-war/src/main/java/org/zanata/config/DatabaseBackedConfig.java
M zanata-war/src/main/java/org/zanata/config/JndiBackedConfig.java
M zanata-war/src/main/java/org/zanata/dao/AbstractDAOImpl.java
M zanata-war/src/main/java/org/zanata/dao/ApplicationConfigurationDAO.java
A zanata-war/src/main/java/org/zanata/dao/TextFlowTargetReviewCommentsDAO.java
M zanata-war/src/main/java/org/zanata/service/impl/ProcessManagerServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/ValidationServiceImpl.java
M zanata-war/src/main/java/org/zanata/util/DateUtil.java
A zanata-war/src/main/java/org/zanata/webtrans/client/events/ReviewCommentEvent.java
A zanata-war/src/main/java/org/zanata/webtrans/client/events/ReviewCommentEventHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/client/history/HistoryToken.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java
A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ReviewCommentDataProvider.java
A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ReviewCommentPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/TableEditorMessages.java
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorButtonsWidget.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorButtonsWidget.ui.xml
A zanata-war/src/main/java/org/zanata/webtrans/client/view/ReviewCommentDisplay.java
A zanata-war/src/main/java/org/zanata/webtrans/client/view/ReviewCommentView.java
A zanata-war/src/main/java/org/zanata/webtrans/client/view/ReviewCommentView.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsDisplay.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterDisplay.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.ui.xml
A zanata-war/src/main/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandler.java
A zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetReviewCommentsHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransUnitTransformer.java
A zanata-war/src/main/java/org/zanata/webtrans/shared/model/ReviewComment.java
A zanata-war/src/main/java/org/zanata/webtrans/shared/model/ReviewCommentId.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransUnit.java
A zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/AddReviewCommentAction.java
A zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/AddReviewCommentResult.java
A zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetReviewCommentsAction.java
A zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetReviewCommentsResult.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TransUnitUpdated.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/TabValidation.java
M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
M zanata-war/src/test/java/org/zanata/dao/TextFlowDAOTest.java
M zanata-war/src/test/java/org/zanata/dao/TextFlowTargetDAOTest.java
A zanata-war/src/test/java/org/zanata/dao/TextFlowTargetReviewCommentsDAOJPATest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/GlossaryDetailsPresenterTest.java
A zanata-war/src/test/java/org/zanata/webtrans/client/presenter/ReviewCommentPresenterTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TargetContentsPresenterTest.java
A zanata-war/src/test/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandlerTest.java
A zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetReviewCommentsHandlerTest.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/TextFlowTestData.dbunit.xml
M zanata-war/src/test/resources/performance/GetTransUnitListTest.dbunit.xml
Log Message:
-----------
Merge branch 'integration/master' into rhbz981067
Conflicts:
zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
Commit: f25b57037a8914536cedaedc2fec6dc58a9be433
https://github.com/zanata/zanata-server/commit/f25b57037a8914536cedaedc2fec6dc58a9be433
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-14 (Sun, 14 Jul 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/dao/PersonDAO.java
Log Message:
-----------
Fix null pointer exception
Commit: 62087a3b64ab7c020a40133df7281dc7edd74051
https://github.com/zanata/zanata-server/commit/62087a3b64ab7c020a40133df7281dc7edd74051
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-14 (Sun, 14 Jul 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/service/SecurityService.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/service/TransUnitSaveService.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorButtonsWidget.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsDisplay.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/model/UserWorkspaceContext.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/model/WorkspaceRestrictions.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TransUnitUpdated.java
M zanata-war/src/main/resources/security.drl
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/SearchResultsPresenterTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TargetContentsPresenterTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryPresenterTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/service/TransUnitSaveServiceTest.java
M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandlerTest.java
Log Message:
-----------
Disable modify translation for reviewer using keyboard shortcut
Commit: a7cc1e3aede8b7428fabc31ccd2947c5ebff07a9
https://github.com/zanata/zanata-server/commit/a7cc1e3aede8b7428fabc31ccd2947c5ebff07a9
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-15 (Mon, 15 Jul 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
M zanata-war/src/main/java/org/zanata/search/FilterConstraintToQuery.java
M zanata-war/src/main/java/org/zanata/search/FilterConstraints.java
M zanata-war/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java
M zanata-war/src/main/java/org/zanata/webtrans/client/service/GetTransUnitActionContext.java
M zanata-war/src/main/java/org/zanata/webtrans/client/service/NavigationService.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Pager.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Pager.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentListHandler.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/GetProjectTransUnitListsHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryDetailsHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitsNavigationService.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTranslatorListHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetValidationRulesHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ReplaceTextHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/RevertTransUnitUpdatesHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/RunDocValidationHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateGlossaryTermHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
A zanata-war/src/main/java/org/zanata/webtrans/shared/model/ContentStateGroup.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitList.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitsNavigation.java
M zanata-war/src/test/java/org/zanata/dao/TextFlowDAOTest.java
M zanata-war/src/test/java/org/zanata/search/FilterConstraintToQueryTest.java
M zanata-war/src/test/java/org/zanata/service/impl/TextFlowSearchServiceImplTest.java
Log Message:
-----------
Merge branch 'integration/master' into rhbz981067
Commit: 82b30b24705cef251b6e68450774966981eafb29
https://github.com/zanata/zanata-server/commit/82b30b24705cef251b6e68450774966981eafb29
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-15 (Mon, 15 Jul 2013)
Changed paths:
M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersDetailedTest.java
M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java
Log Message:
-----------
Refactor as per suggested by professional code auditor
Commit: 014cb2d6450178df95662818311c9aebe58d1216
https://github.com/zanata/zanata-server/commit/014cb2d6450178df95662818311c9aebe58d1216
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-15 (Mon, 15 Jul 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java
M zanata-war/src/main/java/org/zanata/service/impl/LanguageTeamServiceImpl.java
M zanata-war/src/main/resources/security.drl
Log Message:
-----------
refactor as per suggested
Commit: 6358ba5e1220739c79a6ff060eba730a7dc85775
https://github.com/zanata/zanata-server/commit/6358ba5e1220739c79a6ff060eba730a7dc85775
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-15 (Mon, 15 Jul 2013)
Changed paths:
M functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join_language.xhtml
M zanata-war/src/main/webapp/language/request_to_join_update_role.xhtml
Log Message:
-----------
Refactor as per requested
Commit: 6b3899d482212b0306fb410f1c26a359ae59f05d
https://github.com/zanata/zanata-server/commit/6b3899d482212b0306fb410f1c26a359ae59f05d
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-15 (Mon, 15 Jul 2013)
Changed paths:
M zanata-war/src/main/resources/security.drl
Log Message:
-----------
Fix drools rule with new method name
Commit: de43f0cad800db9e115b57f7e2fb32e400bcac22
https://github.com/zanata/zanata-server/commit/de43f0cad800db9e115b57f7e2fb32e400bcac22
Author: David Mason <dr.d.mason at gmail.com>
Date: 2013-07-15 (Mon, 15 Jul 2013)
Changed paths:
M functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
M functional-test/src/main/java/org/zanata/workflow/LanguageWorkFlow.java
M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersDetailedTest.java
M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java
M zanata-model/src/main/java/org/zanata/model/HLocaleMember.java
M zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
M zanata-war/src/main/java/org/zanata/dao/PersonDAO.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/model/UserWorkspaceContext.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/model/WorkspaceRestrictions.java
M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_role_language.xhtml
M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join_language.xhtml
M zanata-war/src/main/webapp/WEB-INF/pages.xml
M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
M zanata-war/src/main/webapp/iteration/files.xhtml
M zanata-war/src/main/webapp/language/language.xhtml
M zanata-war/src/main/webapp/language/request_to_join_update_role.xhtml
M zanata-war/src/main/webapp/project/project.xhtml
Log Message:
-----------
strip trailing whitespace and tabs
Commit: 35dc682a178d8fe7c210380eb9d500ee1c47f9ec
https://github.com/zanata/zanata-server/commit/35dc682a178d8fe7c210380eb9d500ee1c47f9ec
Author: David Mason <dr.d.mason at gmail.com>
Date: 2013-07-15 (Mon, 15 Jul 2013)
Changed paths:
M functional-test/src/test/resources/concordion/org/zanata/feature/administration/ManageUsers.html
Log Message:
-----------
remove apparent accidental paste
Commit: 32123ed8ea58732493ead21b3362ca1039dff617
https://github.com/zanata/zanata-server/commit/32123ed8ea58732493ead21b3362ca1039dff617
Author: David Mason <dr.d.mason at gmail.com>
Date: 2013-07-15 (Mon, 15 Jul 2013)
Changed paths:
M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
Log Message:
-----------
revert ManageUserAccountPage methods to prevent instability in Chrome
Commit: 521a30e300763ebcc4160cda6b93e3c9091df3d8
https://github.com/zanata/zanata-server/commit/521a30e300763ebcc4160cda6b93e3c9091df3d8
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-16 (Tue, 16 Jul 2013)
Changed paths:
M functional-test/pom.xml
M functional-test/src/main/java/org/zanata/page/HomePage.java
M functional-test/src/main/java/org/zanata/page/WebDriverFactory.java
A functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
A functional-test/src/main/java/org/zanata/util/rfc2822/InvalidEmailAddressRFC2822.java
A functional-test/src/main/java/org/zanata/util/rfc2822/ValidEmailAddressRFC2822.java
A functional-test/src/test/java/org/zanata/feature/account/InvalidEmailAddressTest.java
A functional-test/src/test/java/org/zanata/feature/account/RegisterDetailedTest.java
A functional-test/src/test/java/org/zanata/feature/account/RegisterTestSuite.java
A functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
A functional-test/src/test/java/org/zanata/feature/account/ValidEmailAddressTest.java
M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryTestSuite.java
M functional-test/src/test/resources/setup.properties
M pom.xml
M zanata-war/eclipse/eclipse-code-formatter-profile.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/events/FilterViewEvent.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/EditorKeyShortcuts.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransFilterPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/UserConfigHolder.java
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/TableEditorMessages.java
M zanata-war/src/main/java/org/zanata/webtrans/client/service/GetTransUnitActionContext.java
M zanata-war/src/main/java/org/zanata/webtrans/client/service/GetTransUnitActionContextHolder.java
M zanata-war/src/main/java/org/zanata/webtrans/client/service/HistoryEventHandlerService.java
M zanata-war/src/main/java/org/zanata/webtrans/client/service/ModalNavigationStateHolder.java
M zanata-war/src/main/java/org/zanata/webtrans/client/service/UserOptionsService.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/FilterViewConfirmationDisplay.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/FilterViewConfirmationPanel.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SaveAsApprovedConfirmationPanel.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsDisplay.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/LoadOptionsHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/model/UserOptions.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitList.java
M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
M zanata-war/src/main/webapp/account/register.xhtml
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/EditorKeyShortcutsTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/EditorOptionsPresenterTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransFilterPresenterTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenterTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/service/GetTransUnitActionContextTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/service/ModalNavigationStateHolderTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/service/UserOptionsServiceTest.java
M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandlerTest.java
M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitsNavigationServiceTest.java
M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/LoadOptionsHandlerTest.java
Log Message:
-----------
Merge branch 'integration/master' into rhbz981067
Conflicts:
functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
Commit: ddb3a3b72db48ad8426ccfbcc2617890121345b9
https://github.com/zanata/zanata-server/commit/ddb3a3b72db48ad8426ccfbcc2617890121345b9
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-16 (Tue, 16 Jul 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
M zanata-war/src/main/resources/messages.properties
Log Message:
-----------
refactor code as suggested
Commit: 0eda6426fcbc5090f9f602e8d174ee41224c13cd
https://github.com/zanata/zanata-server/commit/0eda6426fcbc5090f9f602e8d174ee41224c13cd
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-16 (Tue, 16 Jul 2013)
Changed paths:
M functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
M functional-test/src/main/java/org/zanata/workflow/LanguageWorkFlow.java
M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersDetailedTest.java
M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java
M functional-test/src/test/resources/concordion/org/zanata/feature/administration/ManageUsers.html
M zanata-model/src/main/java/org/zanata/model/HLocaleMember.java
M zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
M zanata-war/src/main/java/org/zanata/dao/PersonDAO.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/model/UserWorkspaceContext.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/model/WorkspaceRestrictions.java
M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_role_language.xhtml
M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join_language.xhtml
M zanata-war/src/main/webapp/WEB-INF/pages.xml
M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
M zanata-war/src/main/webapp/iteration/files.xhtml
M zanata-war/src/main/webapp/language/language.xhtml
M zanata-war/src/main/webapp/language/request_to_join_update_role.xhtml
M zanata-war/src/main/webapp/project/project.xhtml
Log Message:
-----------
Merge branch 'rhbz981067' of github.com:zanata/zanata-server into rhbz981067
Commit: e55c1f3dc631690afa3bee74928293170d02274e
https://github.com/zanata/zanata-server/commit/e55c1f3dc631690afa3bee74928293170d02274e
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-16 (Tue, 16 Jul 2013)
Changed paths:
M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersDetailedTest.java
M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java
Log Message:
-----------
Fix functional test
Commit: 06ad0612718d1404e95340bbe95ca76c9a805ad4
https://github.com/zanata/zanata-server/commit/06ad0612718d1404e95340bbe95ca76c9a805ad4
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-16 (Tue, 16 Jul 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.java
Log Message:
-----------
Fix problem where approve/reject changes states the editor row (color)
Commit: ca4027a4fb8bf72aa09cb1ca492be149dbaf59e7
https://github.com/zanata/zanata-server/commit/ca4027a4fb8bf72aa09cb1ca492be149dbaf59e7
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-16 (Tue, 16 Jul 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
Log Message:
-----------
Rename variables name
Commit: c700438ad082616892b36740bd0ecd0ce741ed62
https://github.com/zanata/zanata-server/commit/c700438ad082616892b36740bd0ecd0ce741ed62
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-16 (Tue, 16 Jul 2013)
Changed paths:
M functional-test/pom.xml
A functional-test/src/test/java/org/zanata/feature/AggregateTestSuite.java
A functional-test/src/test/java/org/zanata/feature/BasicAcceptanceTest.java
A functional-test/src/test/java/org/zanata/feature/BasicAcceptanceTestSuite.java
A functional-test/src/test/java/org/zanata/feature/ConcordionTest.java
A functional-test/src/test/java/org/zanata/feature/ConcordionTestSuite.java
A functional-test/src/test/java/org/zanata/feature/DetailedTest.java
A functional-test/src/test/java/org/zanata/feature/DetailedTestSuite.java
M functional-test/src/test/java/org/zanata/feature/account/InvalidEmailAddressTest.java
R functional-test/src/test/java/org/zanata/feature/account/RegisterDetailedTest.java
A functional-test/src/test/java/org/zanata/feature/account/RegisterFullTest.java
M functional-test/src/test/java/org/zanata/feature/account/RegisterTestSuite.java
M functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
M functional-test/src/test/java/org/zanata/feature/account/ValidEmailAddressTest.java
A functional-test/src/test/java/org/zanata/feature/administration/AdministrationTest.java
M functional-test/src/test/java/org/zanata/feature/administration/AdministrationTestSuite.java
R functional-test/src/test/java/org/zanata/feature/administration/ManageUsersDetailedTest.java
A functional-test/src/test/java/org/zanata/feature/administration/ManageUsersFullTest.java
M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java
M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryDeleteTest.java
M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryPushCSVTest.java
M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryPushTest.java
M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryTest.java
M functional-test/src/test/java/org/zanata/feature/glossary/InvalidGlossaryPushTest.java
M functional-test/src/test/java/org/zanata/feature/security/LoginTest.java
M functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java
M functional-test/src/test/java/org/zanata/feature/startNewProject/AddLanguageTest.java
M functional-test/src/test/java/org/zanata/feature/startNewProject/CreateNewProjectTest.java
M functional-test/src/test/java/org/zanata/feature/startNewProject/CreateVersionAndAddToProjectTest.java
M functional-test/src/test/java/org/zanata/feature/startNewProject/DocumentListInWebTransTest.java
M functional-test/src/test/java/org/zanata/feature/startNewProject/PushPodirPluralProjectTest.java
M functional-test/src/test/java/org/zanata/feature/startNewProject/StartNewProjectTest.java
M functional-test/src/test/java/org/zanata/feature/startNewProject/TranslatorJoinsLanguageTeamTest.java
M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupBasicTest.java
R functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupDetailedTest.java
A functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupFullTest.java
M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java
M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTestSuite.java
Log Message:
-----------
Merge branch 'integration/master' into rhbz981067
Conflicts:
functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java
Commit: 1fc5a53d7d2ab228bc3ea822044d8a381988e752
https://github.com/zanata/zanata-server/commit/1fc5a53d7d2ab228bc3ea822044d8a381988e752
Author: David Mason <dr.d.mason at gmail.com>
Date: 2013-07-16 (Tue, 16 Jul 2013)
Changed paths:
M functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersFullTest.java
M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryDeleteTest.java
M functional-test/src/test/java/org/zanata/feature/startNewProject/TranslatorJoinsLanguageTeamTest.java
M functional-test/src/test/resources/concordion/org/zanata/feature/administration/ManageUsers.html
M functional-test/src/test/resources/concordion/org/zanata/feature/zanata_with_data.sql
M functional-test/src/test/resources/create_translator_user.sql
M zanata-model/src/main/java/org/zanata/model/HLocale.java
M zanata-model/src/main/java/org/zanata/model/HLocaleMember.java
A zanata-war/src/main/java/org/zanata/action/LanguageJoinUpdateRoleAction.java
M zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
M zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
M zanata-war/src/main/java/org/zanata/action/SendEmailAction.java
M zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
M zanata-war/src/main/java/org/zanata/dao/LocaleMemberDAO.java
M zanata-war/src/main/java/org/zanata/dao/PersonDAO.java
M zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java
M zanata-war/src/main/java/org/zanata/service/EmailService.java
M zanata-war/src/main/java/org/zanata/service/LanguageTeamService.java
M zanata-war/src/main/java/org/zanata/service/SecurityService.java
M zanata-war/src/main/java/org/zanata/service/impl/LanguageTeamServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/RegisterServiceImpl.java
M zanata-war/src/main/java/org/zanata/util/EssentialDataCreator.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
M zanata-war/src/main/java/org/zanata/webtrans/client/service/TransUnitSaveService.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorButtonsWidget.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsDisplay.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/model/UserWorkspaceContext.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/model/WorkspaceRestrictions.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TransUnitUpdated.java
M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/resources/messages_ja.properties
M zanata-war/src/main/resources/messages_uk.properties
M zanata-war/src/main/resources/messages_zh_TW_Hant.properties
M zanata-war/src/main/resources/security.drl
A zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_role_language.xhtml
R zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join.xhtml
M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join_group.xhtml
A zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join_language.xhtml
M zanata-war/src/main/webapp/WEB-INF/pages.xml
M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
M zanata-war/src/main/webapp/iteration/files.xhtml
M zanata-war/src/main/webapp/language/language.xhtml
R zanata-war/src/main/webapp/language/request_to_join.xhtml
A zanata-war/src/main/webapp/language/request_to_join_update_role.xhtml
M zanata-war/src/main/webapp/project/project.xhtml
M zanata-war/src/main/webapp/resources/css/zanata.css
M zanata-war/src/test/java/org/zanata/dao/LocaleMemberDAOITCase.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/SearchResultsPresenterTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TargetContentsPresenterTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryPresenterTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/service/TransUnitSaveServiceTest.java
M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandlerTest.java
Log Message:
-----------
Merge pull request #34 from zanata/rhbz981067
New reviewer role per locale
Compare: https://github.com/zanata/zanata-server/compare/9021a37923c2...1fc5a53d7d2a
More information about the zanata-commits
mailing list