[zanata/zanata-server] e95a15: Track CopyTrans progress at TextFlow/locale level
GitHub
noreply at github.com
Thu Jul 3 05:34:03 UTC 2014
Branch: refs/heads/rhbz1104015
Home: https://github.com/zanata/zanata-server
Commit: e95a15c0442e9518cb39601d01ae0d798e9aca6a
https://github.com/zanata/zanata-server/commit/e95a15c0442e9518cb39601d01ae0d798e9aca6a
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2014-06-04 (Wed, 04 Jun 2014)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/CopyTransAction.java
M zanata-war/src/main/java/org/zanata/async/tasks/CopyTransTask.java
M zanata-war/src/main/java/org/zanata/async/tasks/DocumentCopyTransTask.java
M zanata-war/src/main/java/org/zanata/async/tasks/IterationCopyTransTask.java
M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/resources/messages_en_GB.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/webapp/iteration/view.xhtml
Log Message:
-----------
Track CopyTrans progress at TextFlow/locale level
Commit: 51a54193ce35586d83f68dd84301877aa74ad8e5
https://github.com/zanata/zanata-server/commit/51a54193ce35586d83f68dd84301877aa74ad8e5
Author: Patrick Huang <pahuang at redhat.com>
Date: 2014-06-04 (Wed, 04 Jun 2014)
Changed paths:
M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
M zanata-war/src/test/java/org/zanata/seam/AutowireTransaction.java
M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceUnitTest.java
Log Message:
-----------
rhbz1102964 - clear session after each copyTrans batch to improve performance
Commit: 8b32c28a14d864ef9214dcac244394c159a66590
https://github.com/zanata/zanata-server/commit/8b32c28a14d864ef9214dcac244394c159a66590
Author: Patrick Huang <pahuang at redhat.com>
Date: 2014-06-04 (Wed, 04 Jun 2014)
Changed paths:
M functional-test/pom.xml
M functional-test/src/main/java/org/zanata/rest/SampleProjectResource.java
M functional-test/src/main/java/org/zanata/rest/SampleProjectResourceImpl.java
M functional-test/src/main/java/org/zanata/util/SampleProjectProfile.java
M functional-test/src/main/java/org/zanata/workflow/ClientWorkFlow.java
A functional-test/src/test/java/org/zanata/feature/manual/CopyTransTuningTest.java
M functional-test/src/test/java/org/zanata/util/SampleProjectClient.java
M functional-test/src/test/java/org/zanata/util/ZanataRestCaller.java
Log Message:
-----------
generate copyTrans test data
Commit: bae09c45a35e5ec9bab42f93b0e575996d904737
https://github.com/zanata/zanata-server/commit/bae09c45a35e5ec9bab42f93b0e575996d904737
Author: Patrick Huang <pahuang at redhat.com>
Date: 2014-06-04 (Wed, 04 Jun 2014)
Changed paths:
A functional-test/src/main/java/org/zanata/rest/SampleDataResource.java
A functional-test/src/main/java/org/zanata/rest/SampleDataResourceImpl.java
R functional-test/src/main/java/org/zanata/rest/SampleProjectResource.java
R functional-test/src/main/java/org/zanata/rest/SampleProjectResourceImpl.java
M functional-test/src/test/java/org/zanata/feature/manual/CopyTransTuningTest.java
M functional-test/src/test/java/org/zanata/util/AddUsersRule.java
M functional-test/src/test/java/org/zanata/util/CleanDatabaseRule.java
A functional-test/src/test/java/org/zanata/util/SampleDataResourceClient.java
R functional-test/src/test/java/org/zanata/util/SampleProjectClient.java
M functional-test/src/test/java/org/zanata/util/SampleProjectRule.java
Log Message:
-----------
rename class
Commit: 630de23552487d907149c90e5de6e3c33720abf1
https://github.com/zanata/zanata-server/commit/630de23552487d907149c90e5de6e3c33720abf1
Author: Patrick Huang <pahuang at redhat.com>
Date: 2014-06-10 (Tue, 10 Jun 2014)
Changed paths:
M functional-test/src/test/java/org/zanata/feature/manual/CopyTransTuningTest.java
M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.java
M zanata-war/src/main/java/org/zanata/service/impl/CopyTransWork.java
M zanata-war/src/main/webapp/iteration/view.xhtml
M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
M zanata-war/src/test/java/org/zanata/service/impl/CopyTransWorkTest.java
Log Message:
-----------
rhbz1102964 - use lazy evaluation and remove unnecessary hibernate calls where possible
Commit: 11439e0f92e7c81520218e3ca2fb5edea9bbece1
https://github.com/zanata/zanata-server/commit/11439e0f92e7c81520218e3ca2fb5edea9bbece1
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2014-06-10 (Tue, 10 Jun 2014)
Changed paths:
M zanata-war/src/main/java/org/zanata/async/tasks/IterationCopyTransTask.java
M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
Log Message:
-----------
Use a query to count textflows in a project iteration
Commit: 9a526f7dbae72fcc02b3d79c0af3dd0c9ec38c03
https://github.com/zanata/zanata-server/commit/9a526f7dbae72fcc02b3d79c0af3dd0c9ec38c03
Author: Patrick Huang <pahuang at redhat.com>
Date: 2014-06-12 (Thu, 12 Jun 2014)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/CopyTransAction.java
M zanata-war/src/main/java/org/zanata/async/tasks/CopyTransTask.java
M zanata-war/src/main/java/org/zanata/async/tasks/DocumentCopyTransTask.java
M zanata-war/src/main/java/org/zanata/async/tasks/IterationCopyTransTask.java
M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/resources/messages_en_GB.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/webapp/iteration/view.xhtml
Log Message:
-----------
Merge remote-tracking branch 'origin/copytrans-progress-per-textflow' into temp
Commit: 69db5c082cccdaff9344cf8adf7a0a319eeb77f7
https://github.com/zanata/zanata-server/commit/69db5c082cccdaff9344cf8adf7a0a319eeb77f7
Author: Patrick Huang <pahuang at redhat.com>
Date: 2014-06-12 (Thu, 12 Jun 2014)
Changed paths:
M functional-test/src/test/java/org/zanata/feature/manual/CopyTransTuningTest.java
M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/CopyTransWork.java
M zanata-war/src/main/java/org/zanata/service/impl/CopyTransWorkFactory.java
M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceUnitTest.java
Log Message:
-----------
rhbz1102964 - iterate all locales per copyTrans batch
Commit: 92b062aa6da6d45d129e52b905aa22506694ebf6
https://github.com/zanata/zanata-server/commit/92b062aa6da6d45d129e52b905aa22506694ebf6
Author: Patrick Huang <pahuang at redhat.com>
Date: 2014-06-12 (Thu, 12 Jun 2014)
Changed paths:
M functional-test/src/test/java/org/zanata/feature/clientserver/ProjectMaintainerTest.java
M functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTest.java
M functional-test/src/test/java/org/zanata/feature/manual/CopyTransTuningTest.java
M functional-test/src/test/java/org/zanata/util/ZanataRestCaller.java
Log Message:
-----------
set test to use merge type import
Commit: 33dc80fb775f788db03f4e25bcdd7947ea4a2848
https://github.com/zanata/zanata-server/commit/33dc80fb775f788db03f4e25bcdd7947ea4a2848
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2014-06-16 (Mon, 16 Jun 2014)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/ActivityAction.java
M zanata-war/src/main/java/org/zanata/action/CopyTransOptionsModel.java
M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
M zanata-war/src/main/java/org/zanata/action/GlossaryAction.java
M zanata-war/src/main/java/org/zanata/action/LanguageJoinUpdateRoleAction.java
M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
M zanata-war/src/main/java/org/zanata/action/ProjectHomeAction.java
M zanata-war/src/main/java/org/zanata/action/VersionGroupHomeAction.java
R zanata-war/src/main/java/org/zanata/annotation/CachedMethodResult.java
R zanata-war/src/main/java/org/zanata/annotation/CachedMethods.java
R zanata-war/src/main/java/org/zanata/seam/interceptor/CachedMethodResultInterceptor.java
M zanata-war/src/main/java/org/zanata/ui/ActivityEntry.java
Log Message:
-----------
Remove CachedMethodResult annotation and interceptors.
Replace that functionality with other types of in-memory caching.
In some scenarios, the annotation itself was not doing much or was simply not active due to the class-level annotation not being present.
Commit: 47bc12a889d0f48865bb4d7574298e0c87f5d74f
https://github.com/zanata/zanata-server/commit/47bc12a889d0f48865bb4d7574298e0c87f5d74f
Author: Alex Eng <aeng at redhat.com>
Date: 2014-06-17 (Tue, 17 Jun 2014)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/AccountMergeAction.java
R zanata-war/src/main/resources/images/openid/fedora.png
R zanata-war/src/main/resources/images/openid/google.png
R zanata-war/src/main/resources/images/openid/openid.png
R zanata-war/src/main/resources/images/openid/yahoo.png
R zanata-war/src/main/resources/images/z-logo-50px.png
M zanata-war/src/main/resources/messages.properties
R zanata-war/src/main/webapp/WEB-INF/layout/login_provider.xhtml
M zanata-war/src/main/webapp/WEB-INF/pages.xml
M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
M zanata-war/src/main/webapp/profile/merge_account.xhtml
M zanata-war/src/main/webapp/project/home.xhtml
M zanata-war/src/main/webapp/resources/script/components-script.js
M zanata-war/src/main/webapp/version-group/home.xhtml
Log Message:
-----------
Redesign account merge page: https://bugzilla.redhat.com/show_bug.cgi?id=1110048
Commit: 9c978e24bc7c4b88c705f11ba6708ac2b76a13e6
https://github.com/zanata/zanata-server/commit/9c978e24bc7c4b88c705f11ba6708ac2b76a13e6
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2014-06-17 (Tue, 17 Jun 2014)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/VersionGroupHomeAction.java
Log Message:
-----------
Add a missing clear for a cache map.
Commit: bf3ca0382565c757f02a7b7420605974a43d7d95
https://github.com/zanata/zanata-server/commit/bf3ca0382565c757f02a7b7420605974a43d7d95
Author: Alex Eng <aeng at redhat.com>
Date: 2014-06-17 (Tue, 17 Jun 2014)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/AccountMergeAction.java
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/webapp/profile/merge_account.xhtml
Log Message:
-----------
Redesign account merge page to match login page
Commit: 064b45006b4d107b62840a061e9d44c1d57de8d9
https://github.com/zanata/zanata-server/commit/064b45006b4d107b62840a061e9d44c1d57de8d9
Author: Patrick Huang <pahuang at redhat.com>
Date: 2014-06-17 (Tue, 17 Jun 2014)
Changed paths:
M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/CopyTransWork.java
M zanata-war/src/main/java/org/zanata/service/impl/CopyTransWorkFactory.java
M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceUnitTest.java
Log Message:
-----------
Revert "rhbz1102964 - iterate all locales per copyTrans batch"
This reverts commit 69db5c082cccdaff9344cf8adf7a0a319eeb77f7.
Commit: 2f2705928052f4b7661c83fd071434843d9517b8
https://github.com/zanata/zanata-server/commit/2f2705928052f4b7661c83fd071434843d9517b8
Author: Patrick Huang <pahuang at redhat.com>
Date: 2014-06-17 (Tue, 17 Jun 2014)
Changed paths:
A zanata-war/src/main/java/org/zanata/dao/NativeQuery.java
M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.java
M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/CopyTransWork.java
M zanata-war/src/main/webapp/iteration/view.xhtml
A zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplPerformanceTest.java
Log Message:
-----------
rhbz1102964 - use native query and clear session after each batch
Commit: d04498df3ae48d99917ee119a4fd891f3b9452a2
https://github.com/zanata/zanata-server/commit/d04498df3ae48d99917ee119a4fd891f3b9452a2
Author: Alex Eng <aeng at redhat.com>
Date: 2014-06-18 (Wed, 18 Jun 2014)
Changed paths:
M zanata-war/src/main/resources/messages.properties
Log Message:
-----------
Remove unused messages string
Commit: 8f688ea6f12d415639dd1b4e107644b1f2d47a9f
https://github.com/zanata/zanata-server/commit/8f688ea6f12d415639dd1b4e107644b1f2d47a9f
Author: Alex Eng <aeng at redhat.com>
Date: 2014-06-18 (Wed, 18 Jun 2014)
Changed paths:
M zanata-war/src/main/resources/messages.properties
Log Message:
-----------
Re-phrase merge account messages
Commit: 97c471a38c8c914754802752219f31990c978f3f
https://github.com/zanata/zanata-server/commit/97c471a38c8c914754802752219f31990c978f3f
Author: Patrick Huang <pahuang at redhat.com>
Date: 2014-06-18 (Wed, 18 Jun 2014)
Changed paths:
M zanata-war/src/main/java/org/zanata/async/tasks/DocumentCopyTransTask.java
M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
Log Message:
-----------
use query to count textflow to avoid lazy loading exception
Commit: 543ac9ae7340a80a0b7be64521a1d3834ff550b7
https://github.com/zanata/zanata-server/commit/543ac9ae7340a80a0b7be64521a1d3834ff550b7
Author: Patrick Huang <pahuang at redhat.com>
Date: 2014-06-19 (Thu, 19 Jun 2014)
Changed paths:
M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
Log Message:
-----------
fix HQL query for counting active textflows in iteration
Commit: 1010c77be79a42a1761bb836bd5e4299fbe769f0
https://github.com/zanata/zanata-server/commit/1010c77be79a42a1761bb836bd5e4299fbe769f0
Author: Damian Jansen <djansen at redhat.com>
Date: 2014-06-19 (Thu, 19 Jun 2014)
Changed paths:
M functional-test/src/main/java/org/zanata/page/dashboard/DashboardBasePage.java
M functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
Log Message:
-----------
Add the Feature summary annotation to Dashboard tests
Also use static variables for page messages
Commit: b433d8197a213c171aeaf68bf7984dc45d6dfdb2
https://github.com/zanata/zanata-server/commit/b433d8197a213c171aeaf68bf7984dc45d6dfdb2
Author: Damian Jansen <djansen at redhat.com>
Date: 2014-06-19 (Thu, 19 Jun 2014)
Changed paths:
M functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
M functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentAccessTest.java
M functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTest.java
Log Message:
-----------
Update concurrent edit tests to assertj
Also add feature inventory annotation.
Commit: 26379c8a04191e25b64c8f88e07f57d2985ed0f8
https://github.com/zanata/zanata-server/commit/26379c8a04191e25b64c8f88e07f57d2985ed0f8
Author: Alex Eng <aeng at redhat.com>
Date: 2014-06-23 (Mon, 23 Jun 2014)
Changed paths:
M functional-test/pom.xml
M functional-test/src/main/java/org/zanata/page/CorePage.java
M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
M functional-test/src/main/java/org/zanata/page/account/SignInPage.java
M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
M functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardAccountTab.java
M functional-test/src/main/java/org/zanata/page/projects/ProjectVersionsPage.java
M functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java
M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectPermissionsTab.java
M functional-test/src/main/java/org/zanata/page/projectversion/VersionDocumentsPage.java
M functional-test/src/main/java/org/zanata/page/utility/HomePage.java
A functional-test/src/test/java/org/zanata/feature/Feature.java
M functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
M functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.java
M functional-test/src/test/java/org/zanata/feature/account/InvalidEmailAddressTest.java
M functional-test/src/test/java/org/zanata/feature/account/ProfileTest.java
M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.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
M functional-test/src/test/java/org/zanata/feature/administration/EditHomePageTest.java
M functional-test/src/test/java/org/zanata/feature/administration/EditTranslationMemoryTest.java
M functional-test/src/test/java/org/zanata/feature/administration/ManageSearchTest.java
R functional-test/src/test/java/org/zanata/feature/administration/ManageUsersFullTest.java
A functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java
M functional-test/src/test/java/org/zanata/feature/clientserver/GettextPluralSupportTest.java
M functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTest.java
M functional-test/src/test/java/org/zanata/feature/document/HTMLDocumentTypeTest.java
M functional-test/src/test/java/org/zanata/feature/testharness/TestPlan.java
A functional-test/src/test/java/org/zanata/util/FeatureInventoryRecorder.java
A functional-test/src/test/java/org/zanata/util/FeatureReporter.java
A functional-test/src/test/java/org/zanata/util/HTMLFeatureReporter.java
M pom.xml
M zanata-war/pom.xml
R zanata-war/src/etc/graphics.svg
M zanata-war/src/main/java/org/zanata/ZanataInit.java
R zanata-war/src/main/java/org/zanata/action/AccountSearchAction.java
M zanata-war/src/main/java/org/zanata/action/PagedListDataModel.java
M zanata-war/src/main/java/org/zanata/action/ProjectAction.java
M zanata-war/src/main/java/org/zanata/action/ProjectSearch.java
M zanata-war/src/main/java/org/zanata/action/UserAction.java
M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
M zanata-war/src/main/java/org/zanata/dao/AccountDAO.java
A zanata-war/src/main/java/org/zanata/security/JBossSSOLoginModule.java
M zanata-war/src/main/java/org/zanata/ui/AbstractListFilter.java
M zanata-war/src/main/java/org/zanata/ui/model/statistic/MessageStatistic.java
M zanata-war/src/main/java/org/zanata/ui/model/statistic/WordStatistic.java
M zanata-war/src/main/java/org/zanata/util/UrlUtil.java
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/Resources.java
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/TableEditorMessages.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorTextArea.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ShortcutContextAwareDialogBox.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationWarningPanel.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationWarningPanel.ui.xml
R zanata-war/src/main/resources/images/combo_box_arrow.png
R zanata-war/src/main/resources/images/crystal_project/_16x16/actions/admin_icon.png
R zanata-war/src/main/resources/images/crystal_project/_16x16/actions/help.png
R zanata-war/src/main/resources/images/crystal_project/_16x16/apps/bug.png
R zanata-war/src/main/resources/images/crystal_project/_16x16/apps/error.png
R zanata-war/src/main/resources/images/crystal_project/_16x16/apps/kdf.png
R zanata-war/src/main/resources/images/crystal_project/_16x16/apps/kllckety.png
R zanata-war/src/main/resources/images/crystal_project/_16x16/apps/locale.png
R zanata-war/src/main/resources/images/crystal_project/_16x16/apps/package_editors.png
R zanata-war/src/main/resources/images/crystal_project/_16x16/filesystems/file_doc.png
R zanata-war/src/main/resources/images/crystal_project/_48x48/apps/package_editors.png
R zanata-war/src/main/resources/images/favicon.ico
R zanata-war/src/main/resources/images/first_entry.png
R zanata-war/src/main/resources/images/last_entry.png
R zanata-war/src/main/resources/images/logo-small.png
R zanata-war/src/main/resources/images/logo.png
R zanata-war/src/main/resources/images/next_entry.png
R zanata-war/src/main/resources/images/next_mode.png
R zanata-war/src/main/resources/images/prev_entry.png
R zanata-war/src/main/resources/images/prev_mode.png
R zanata-war/src/main/resources/images/z-logo-16px.png
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/layout/project/settings-tab.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/project/versions-tab.xhtml
R zanata-war/src/main/webapp/WEB-INF/layout/version-group/request_join.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/version/documents-tab.xhtml
M zanata-war/src/main/webapp/WEB-INF/pages.xml
M zanata-war/src/main/webapp/admin/search.xhtml
M zanata-war/src/main/webapp/admin/usermanager.xhtml
R zanata-war/src/main/webapp/iteration/request_to_join_group.xhtml
M zanata-war/src/main/webapp/project/home.xhtml
R zanata-war/src/main/webapp/resources/images/spacer.gif
R zanata-war/src/main/webapp/resources/richext/spacer.xhtml
M zanata-war/src/main/webapp/search.xhtml
M zanata-war/src/main/webapp/version-group/request_to_join.xhtml
M zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
A zanata-war/src/test/java/org/zanata/database/CustomH2Dialect.java
M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
M zanata-war/src/test/java/org/zanata/ui/InMemoryListFilterTest.java
M zanata-war/src/test/resources/META-INF/persistence.xml
Log Message:
-----------
Merge branch 'integration/master' into rhbz1110048
Conflicts:
zanata-war/src/main/webapp/WEB-INF/layout/login_provider.xhtml
Commit: 50f9ad6c0d196c1fbf148320b1808d48907dbffc
https://github.com/zanata/zanata-server/commit/50f9ad6c0d196c1fbf148320b1808d48907dbffc
Author: Damian Jansen <djansen at redhat.com>
Date: 2014-06-23 (Mon, 23 Jun 2014)
Changed paths:
M functional-test/src/test/java/org/zanata/feature/editor/EditorFilterMessagesTest.java
M functional-test/src/test/java/org/zanata/feature/editor/TranslateHTMLTest.java
M functional-test/src/test/java/org/zanata/feature/editor/TranslateIdmlTest.java
M functional-test/src/test/java/org/zanata/feature/editor/TranslateOdsTest.java
M functional-test/src/test/java/org/zanata/feature/editor/TranslateOpenOfficeTest.java
M functional-test/src/test/java/org/zanata/feature/editor/TranslateTextTest.java
Log Message:
-----------
Replace hamcrest with assertj, annotate and clean up
Uses assertj for tests and improves the formatting of the code.
Adds Feature inventory annotation.
Commit: af464162125d1d10a60615c778bec244a630ae8b
https://github.com/zanata/zanata-server/commit/af464162125d1d10a60615c778bec244a630ae8b
Author: Damian Jansen <djansen at redhat.com>
Date: 2014-06-23 (Mon, 23 Jun 2014)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/AccountMergeAction.java
R zanata-war/src/main/resources/images/openid/fedora.png
R zanata-war/src/main/resources/images/openid/google.png
R zanata-war/src/main/resources/images/openid/openid.png
R zanata-war/src/main/resources/images/openid/yahoo.png
R zanata-war/src/main/resources/images/z-logo-50px.png
M zanata-war/src/main/resources/messages.properties
R zanata-war/src/main/webapp/WEB-INF/layout/login_provider.xhtml
M zanata-war/src/main/webapp/WEB-INF/pages.xml
M zanata-war/src/main/webapp/profile/merge_account.xhtml
Log Message:
-----------
Merge pull request #499 from zanata/rhbz1110048
Redesign account merge page
Commit: dcf9bec8dbd48da6fbfcf20e45b2fc692d28caa2
https://github.com/zanata/zanata-server/commit/dcf9bec8dbd48da6fbfcf20e45b2fc692d28caa2
Author: Damian Jansen <djansen at redhat.com>
Date: 2014-06-23 (Mon, 23 Jun 2014)
Changed paths:
M functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.java
M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectLanguagesTab.java
M functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java
M functional-test/src/test/java/org/zanata/feature/language/JoinLanguageTeamTest.java
Log Message:
-----------
Fix and update the admin language management tests
Add Feature inventory annotation
Fix added language check in project
Update to assertj
Commit: 37a7b9a37629400ca95bb0329ea042c0bcb84f7b
https://github.com/zanata/zanata-server/commit/37a7b9a37629400ca95bb0329ea042c0bcb84f7b
Author: Patrick Huang <pahuang at redhat.com>
Date: 2014-06-23 (Mon, 23 Jun 2014)
Changed paths:
M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectLanguagesTab.java
Log Message:
-----------
reduce StaleElementException
Commit: f4d83a606fb9b215881eafe1413b56483f51c790
https://github.com/zanata/zanata-server/commit/f4d83a606fb9b215881eafe1413b56483f51c790
Author: Patrick Huang <pahuang at redhat.com>
Date: 2014-06-23 (Mon, 23 Jun 2014)
Changed paths:
M functional-test/src/main/java/org/zanata/page/administration/ManageUserPage.java
Log Message:
-----------
fix page after code change
Commit: 0aed0e481251de300f16e7452c8e03fad2bd65c4
https://github.com/zanata/zanata-server/commit/0aed0e481251de300f16e7452c8e03fad2bd65c4
Author: Patrick Huang <pahuang at redhat.com>
Date: 2014-06-23 (Mon, 23 Jun 2014)
Changed paths:
M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectPermissionsTab.java
M functional-test/src/test/java/org/zanata/feature/account/InvalidEmailAddressTest.java
M functional-test/src/test/java/org/zanata/feature/clientserver/GettextPluralSupportTest.java
Log Message:
-----------
fix/improve test stability
Commit: 555ee06b64d830f95b64c56e2a8ef677181fc99d
https://github.com/zanata/zanata-server/commit/555ee06b64d830f95b64c56e2a8ef677181fc99d
Author: Damian Jansen <djansen at redhat.com>
Date: 2014-06-23 (Mon, 23 Jun 2014)
Changed paths:
M functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.java
M functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java
Log Message:
-----------
Update misc tests to assertj and annotate Feature
Commit: 35815bd9e54a8819895e855b2ac0f7aabdfcda55
https://github.com/zanata/zanata-server/commit/35815bd9e54a8819895e855b2ac0f7aabdfcda55
Author: Damian Jansen <djansen at redhat.com>
Date: 2014-06-24 (Tue, 24 Jun 2014)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/ActivityAction.java
M zanata-war/src/main/java/org/zanata/action/CopyTransOptionsModel.java
M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
M zanata-war/src/main/java/org/zanata/action/GlossaryAction.java
M zanata-war/src/main/java/org/zanata/action/LanguageJoinUpdateRoleAction.java
M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
M zanata-war/src/main/java/org/zanata/action/ProjectHomeAction.java
M zanata-war/src/main/java/org/zanata/action/VersionGroupHomeAction.java
R zanata-war/src/main/java/org/zanata/annotation/CachedMethodResult.java
R zanata-war/src/main/java/org/zanata/annotation/CachedMethods.java
R zanata-war/src/main/java/org/zanata/seam/interceptor/CachedMethodResultInterceptor.java
M zanata-war/src/main/java/org/zanata/ui/ActivityEntry.java
Log Message:
-----------
Merge pull request #497 from zanata/remove-cache-method-results
Remove CachedMethodResult annotation and interceptors.
Commit: 836b815b8c0a7067ad1b635db8e1ee0c89f886e2
https://github.com/zanata/zanata-server/commit/836b815b8c0a7067ad1b635db8e1ee0c89f886e2
Author: Patrick Huang <pahuang at redhat.com>
Date: 2014-06-24 (Tue, 24 Jun 2014)
Changed paths:
M zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java
M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.java
M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceUnitTest.java
Log Message:
-----------
rhbz1102964 - heuristic optimization
Commit: bd0d0645015696bb7a3ccd947b50f03e6c1b9131
https://github.com/zanata/zanata-server/commit/bd0d0645015696bb7a3ccd947b50f03e6c1b9131
Author: Damian Jansen <djansen at redhat.com>
Date: 2014-06-24 (Tue, 24 Jun 2014)
Changed paths:
M functional-test/src/main/java/org/zanata/page/BasePage.java
M functional-test/src/main/java/org/zanata/page/CorePage.java
M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectPermissionsTab.java
M functional-test/src/test/java/org/zanata/feature/project/CreateProjectTest.java
M functional-test/src/test/java/org/zanata/feature/project/EditPermissionsTest.java
M functional-test/src/test/java/org/zanata/feature/project/EditProjectAboutTest.java
M functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java
M functional-test/src/test/java/org/zanata/feature/project/EditProjectLanguagesTest.java
M functional-test/src/test/java/org/zanata/feature/project/EditProjectValidationsTest.java
Log Message:
-----------
Update to assertj and fix project tests
Replace hamcrest with assertj
Some items would fail for not being in focus - use scrolling
Add Feature inventory annotations
Fix maintainer list read function
Commit: 7f8eb7f473b3f22f6f3961501b5fd77a4771740e
https://github.com/zanata/zanata-server/commit/7f8eb7f473b3f22f6f3961501b5fd77a4771740e
Author: Damian Jansen <djansen at redhat.com>
Date: 2014-06-24 (Tue, 24 Jun 2014)
Changed paths:
M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectPermissionsTab.java
M functional-test/src/test/java/org/zanata/feature/account/InvalidEmailAddressTest.java
M functional-test/src/test/java/org/zanata/feature/testharness/ZanataTestCase.java
Log Message:
-----------
Move test logout to base class
Move logout condition to base class
Fix maintainer list locator
Commit: f164876a2fc75d17b3952bd85514ade2dfb2d671
https://github.com/zanata/zanata-server/commit/f164876a2fc75d17b3952bd85514ade2dfb2d671
Author: Patrick Huang <pahuang at redhat.com>
Date: 2014-06-25 (Wed, 25 Jun 2014)
Changed paths:
M functional-test/pom.xml
A functional-test/src/main/java/org/zanata/rest/SampleDataResource.java
A functional-test/src/main/java/org/zanata/rest/SampleDataResourceImpl.java
R functional-test/src/main/java/org/zanata/rest/SampleProjectResource.java
R functional-test/src/main/java/org/zanata/rest/SampleProjectResourceImpl.java
M functional-test/src/main/java/org/zanata/util/SampleProjectProfile.java
M functional-test/src/main/java/org/zanata/workflow/ClientWorkFlow.java
M functional-test/src/test/java/org/zanata/feature/clientserver/ProjectMaintainerTest.java
M functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTest.java
A functional-test/src/test/java/org/zanata/feature/manual/CopyTransTuningTest.java
M functional-test/src/test/java/org/zanata/util/AddUsersRule.java
M functional-test/src/test/java/org/zanata/util/CleanDatabaseRule.java
A functional-test/src/test/java/org/zanata/util/SampleDataResourceClient.java
R functional-test/src/test/java/org/zanata/util/SampleProjectClient.java
M functional-test/src/test/java/org/zanata/util/SampleProjectRule.java
M functional-test/src/test/java/org/zanata/util/ZanataRestCaller.java
M zanata-war/src/main/java/org/zanata/action/CopyTransAction.java
M zanata-war/src/main/java/org/zanata/async/tasks/CopyTransTask.java
M zanata-war/src/main/java/org/zanata/async/tasks/DocumentCopyTransTask.java
M zanata-war/src/main/java/org/zanata/async/tasks/IterationCopyTransTask.java
A zanata-war/src/main/java/org/zanata/dao/NativeQuery.java
M zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java
M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.java
M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/CopyTransWork.java
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/resources/messages_en_GB.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/webapp/iteration/view.xhtml
M zanata-war/src/test/java/org/zanata/seam/AutowireTransaction.java
A zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplPerformanceTest.java
M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceUnitTest.java
M zanata-war/src/test/java/org/zanata/service/impl/CopyTransWorkTest.java
Log Message:
-----------
Merge branch 'optimize-copytrans' into integration/master
Conflicts:
functional-test/src/main/java/org/zanata/rest/SampleDataResourceImpl.java
zanata-war/src/main/java/org/zanata/async/tasks/DocumentCopyTransTask.java
zanata-war/src/main/java/org/zanata/async/tasks/IterationCopyTransTask.java
zanata-war/src/main/webapp/iteration/view.xhtml
Commit: b4aff259af4672c4d948744c333832d7114182fa
https://github.com/zanata/zanata-server/commit/b4aff259af4672c4d948744c333832d7114182fa
Author: Patrick Huang <pahuang at redhat.com>
Date: 2014-06-25 (Wed, 25 Jun 2014)
Changed paths:
M functional-test/src/test/java/org/zanata/feature/account/InvalidEmailAddressTest.java
M functional-test/src/test/java/org/zanata/feature/testharness/ZanataTestCase.java
A functional-test/src/test/java/org/zanata/util/EnsureLogoutRule.java
Log Message:
-----------
add ensure log out rule
Commit: dc6dbf93420499e48a2d4847f8f3f8a82877126f
https://github.com/zanata/zanata-server/commit/dc6dbf93420499e48a2d4847f8f3f8a82877126f
Author: Damian Jansen <djansen at redhat.com>
Date: 2014-06-25 (Wed, 25 Jun 2014)
Changed paths:
M functional-test/src/test/java/org/zanata/feature/projectversion/CreateProjectVersionTest.java
M functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionLanguagesTest.java
M functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionValidationsTest.java
M functional-test/src/test/java/org/zanata/feature/projectversion/VersionFilteringTest.java
Log Message:
-----------
Update project version tests to assertj
Also add feature annotations
Clean up and streamline some tests
Commit: d1f6aff535c0c742d030914a2fe7c3bd7ca80397
https://github.com/zanata/zanata-server/commit/d1f6aff535c0c742d030914a2fe7c3bd7ca80397
Author: Damian Jansen <djansen at redhat.com>
Date: 2014-06-25 (Wed, 25 Jun 2014)
Changed paths:
M functional-test/src/test/java/org/zanata/feature/search/ProjectSearchTest.java
Log Message:
-----------
Update project search test to assertj
Commit: 7c49bdf4d611774af2bcc5369d62531ed59b8725
https://github.com/zanata/zanata-server/commit/7c49bdf4d611774af2bcc5369d62531ed59b8725
Author: Damian Jansen <djansen at redhat.com>
Date: 2014-06-26 (Thu, 26 Jun 2014)
Changed paths:
M functional-test/src/test/java/org/zanata/feature/account/InvalidEmailAddressTest.java
M functional-test/src/test/java/org/zanata/feature/testharness/ZanataTestCase.java
Log Message:
-----------
Press the signup button to check email errors and remove unused imports
Commit: 94e62bbc53e9486233b7ff7deb2a9c6b0840b051
https://github.com/zanata/zanata-server/commit/94e62bbc53e9486233b7ff7deb2a9c6b0840b051
Author: Damian Jansen <djansen at redhat.com>
Date: 2014-06-26 (Thu, 26 Jun 2014)
Changed paths:
M functional-test/src/main/java/org/zanata/page/administration/ManageUserPage.java
M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectLanguagesTab.java
M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectPermissionsTab.java
M functional-test/src/test/java/org/zanata/feature/account/InvalidEmailAddressTest.java
M functional-test/src/test/java/org/zanata/feature/clientserver/GettextPluralSupportTest.java
M functional-test/src/test/java/org/zanata/feature/testharness/ZanataTestCase.java
A functional-test/src/test/java/org/zanata/util/EnsureLogoutRule.java
Log Message:
-----------
Merge pull request #511 from zanata/fix-tests
Fix tests
Commit: 49c0e3ed9bc6fd24e9f4a812f2373f25cbdfa97a
https://github.com/zanata/zanata-server/commit/49c0e3ed9bc6fd24e9f4a812f2373f25cbdfa97a
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2014-06-26 (Thu, 26 Jun 2014)
Changed paths:
M pom.xml
Log Message:
-----------
Update zanata-parent
Commit: 037afd1cb94c74ecc27a9c2a0d49e5ccf356089c
https://github.com/zanata/zanata-server/commit/037afd1cb94c74ecc27a9c2a0d49e5ccf356089c
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2014-06-26 (Thu, 26 Jun 2014)
Changed paths:
M pom.xml
Log Message:
-----------
Revert "Update zanata-parent"
This reverts commit 49c0e3ed9bc6fd24e9f4a812f2373f25cbdfa97a.
Commit: f7ff29cf54a2e5bd1d7ba961c1ec64b533346112
https://github.com/zanata/zanata-server/commit/f7ff29cf54a2e5bd1d7ba961c1ec64b533346112
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2014-06-26 (Thu, 26 Jun 2014)
Changed paths:
M functional-test/pom.xml
M pom.xml
M zanata-model/pom.xml
M zanata-war/pom.xml
Log Message:
-----------
Update zanata-parent; make enforcer happy again
Commit: dd60d730f69ce3636064452df6a769d7777f52e4
https://github.com/zanata/zanata-server/commit/dd60d730f69ce3636064452df6a769d7777f52e4
Author: Carlos Munoz <chavo16 at hotmail.com>
Date: 2014-06-27 (Fri, 27 Jun 2014)
Changed paths:
M functional-test/pom.xml
M pom.xml
M zanata-model/pom.xml
M zanata-war/pom.xml
Log Message:
-----------
Merge pull request #516 from zanata/enforcer-rules
Update zanata-parent; make enforcer happy again
Commit: 48574ebf9d3b7d8e64a835e2e09c640a4ca7e2b3
https://github.com/zanata/zanata-server/commit/48574ebf9d3b7d8e64a835e2e09c640a4ca7e2b3
Author: Damian Jansen <djansen at redhat.com>
Date: 2014-06-30 (Mon, 30 Jun 2014)
Changed paths:
M functional-test/src/main/java/org/zanata/page/dashboard/DashboardBasePage.java
M functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
Log Message:
-----------
Merge pull request #505 from zanata/add-feature-summary-dashboard
Add the Feature summary annotation to Dashboard tests
Commit: fe06460d37275396093ebd7ab9ed8a39b1f29449
https://github.com/zanata/zanata-server/commit/fe06460d37275396093ebd7ab9ed8a39b1f29449
Author: Damian Jansen <djansen at redhat.com>
Date: 2014-06-30 (Mon, 30 Jun 2014)
Changed paths:
M functional-test/src/test/java/org/zanata/feature/testharness/TestPlan.java
R functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupFullTest.java
A functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java
Log Message:
-----------
Rename version group test
'Full' is misleading.
Commit: a5c1592b63edd52fc9ef8555cf0f7e31a4df07cd
https://github.com/zanata/zanata-server/commit/a5c1592b63edd52fc9ef8555cf0f7e31a4df07cd
Author: Damian Jansen <djansen at redhat.com>
Date: 2014-07-01 (Tue, 01 Jul 2014)
Changed paths:
M functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java
M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupIDValidationTest.java
M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java
Log Message:
-----------
Update version group tests to assertj, add Feature annotation
Commit: 705d6dd7fb9372c4dbc033662a30a3691df69ca2
https://github.com/zanata/zanata-server/commit/705d6dd7fb9372c4dbc033662a30a3691df69ca2
Author: Damian Jansen <djansen at redhat.com>
Date: 2014-07-01 (Tue, 01 Jul 2014)
Changed paths:
M functional-test/src/test/java/org/zanata/feature/clientserver/GettextPluralSupportTest.java
M functional-test/src/test/java/org/zanata/feature/clientserver/ProjectMaintainerTest.java
M functional-test/src/test/java/org/zanata/feature/clientserver/PropertiesRoundTripTest.java
Log Message:
-----------
Update clientserver tests to assertj
Also add Feature annotations and do some reformatting
Commit: a62e4d948848f0b3cf99041cbcb5f7247c776dff
https://github.com/zanata/zanata-server/commit/a62e4d948848f0b3cf99041cbcb5f7247c776dff
Author: Patrick Huang <pahuang at redhat.com>
Date: 2014-07-01 (Tue, 01 Jul 2014)
Changed paths:
M functional-test/src/main/java/org/zanata/util/SampleProjectProfile.java
M functional-test/src/test/java/org/zanata/feature/security/SecurityFullTest.java
Log Message:
-----------
rhbz1114421 - able to test reset password
Commit: e97042e822741591bc51443852210e875615597b
https://github.com/zanata/zanata-server/commit/e97042e822741591bc51443852210e875615597b
Author: Patrick Huang <pahuang at redhat.com>
Date: 2014-07-02 (Wed, 02 Jul 2014)
Changed paths:
M functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java
M functional-test/src/test/java/org/zanata/feature/testharness/TestPlan.java
R functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupFullTest.java
M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupIDValidationTest.java
A functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java
Log Message:
-----------
Merge pull request #519 from zanata/assertj-versiongroup-tests
Update version group tests to assertj, add Feature annotation
Commit: 5b405d08f4fa21de9021c368fe89a72d106a9e90
https://github.com/zanata/zanata-server/commit/5b405d08f4fa21de9021c368fe89a72d106a9e90
Author: Patrick Huang <pahuang at redhat.com>
Date: 2014-07-02 (Wed, 02 Jul 2014)
Changed paths:
M functional-test/src/main/java/org/zanata/page/administration/ManageUserPage.java
M functional-test/src/test/java/org/zanata/feature/security/SecurityFullTest.java
Log Message:
-----------
fix page after UI change
Commit: 8785707dd2f1af401241ec53a52ae9e0defa098f
https://github.com/zanata/zanata-server/commit/8785707dd2f1af401241ec53a52ae9e0defa098f
Author: Patrick Huang <pahuang at redhat.com>
Date: 2014-07-02 (Wed, 02 Jul 2014)
Changed paths:
M functional-test/src/test/java/org/zanata/feature/search/ProjectSearchTest.java
Log Message:
-----------
Merge pull request #515 from zanata/assertj-search-test
Update project search test to assertj
Commit: b41269c6278f67ae9cc46016f9d685acd47a12d8
https://github.com/zanata/zanata-server/commit/b41269c6278f67ae9cc46016f9d685acd47a12d8
Author: Patrick Huang <pahuang at redhat.com>
Date: 2014-07-02 (Wed, 02 Jul 2014)
Changed paths:
M functional-test/src/test/java/org/zanata/feature/projectversion/CreateProjectVersionTest.java
M functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionLanguagesTest.java
M functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionValidationsTest.java
M functional-test/src/test/java/org/zanata/feature/projectversion/VersionFilteringTest.java
Log Message:
-----------
Merge pull request #514 from zanata/assertj-projectversion
Update project version tests to assertj
Commit: 876ef640c5c25066e65c9efb81deecbeb2cd6b5f
https://github.com/zanata/zanata-server/commit/876ef640c5c25066e65c9efb81deecbeb2cd6b5f
Author: Patrick Huang <pahuang at redhat.com>
Date: 2014-07-02 (Wed, 02 Jul 2014)
Changed paths:
M functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.java
M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectLanguagesTab.java
M functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java
M functional-test/src/test/java/org/zanata/feature/language/JoinLanguageTeamTest.java
Log Message:
-----------
Merge pull request #510 from zanata/assertj-language-tests
Fix and update the admin language management tests
Commit: 38e8d7b62180d5fc3a8c3d8a907fd18907227cbe
https://github.com/zanata/zanata-server/commit/38e8d7b62180d5fc3a8c3d8a907fd18907227cbe
Author: Patrick Huang <pahuang at redhat.com>
Date: 2014-07-02 (Wed, 02 Jul 2014)
Changed paths:
M functional-test/src/test/java/org/zanata/feature/clientserver/GettextPluralSupportTest.java
M functional-test/src/test/java/org/zanata/feature/clientserver/ProjectMaintainerTest.java
M functional-test/src/test/java/org/zanata/feature/clientserver/PropertiesRoundTripTest.java
Log Message:
-----------
Merge pull request #493 from zanata/update-to-assertj-clientserver
Update clientserver tests to assertj
Commit: 2fd7c0c8aa2a55a1069baee300ccf4747d99a385
https://github.com/zanata/zanata-server/commit/2fd7c0c8aa2a55a1069baee300ccf4747d99a385
Author: Patrick Huang <pahuang at redhat.com>
Date: 2014-07-02 (Wed, 02 Jul 2014)
Changed paths:
M functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
M functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentAccessTest.java
M functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTest.java
Log Message:
-----------
Merge pull request #495 from zanata/update-to-assertj-concurrentedit
Update concurrent edit tests to assertj
Commit: 52452fcda829dfe247502a87b7f74489e75a4efd
https://github.com/zanata/zanata-server/commit/52452fcda829dfe247502a87b7f74489e75a4efd
Author: Patrick Huang <pahuang at redhat.com>
Date: 2014-07-02 (Wed, 02 Jul 2014)
Changed paths:
M functional-test/src/test/java/org/zanata/feature/editor/EditorFilterMessagesTest.java
M functional-test/src/test/java/org/zanata/feature/editor/TranslateHTMLTest.java
M functional-test/src/test/java/org/zanata/feature/editor/TranslateIdmlTest.java
M functional-test/src/test/java/org/zanata/feature/editor/TranslateOdsTest.java
M functional-test/src/test/java/org/zanata/feature/editor/TranslateOpenOfficeTest.java
M functional-test/src/test/java/org/zanata/feature/editor/TranslateTextTest.java
Log Message:
-----------
Merge pull request #509 from zanata/assertj-editor-tests
Replace hamcrest with assertj, annotate and clean up
Commit: 0a8bbae3444f1f512f0745b802ad731c43aeafc7
https://github.com/zanata/zanata-server/commit/0a8bbae3444f1f512f0745b802ad731c43aeafc7
Author: Patrick Huang <pahuang at redhat.com>
Date: 2014-07-02 (Wed, 02 Jul 2014)
Changed paths:
M functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.java
M functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java
Log Message:
-----------
Merge pull request #512 from zanata/assertj-misc-tests
Update misc tests to assertj and annotate Feature
Commit: f3a89e156895548c59428003f43b773e4ba512ac
https://github.com/zanata/zanata-server/commit/f3a89e156895548c59428003f43b773e4ba512ac
Author: Patrick Huang <pahuang at redhat.com>
Date: 2014-07-02 (Wed, 02 Jul 2014)
Changed paths:
M functional-test/src/main/java/org/zanata/page/BasePage.java
M functional-test/src/main/java/org/zanata/page/CorePage.java
M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectPermissionsTab.java
M functional-test/src/test/java/org/zanata/feature/project/CreateProjectTest.java
M functional-test/src/test/java/org/zanata/feature/project/EditPermissionsTest.java
M functional-test/src/test/java/org/zanata/feature/project/EditProjectAboutTest.java
M functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java
M functional-test/src/test/java/org/zanata/feature/project/EditProjectLanguagesTest.java
M functional-test/src/test/java/org/zanata/feature/project/EditProjectValidationsTest.java
Log Message:
-----------
Merge pull request #513 from zanata/assertj-project-tests
Update to assertj and fix project tests
Commit: ded5931dfb27026f7c57d5488c1cc064d1db557f
https://github.com/zanata/zanata-server/commit/ded5931dfb27026f7c57d5488c1cc064d1db557f
Author: Damian Jansen <djansen at redhat.com>
Date: 2014-07-02 (Wed, 02 Jul 2014)
Changed paths:
M functional-test/src/main/java/org/zanata/page/administration/ManageUserPage.java
M functional-test/src/main/java/org/zanata/util/SampleProjectProfile.java
Log Message:
-----------
Merge pull request #521 from zanata/rhbz1114421
rhbz1114421 - able to test reset password
Commit: 8a853f857180b709e6ae5434506168e8c327aee5
https://github.com/zanata/zanata-server/commit/8a853f857180b709e6ae5434506168e8c327aee5
Author: Damian Jansen <djansen at redhat.com>
Date: 2014-07-02 (Wed, 02 Jul 2014)
Changed paths:
M functional-test/src/test/java/org/zanata/feature/security/SecurityFullTest.java
Log Message:
-----------
Security tests assertj update and add Feature annotation
Also change the Ignore on reset password and improve formatting.
Commit: 783870af1d332a035522407e2a50ac1befed07ed
https://github.com/zanata/zanata-server/commit/783870af1d332a035522407e2a50ac1befed07ed
Author: Damian Jansen <djansen at redhat.com>
Date: 2014-07-02 (Wed, 02 Jul 2014)
Changed paths:
R functional-test/src/test/java/org/zanata/feature/security/SecurityFullTest.java
A functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java
M functional-test/src/test/java/org/zanata/feature/testharness/TestPlan.java
Log Message:
-----------
Rename security test, enable resetPasswordSuccessful
'Full' is misleading.
Remove the ignore from resetPasswordSuccessful, as Huang's
earlier commit has fixed the database cleanup.
Commit: 5c8b7619e78f2ef63aa405e5c24901cb4a6b42c3
https://github.com/zanata/zanata-server/commit/5c8b7619e78f2ef63aa405e5c24901cb4a6b42c3
Author: Patrick Huang <pahuang at redhat.com>
Date: 2014-07-03 (Thu, 03 Jul 2014)
Changed paths:
R functional-test/src/test/java/org/zanata/feature/security/SecurityFullTest.java
A functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java
M functional-test/src/test/java/org/zanata/feature/testharness/TestPlan.java
Log Message:
-----------
Merge pull request #518 from zanata/assertj-security-tests
Assertj security tests
Commit: e9dfd8fb33b13e8a263ce49b6ec0b2edb76c312f
https://github.com/zanata/zanata-server/commit/e9dfd8fb33b13e8a263ce49b6ec0b2edb76c312f
Author: Alex Eng <aeng at redhat.com>
Date: 2014-07-03 (Thu, 03 Jul 2014)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
M zanata-war/src/main/java/org/zanata/async/tasks/CopyVersionTask.java
M zanata-war/src/main/java/org/zanata/service/CopyVersionService.java
M zanata-war/src/main/java/org/zanata/service/impl/CopyDocumentWork.java
M zanata-war/src/main/java/org/zanata/service/impl/CopyVersionServiceImpl.java
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/webapp/WEB-INF/pages.xml
M zanata-war/src/main/webapp/iteration/view.xhtml
M zanata-war/src/test/java/org/zanata/service/impl/CopyVersionServiceImplTest.java
Log Message:
-----------
Copy version UI in version page
Commit: 9f58e970927540ecfe8d15ababb7ce9a030d14d0
https://github.com/zanata/zanata-server/commit/9f58e970927540ecfe8d15ababb7ce9a030d14d0
Author: Alex Eng <aeng at redhat.com>
Date: 2014-07-03 (Thu, 03 Jul 2014)
Changed paths:
M functional-test/pom.xml
M functional-test/src/main/java/org/zanata/page/BasePage.java
M functional-test/src/main/java/org/zanata/page/CorePage.java
M functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.java
M functional-test/src/main/java/org/zanata/page/administration/ManageUserPage.java
M functional-test/src/main/java/org/zanata/page/dashboard/DashboardBasePage.java
M functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java
M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectLanguagesTab.java
M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectPermissionsTab.java
M functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
A functional-test/src/main/java/org/zanata/rest/SampleDataResource.java
A functional-test/src/main/java/org/zanata/rest/SampleDataResourceImpl.java
R functional-test/src/main/java/org/zanata/rest/SampleProjectResource.java
R functional-test/src/main/java/org/zanata/rest/SampleProjectResourceImpl.java
M functional-test/src/main/java/org/zanata/util/SampleProjectProfile.java
M functional-test/src/main/java/org/zanata/workflow/ClientWorkFlow.java
M functional-test/src/test/java/org/zanata/feature/account/InvalidEmailAddressTest.java
M functional-test/src/test/java/org/zanata/feature/clientserver/GettextPluralSupportTest.java
M functional-test/src/test/java/org/zanata/feature/clientserver/ProjectMaintainerTest.java
M functional-test/src/test/java/org/zanata/feature/clientserver/PropertiesRoundTripTest.java
M functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentAccessTest.java
M functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTest.java
M functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
M functional-test/src/test/java/org/zanata/feature/editor/EditorFilterMessagesTest.java
M functional-test/src/test/java/org/zanata/feature/editor/TranslateHTMLTest.java
M functional-test/src/test/java/org/zanata/feature/editor/TranslateIdmlTest.java
M functional-test/src/test/java/org/zanata/feature/editor/TranslateOdsTest.java
M functional-test/src/test/java/org/zanata/feature/editor/TranslateOpenOfficeTest.java
M functional-test/src/test/java/org/zanata/feature/editor/TranslateTextTest.java
M functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java
M functional-test/src/test/java/org/zanata/feature/language/JoinLanguageTeamTest.java
A functional-test/src/test/java/org/zanata/feature/manual/CopyTransTuningTest.java
M functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.java
M functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java
M functional-test/src/test/java/org/zanata/feature/project/CreateProjectTest.java
M functional-test/src/test/java/org/zanata/feature/project/EditPermissionsTest.java
M functional-test/src/test/java/org/zanata/feature/project/EditProjectAboutTest.java
M functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java
M functional-test/src/test/java/org/zanata/feature/project/EditProjectLanguagesTest.java
M functional-test/src/test/java/org/zanata/feature/project/EditProjectValidationsTest.java
M functional-test/src/test/java/org/zanata/feature/projectversion/CreateProjectVersionTest.java
M functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionLanguagesTest.java
M functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionValidationsTest.java
M functional-test/src/test/java/org/zanata/feature/projectversion/VersionFilteringTest.java
M functional-test/src/test/java/org/zanata/feature/search/ProjectSearchTest.java
R functional-test/src/test/java/org/zanata/feature/security/SecurityFullTest.java
A functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java
M functional-test/src/test/java/org/zanata/feature/testharness/TestPlan.java
M functional-test/src/test/java/org/zanata/feature/testharness/ZanataTestCase.java
R functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupFullTest.java
M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupIDValidationTest.java
A functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java
M functional-test/src/test/java/org/zanata/util/AddUsersRule.java
M functional-test/src/test/java/org/zanata/util/CleanDatabaseRule.java
A functional-test/src/test/java/org/zanata/util/EnsureLogoutRule.java
A functional-test/src/test/java/org/zanata/util/SampleDataResourceClient.java
R functional-test/src/test/java/org/zanata/util/SampleProjectClient.java
M functional-test/src/test/java/org/zanata/util/SampleProjectRule.java
M functional-test/src/test/java/org/zanata/util/ZanataRestCaller.java
M pom.xml
M zanata-model/pom.xml
M zanata-war/pom.xml
M zanata-war/src/main/java/org/zanata/action/AccountMergeAction.java
M zanata-war/src/main/java/org/zanata/action/ActivityAction.java
M zanata-war/src/main/java/org/zanata/action/CopyTransAction.java
M zanata-war/src/main/java/org/zanata/action/CopyTransOptionsModel.java
M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
M zanata-war/src/main/java/org/zanata/action/GlossaryAction.java
M zanata-war/src/main/java/org/zanata/action/LanguageJoinUpdateRoleAction.java
M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
M zanata-war/src/main/java/org/zanata/action/ProjectHomeAction.java
M zanata-war/src/main/java/org/zanata/action/VersionGroupHomeAction.java
R zanata-war/src/main/java/org/zanata/annotation/CachedMethodResult.java
R zanata-war/src/main/java/org/zanata/annotation/CachedMethods.java
M zanata-war/src/main/java/org/zanata/async/tasks/CopyTransTask.java
M zanata-war/src/main/java/org/zanata/async/tasks/DocumentCopyTransTask.java
M zanata-war/src/main/java/org/zanata/async/tasks/IterationCopyTransTask.java
A zanata-war/src/main/java/org/zanata/dao/NativeQuery.java
M zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java
M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.java
R zanata-war/src/main/java/org/zanata/seam/interceptor/CachedMethodResultInterceptor.java
M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/CopyTransWork.java
M zanata-war/src/main/java/org/zanata/service/impl/CopyVersionServiceImpl.java
M zanata-war/src/main/java/org/zanata/ui/ActivityEntry.java
R zanata-war/src/main/resources/images/openid/fedora.png
R zanata-war/src/main/resources/images/openid/google.png
R zanata-war/src/main/resources/images/openid/openid.png
R zanata-war/src/main/resources/images/openid/yahoo.png
R zanata-war/src/main/resources/images/z-logo-50px.png
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/resources/messages_en_GB.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
R zanata-war/src/main/webapp/WEB-INF/layout/login_provider.xhtml
M zanata-war/src/main/webapp/WEB-INF/pages.xml
M zanata-war/src/main/webapp/iteration/view.xhtml
M zanata-war/src/main/webapp/profile/merge_account.xhtml
M zanata-war/src/test/java/org/zanata/seam/AutowireTransaction.java
A zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplPerformanceTest.java
M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceUnitTest.java
M zanata-war/src/test/java/org/zanata/service/impl/CopyTransWorkTest.java
Log Message:
-----------
Merge branch 'integration/master' into rhbz1104015
Conflicts:
zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
Compare: https://github.com/zanata/zanata-server/compare/e8353209df5d...9f58e9709275
More information about the zanata-commits
mailing list