[zanata/zanata-server] 32cf21: Fix activation of functional-test profile in zanat...
GitHub
noreply at github.com
Thu Feb 26 01:13:57 UTC 2015
Branch: refs/heads/cdi-prep
Home: https://github.com/zanata/zanata-server
Commit: 32cf21550509986ce63476e44295784d32b17b3e
https://github.com/zanata/zanata-server/commit/32cf21550509986ce63476e44295784d32b17b3e
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-02-05 (Thu, 05 Feb 2015)
Changed paths:
M zanata-test-war/pom.xml
Log Message:
-----------
Fix activation of functional-test profile in zanata-test-war
Commit: 3b2474ef80a36490a5d08136af1c367e1d8d3a86
https://github.com/zanata/zanata-server/commit/3b2474ef80a36490a5d08136af1c367e1d8d3a86
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-02-05 (Thu, 05 Feb 2015)
Changed paths:
M zanata-test-war/pom.xml
Log Message:
-----------
Merge pull request #684 from zanata/functional-test-fixes
Fix activation of functional-test profile in zanata-test-war
Commit: 1308b9da6f1ff267c4ea09fa20540dbe47f482de
https://github.com/zanata/zanata-server/commit/1308b9da6f1ff267c4ea09fa20540dbe47f482de
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-02-05 (Thu, 05 Feb 2015)
Changed paths:
M zanata-test-war/pom.xml
Log Message:
-----------
Merge remote-tracking branch 'origin/release' into integration/master
Commit: f374e740fe602175e5557460527271ed54b2fc3e
https://github.com/zanata/zanata-server/commit/f374e740fe602175e5557460527271ed54b2fc3e
Author: Alex Eng <aeng at redhat.com>
Date: 2015-02-06 (Fri, 06 Feb 2015)
Changed paths:
M functional-test/src/test/java/org/zanata/feature/rest/CopyTransTest.java
M functional-test/src/test/java/org/zanata/util/ZanataRestCaller.java
M pom.xml
M zanata-war/src/main/java/org/zanata/action/ProjectIterationZipFileAction.java
M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
M zanata-war/src/main/java/org/zanata/file/TranslationDocumentUpload.java
M zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java
M zanata-war/src/main/java/org/zanata/rest/service/FileService.java
M zanata-war/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
M zanata-war/src/main/java/org/zanata/service/TranslationService.java
M zanata-war/src/main/java/org/zanata/service/impl/CopyVersionServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
M zanata-war/src/main/java/org/zanata/servlet/FileUploadServlet.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/FileUploadDialog.java
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/webapp/WEB-INF/layout/version/documents-tab.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/version/languages-tab.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml
A zanata-war/src/main/webapp/WEB-INF/layout/version/upload_translation_modal.xhtml
A zanata-war/src/main/webapp/WEB-INF/layout/version/zip_download_progress_modal.xhtml
M zanata-war/src/main/webapp/iteration/view.xhtml
M zanata-war/src/main/webapp/resources/zanata/multi-file-upload.xhtml
M zanata-war/src/test/java/org/zanata/file/TranslationDocumentUploadTest.java
M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsCompatibilityITCase.java
M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsRawCompatibilityITCase.java
M zanata-war/src/test/java/org/zanata/rest/service/FileServiceTest.java
M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
M zanata-war/src/test/java/org/zanata/rest/service/TranslationsResourceTestObjectFactory.java
M zanata-war/src/test/java/org/zanata/service/impl/TranslationServiceImplJpaTest.java
Log Message:
-----------
Implement myTrans options when upload translation
https://bugzilla.redhat.com/show_bug.cgi?id=1184299
Squashed commit of the following:
commit 573fc4182e8113a9d98923fe0b64d7e1ad8697f3
Author: Alex Eng <aeng at redhat.com>
Date: Fri Feb 6 07:12:00 2015 +1000
Fix unit test
commit 31a614edb0eda39858bf3094592b26c8c994adc1
Author: Alex Eng <aeng at redhat.com>
Date: Thu Feb 5 15:17:04 2015 +1000
Update zanata-api version to 3.7.0-SNAPSHOT
commit 5e6d63127c3dea1ef379c72dba88ca664783a61c
Author: Alex Eng <aeng at redhat.com>
Date: Thu Feb 5 14:07:42 2015 +1000
Fix test for pushing translations
commit 15bdc2efbdc65a9e06e54fdd5f6bae72f99e81b4
Merge: ebd1d43 b4b3c38
Author: Alex Eng <aeng at redhat.com>
Date: Thu Feb 5 11:30:43 2015 +1000
Merge branch 'integration/master' into rhbz1184299
Conflicts:
zanata-war/src/main/webapp/WEB-INF/layout/language/language_view.xhtml
commit ebd1d43ede7ca44611c1110cc31c6f1d801c233d
Author: Alex Eng <aeng at redhat.com>
Date: Mon Feb 2 12:55:41 2015 +1000
Fix unit test
commit dffc9aefc4f0aae823effb76e2ac15ed19f1fb41
Merge: 5abeaad cc96b2f
Author: Alex Eng <aeng at redhat.com>
Date: Fri Jan 30 12:12:20 2015 +1000
Merge branch 'integration/master' into rhbz1184299
commit 5abeaad65f116fccb19423a7a6eeb1df9f6eeaaa
Author: Alex Eng <aeng at redhat.com>
Date: Wed Jan 28 15:56:13 2015 +1000
Implement myTrans options when upload translation
https://bugzilla.redhat.com/show_bug.cgi?id=1184299
Commit: 2f8549ec2c7365f9911b97a11370251a5e81a93f
https://github.com/zanata/zanata-server/commit/2f8549ec2c7365f9911b97a11370251a5e81a93f
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-02-11 (Wed, 11 Feb 2015)
Changed paths:
M pom.xml
Log Message:
-----------
Cache downloaded wildfly modules to ~/Downloads
Commit: 062565c69a67bdfba201613c3a47a41a012a0edf
https://github.com/zanata/zanata-server/commit/062565c69a67bdfba201613c3a47a41a012a0edf
Author: Alex Eng <aeng at redhat.com>
Date: 2015-02-12 (Thu, 12 Feb 2015)
Changed paths:
M functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.java
M functional-test/src/main/java/org/zanata/page/administration/AdministrationPage.java
R functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
R functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
M functional-test/src/main/java/org/zanata/page/languages/LanguagePage.java
M functional-test/src/main/java/org/zanata/page/languages/LanguagesPage.java
M functional-test/src/main/java/org/zanata/workflow/LanguageWorkFlow.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
M zanata-model/src/main/java/org/zanata/model/HLocale.java
M zanata-war/pom.xml
A zanata-war/src/main/java/org/zanata/action/LanguageAction.java
M zanata-war/src/main/java/org/zanata/action/LanguageManagerAction.java
R zanata-war/src/main/java/org/zanata/action/LanguageSearchAction.java
R zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
A zanata-war/src/main/java/org/zanata/action/LanguagesAction.java
M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
A zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
M zanata-war/src/main/resources/db/db.changelog.xml
M zanata-war/src/main/resources/messages.properties
R zanata-war/src/main/webapp/WEB-INF/layout/language/contact_coodinator_modal.xhtml
A zanata-war/src/main/webapp/WEB-INF/layout/language/contact_coordinator_modal.xhtml
R zanata-war/src/main/webapp/WEB-INF/layout/language/language_list.xhtml
R zanata-war/src/main/webapp/WEB-INF/layout/language/language_view.xhtml
A zanata-war/src/main/webapp/WEB-INF/layout/language/members-tab.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/language/new_language_modal.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/language/search_user_modal.xhtml
A zanata-war/src/main/webapp/WEB-INF/layout/language/settings-tab.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/version/languages-tab.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/version/zip_download_progress_modal.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/admin/home.xhtml
R zanata-war/src/main/webapp/admin/language.xhtml
R zanata-war/src/main/webapp/admin/languagemanager.xhtml
M zanata-war/src/main/webapp/language/home.xhtml
M zanata-war/src/main/webapp/language/language.xhtml
M zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsJpaTest.java
M zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsTest.java
Log Message:
-----------
Implement override plural forms:
https://bugzilla.redhat.com/show_bug.cgi?id=1184708
Squashed commit of the following:
commit 863b2bb5727cd993cbb9982e0a2267c285b40369
Author: Alex Eng <aeng at redhat.com>
Date: Fri Feb 6 14:39:25 2015 +1000
Implement override plural forms: https://bugzilla.redhat.com/show_bug.cgi?id=1184708
commit f147b27487715611901dc45aa45417fc31712919
Merge: d42e58f f374e74
Author: Alex Eng <aeng at redhat.com>
Date: Fri Feb 6 11:10:57 2015 +1000
Merge branch 'integration/master' into rhbz1184708
commit d42e58ff84ac3e5b24531c274f58c8694a71125d
Author: Alex Eng <aeng at redhat.com>
Date: Thu Feb 5 09:53:45 2015 +1000
Implement override plural forms:
https://bugzilla.redhat.com/show_bug.cgi?id=1184708
Commit: c695cdb8a1f0c92ee83cc0f67dfddcb691982f8c
https://github.com/zanata/zanata-server/commit/c695cdb8a1f0c92ee83cc0f67dfddcb691982f8c
Author: Alex Eng <aeng at redhat.com>
Date: 2015-02-12 (Thu, 12 Feb 2015)
Changed paths:
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/webapp/account/activate.xhtml
M zanata-war/src/main/webapp/account/inactive_account.xhtml
M zanata-war/src/main/webapp/account/password_reset.xhtml
M zanata-war/src/main/webapp/account/password_reset_request.xhtml
M zanata-war/src/main/webapp/account/validate_email.xhtml
Log Message:
-----------
Update inactive account, password reset page. Remove captcha from password reset page.
https://bugzilla.redhat.com/show_bug.cgi?id=1191321
Squashed commit of the following:
commit 94837356020e34784e0ed8e67b89daa3709a5aa1
Author: Alex Eng <aeng at redhat.com>
Date: Tue Feb 10 16:08:18 2015 +1000
Update inactive account, password reset page. Remove captcha from password reset page.
https://bugzilla.redhat.com/show_bug.cgi?id=1191321
Commit: 51fd4b3e3c756b831026f9e01682edebd9fd40b1
https://github.com/zanata/zanata-server/commit/51fd4b3e3c756b831026f9e01682edebd9fd40b1
Author: Alex Eng <aeng at redhat.com>
Date: 2015-02-13 (Fri, 13 Feb 2015)
Changed paths:
M zanata-war/src/main/webapp/resources/zanata/list-filter.xhtml
Log Message:
-----------
disable rendering in filter list if empty string
https://bugzilla.redhat.com/show_bug.cgi?id=1190557
Squashed commit of the following:
commit a1c6547965cacd3f1cac600524486f007d689e7e
Author: Alex Eng <aeng at redhat.com>
Date: Wed Feb 11 13:43:00 2015 +1000
disable rendering in filter list if empty string: https://bugzilla.redhat.com/show_bug.cgi?id=1190557
Commit: a828049979c44bab4d0415ac8784afacf35f04b7
https://github.com/zanata/zanata-server/commit/a828049979c44bab4d0415ac8784afacf35f04b7
Author: Alex Eng <aeng at redhat.com>
Date: 2015-02-13 (Fri, 13 Feb 2015)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/InactiveAccountAction.java
M zanata-war/src/main/java/org/zanata/dao/AccountActivationKeyDAO.java
M zanata-war/src/main/java/org/zanata/security/ZanataOpenId.java
Log Message:
-----------
Fix inactive account redirection with openid account
https://bugzilla.redhat.com/show_bug.cgi?id=1191827
Squashed commit of the following:
commit 0ddec629799a6bacc9c24c67d545a841dcd2e0ff
Author: Alex Eng <aeng at redhat.com>
Date: Thu Feb 12 12:20:07 2015 +1000
Fix inactive account redirection with openid account
Commit: e099e57f0a0887010a0b85cdfc39d87098e31127
https://github.com/zanata/zanata-server/commit/e099e57f0a0887010a0b85cdfc39d87098e31127
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-02-13 (Fri, 13 Feb 2015)
Changed paths:
M zanata-war/src/main/java/org/zanata/ZanataInit.java
Log Message:
-----------
Warn if EAP version < 6.3.3
Commit: 542f564e9e099b225f4be17c3b7bbb3888af234e
https://github.com/zanata/zanata-server/commit/542f564e9e099b225f4be17c3b7bbb3888af234e
Author: Alex Eng <aeng at redhat.com>
Date: 2015-02-18 (Wed, 18 Feb 2015)
Changed paths:
M zanata-war/src/main/webapp/iteration/view.xhtml
M zanata-war/src/main/webapp/version-group/version_group.xhtml
Log Message:
-----------
Fix bookmarked url not working
https://bugzilla.redhat.com/show_bug.cgi?id=1193699
Squashed commit of the following:
commit d7bd79450d4006581782019a05791441744269b0
Author: Alex Eng <aeng at redhat.com>
Date: Wed Feb 18 08:32:37 2015 +1000
Fix bookmarked url not working - https://bugzilla.redhat.com/show_bug.cgi?id=1193699
Commit: c32305a3d01e90a05be88909e4d7e45cbbc7119b
https://github.com/zanata/zanata-server/commit/c32305a3d01e90a05be88909e4d7e45cbbc7119b
Author: Alex Eng <aeng at redhat.com>
Date: 2015-02-18 (Wed, 18 Feb 2015)
Changed paths:
M zanata-war/src/main/webapp/iteration/view.xhtml
M zanata-war/src/main/webapp/version-group/version_group.xhtml
Log Message:
-----------
Merge branch 'release' into integration/master
Commit: 4a2019594da3cb16180ddf59a8a304137000028d
https://github.com/zanata/zanata-server/commit/4a2019594da3cb16180ddf59a8a304137000028d
Author: Alex Eng <aeng at redhat.com>
Date: 2015-02-18 (Wed, 18 Feb 2015)
Changed paths:
M zanata-war/src/main/java/org/zanata/events/DocumentStatisticUpdatedEvent.java
M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationUpdatedManager.java
M zanata-war/src/main/java/org/zanata/ui/model/statistic/AbstractStatistic.java
M zanata-war/src/main/java/org/zanata/ui/model/statistic/WordStatistic.java
M zanata-war/src/test/java/org/zanata/service/impl/DocumentServiceImplTest.java
Log Message:
-----------
Clear document statistic cache when uploading from client
https://bugzilla.redhat.com/show_bug.cgi?id=1192271
Squashed commit of the following:
commit f0c7fe931e77074103371e59cdea0c8806650ddb
Author: Alex Eng <aeng at redhat.com>
Date: Mon Feb 16 16:22:13 2015 +1000
clear document statistic cache when uploading from client: https://bugzilla.redhat.com/show_bug.cgi?id=1192271
Commit: 17c6646608c6920fab8964b22e3ce654617f79b7
https://github.com/zanata/zanata-server/commit/17c6646608c6920fab8964b22e3ce654617f79b7
Author: Alex Eng <aeng at redhat.com>
Date: 2015-02-18 (Wed, 18 Feb 2015)
Changed paths:
M zanata-war/src/main/java/org/zanata/events/DocumentStatisticUpdatedEvent.java
M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationUpdatedManager.java
M zanata-war/src/main/java/org/zanata/ui/model/statistic/AbstractStatistic.java
M zanata-war/src/main/java/org/zanata/ui/model/statistic/WordStatistic.java
M zanata-war/src/test/java/org/zanata/service/impl/DocumentServiceImplTest.java
Log Message:
-----------
Merge branch 'release' into integration/master
Commit: 81054b713c3d9b1e1962915188c8d40c6513c0b5
https://github.com/zanata/zanata-server/commit/81054b713c3d9b1e1962915188c8d40c6513c0b5
Author: Alex Eng <aeng at redhat.com>
Date: 2015-02-20 (Fri, 20 Feb 2015)
Changed paths:
M zanata-model/src/main/java/org/zanata/model/HLocale.java
M zanata-war/src/main/java/org/zanata/action/LanguageAction.java
M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
M zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/webapp/WEB-INF/layout/language/settings-tab.xhtml
M zanata-war/src/main/webapp/language/language.xhtml
M zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsTest.java
Log Message:
-----------
Implement customise language display name
https://bugzilla.redhat.com/show_bug.cgi?id=1169662
Squashed commit of the following:
commit 8a72ed3dfddee2a89cabe62a02df1cfd4f8862bb
Author: Alex Eng <aeng at redhat.com>
Date: Thu Feb 12 19:24:09 2015 +1000
Implement customise language display name
https://bugzilla.redhat.com/show_bug.cgi?id=1169662
Commit: b319ce824c4fd49ce86b2814f17977b2bb16eae8
https://github.com/zanata/zanata-server/commit/b319ce824c4fd49ce86b2814f17977b2bb16eae8
Author: Alex Eng <aeng at redhat.com>
Date: 2015-02-20 (Fri, 20 Feb 2015)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/InactiveAccountAction.java
M zanata-war/src/main/java/org/zanata/action/PasswordResetAction.java
M zanata-war/src/main/java/org/zanata/action/PasswordResetRequestAction.java
M zanata-war/src/main/java/org/zanata/service/impl/UserAccountServiceImpl.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/account/inactive_account.xhtml
M zanata-war/src/main/webapp/account/password_reset.xhtml
M zanata-war/src/main/webapp/account/password_reset_request.xhtml
Log Message:
-----------
Fix global messages in password reset page
https://bugzilla.redhat.com/show_bug.cgi?id=1191779
Squashed commit of the following:
commit 5aa8e22358bb84498dc566faeb43635d5bdf3212
Merge: 9be6611 a828049
Author: Alex Eng <aeng at redhat.com>
Date: Tue Feb 17 14:54:32 2015 +1000
Merge branch 'integration/master' into rhbz1191779
Conflicts:
zanata-war/src/main/java/org/zanata/action/InactiveAccountAction.java
commit 9be6611801a09407879af1b8bf8eed2b466814d4
Author: Alex Eng <aeng at redhat.com>
Date: Thu Feb 12 13:59:17 2015 +1000
Fix global messages in password reset page: https://bugzilla.redhat.com/show_bug.cgi?id=1191779
Commit: b07873274d76165b9cd4d4358d1c27a0d87fc842
https://github.com/zanata/zanata-server/commit/b07873274d76165b9cd4d4358d1c27a0d87fc842
Author: Alex Eng <aeng at redhat.com>
Date: 2015-02-20 (Fri, 20 Feb 2015)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/UserSettingsAction.java
M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml
Log Message:
-----------
Fix generate api issue
https://bugzilla.redhat.com/show_bug.cgi?id=119359
Squashed commit of the following:
commit 1835b479069daf30dc68f8eb1085e9bce1a39be7
Author: Alex Eng <aeng at redhat.com>
Date: Fri Feb 20 10:39:10 2015 +1000
Fix generate api issue: https://bugzilla.redhat.com/show_bug.cgi?id=1193597
Commit: d22d4432651da7bad8139ee736edaa7f045fb2d2
https://github.com/zanata/zanata-server/commit/d22d4432651da7bad8139ee736edaa7f045fb2d2
Author: Alex Eng <aeng at redhat.com>
Date: 2015-02-20 (Fri, 20 Feb 2015)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/UserSettingsAction.java
M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml
Log Message:
-----------
Merge branch 'release' into integration/master
Commit: a3e7763531fe17385d562d6a5ec3a066b5917748
https://github.com/zanata/zanata-server/commit/a3e7763531fe17385d562d6a5ec3a066b5917748
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-02-23 (Mon, 23 Feb 2015)
Changed paths:
M functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java
Log Message:
-----------
Update expected error message
Commit: 79fbac57284db84fa4caa6fd8b83da3145766afa
https://github.com/zanata/zanata-server/commit/79fbac57284db84fa4caa6fd8b83da3145766afa
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-02-24 (Tue, 24 Feb 2015)
Changed paths:
M functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java
Log Message:
-----------
Merge pull request #699 from zanata/fix-broken-password-tests
Fix validation messages for password reset
Commit: 59a0b5f347cb8bb52531fb9ecc909221e81cecd8
https://github.com/zanata/zanata-server/commit/59a0b5f347cb8bb52531fb9ecc909221e81cecd8
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date: 2015-02-24 (Tue, 24 Feb 2015)
Changed paths:
M pom.xml
Log Message:
-----------
pom.xml: zanata-api version to 3.6.0
Commit: 79dff1996867f15ca58365c311a5770096b02ba7
https://github.com/zanata/zanata-server/commit/79dff1996867f15ca58365c311a5770096b02ba7
Author: Damian Jansen <djansen at redhat.com>
Date: 2015-02-24 (Tue, 24 Feb 2015)
Changed paths:
M functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java
Log Message:
-----------
Fix security functional test error
Commit: 848ec39ca8bdeb81b587d8563e1e52a683e0bba2
https://github.com/zanata/zanata-server/commit/848ec39ca8bdeb81b587d8563e1e52a683e0bba2
Author: Damian Jansen <djansen at redhat.com>
Date: 2015-02-24 (Tue, 24 Feb 2015)
Changed paths:
M functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java
Log Message:
-----------
Merge pull request #701 from zanata/fix-invalidresetpassword-test
Fix security functional test error
Commit: 8deed904a4d9e7a99b89c9d2656b9c024d4500f0
https://github.com/zanata/zanata-server/commit/8deed904a4d9e7a99b89c9d2656b9c024d4500f0
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-02-24 (Tue, 24 Feb 2015)
Changed paths:
M pom.xml
Log Message:
-----------
Update parent version
Commit: 3b0d55a8d4113479be77d0e9c667e9c4ef017066
https://github.com/zanata/zanata-server/commit/3b0d55a8d4113479be77d0e9c667e9c4ef017066
Author: Alex Eng <aeng at redhat.com>
Date: 2015-02-24 (Tue, 24 Feb 2015)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/PasswordResetRequestAction.java
M zanata-war/src/main/java/org/zanata/dao/AccountResetPasswordKeyDAO.java
M zanata-war/src/main/java/org/zanata/service/impl/UserAccountServiceImpl.java
Log Message:
-----------
Fix password reset with null pointer exception
Squashed commit of the following:
commit 4d6467768326f236379b302a80567bc5f93de6dc
Author: Alex Eng <aeng at redhat.com>
Date: Tue Feb 24 10:38:19 2015 +1000
Fix password reset with null pointer exception
Commit: f57207b299ec138bee32388da8da5197d657f7fd
https://github.com/zanata/zanata-server/commit/f57207b299ec138bee32388da8da5197d657f7fd
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date: 2015-02-24 (Tue, 24 Feb 2015)
Changed paths:
M pom.xml
Log Message:
-----------
Revert "pom.xml: zanata-api version to 3.6.0"
This reverts commit 59a0b5f347cb8bb52531fb9ecc909221e81cecd8.
Commit: e7f33a20ba63c1f88e9ef0b2775a65c9b6d00d67
https://github.com/zanata/zanata-server/commit/e7f33a20ba63c1f88e9ef0b2775a65c9b6d00d67
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date: 2015-02-24 (Tue, 24 Feb 2015)
Changed paths:
M pom.xml
Log Message:
-----------
Fix pom.xml
Commit: b95cca564b085bb7d5ec99a725bbdbbbd008f49f
https://github.com/zanata/zanata-server/commit/b95cca564b085bb7d5ec99a725bbdbbbd008f49f
Author: Alex Eng <aeng at redhat.com>
Date: 2015-02-24 (Tue, 24 Feb 2015)
Changed paths:
M pom.xml
M zanata-war/src/main/java/org/zanata/action/UserSettingsAction.java
M zanata-war/src/main/java/org/zanata/events/DocumentStatisticUpdatedEvent.java
M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationUpdatedManager.java
M zanata-war/src/main/java/org/zanata/ui/model/statistic/AbstractStatistic.java
M zanata-war/src/main/java/org/zanata/ui/model/statistic/WordStatistic.java
M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml
M zanata-war/src/main/webapp/iteration/view.xhtml
M zanata-war/src/main/webapp/version-group/version_group.xhtml
M zanata-war/src/test/java/org/zanata/service/impl/DocumentServiceImplTest.java
Log Message:
-----------
Merge branch 'release' into cache-downloads
Commit: b23fc52284e9bf7db48975bc535ff850e4b903b6
https://github.com/zanata/zanata-server/commit/b23fc52284e9bf7db48975bc535ff850e4b903b6
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-02-24 (Tue, 24 Feb 2015)
Changed paths:
M zanata-war/src/main/java/org/zanata/ZanataInit.java
Log Message:
-----------
Merge pull request #693 from zanata/eap633
Warn if EAP version < 6.3.3
Commit: 8dc5e95a27b63ede8b0da707e26a10fe1b90d873
https://github.com/zanata/zanata-server/commit/8dc5e95a27b63ede8b0da707e26a10fe1b90d873
Author: Alex Eng <aeng at redhat.com>
Date: 2015-02-24 (Tue, 24 Feb 2015)
Changed paths:
M pom.xml
Log Message:
-----------
Merge pull request #686 from zanata/cache-downloads
Cache downloaded wildfly modules to ~/Downloads
Commit: 009a0ddec84ebfea66fe9b494eaed84f96029310
https://github.com/zanata/zanata-server/commit/009a0ddec84ebfea66fe9b494eaed84f96029310
Author: Alex Eng <aeng at redhat.com>
Date: 2015-02-24 (Tue, 24 Feb 2015)
Changed paths:
M pom.xml
M zanata-war/src/main/java/org/zanata/ZanataInit.java
Log Message:
-----------
Merge branch 'release' into integration/master
Conflicts:
pom.xml
Commit: d3660bbdccaa682a51e257fee4f5a71c389c069a
https://github.com/zanata/zanata-server/commit/d3660bbdccaa682a51e257fee4f5a71c389c069a
Author: Alex Eng <aeng at redhat.com>
Date: 2015-02-24 (Tue, 24 Feb 2015)
Changed paths:
M functional-test/src/main/java/org/zanata/page/CorePage.java
M functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java
M zanata-test-war/src/main/java/org/zanata/rest/SampleDataResourceImpl.java
M zanata-test-war/src/main/java/org/zanata/util/SampleProjectProfile.java
Log Message:
-----------
Fix failed functional test
Commit: 7b339d81fe6393fe3c87ea2977fbf784d65c90e6
https://github.com/zanata/zanata-server/commit/7b339d81fe6393fe3c87ea2977fbf784d65c90e6
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-02-24 (Tue, 24 Feb 2015)
Changed paths:
M functional-test/src/main/java/org/zanata/page/AbstractPage.java
M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionDocumentsTab.java
A functional-test/src/main/java/org/zanata/page/utility/NamedPredicate.java
M functional-test/src/test/java/org/zanata/feature/document/MultiFileUploadTest.java
Log Message:
-----------
Fix MultiFileUploadTest.removeFileFromUploadList
Commit: de4737af69432f0d4ba8aff846510eafed749f5d
https://github.com/zanata/zanata-server/commit/de4737af69432f0d4ba8aff846510eafed749f5d
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-02-24 (Tue, 24 Feb 2015)
Changed paths:
M functional-test/src/main/java/org/zanata/page/AbstractPage.java
M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionDocumentsTab.java
A functional-test/src/main/java/org/zanata/page/utility/NamedPredicate.java
M functional-test/src/test/java/org/zanata/feature/document/MultiFileUploadTest.java
Log Message:
-----------
Merge branch 'fix-MultiFileUploadTest' into fix-functional-test
Commit: ee0c8ecd3cc2eae120340f74b17da71238790161
https://github.com/zanata/zanata-server/commit/ee0c8ecd3cc2eae120340f74b17da71238790161
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-02-25 (Wed, 25 Feb 2015)
Changed paths:
M functional-test/src/main/java/org/zanata/page/AbstractPage.java
M functional-test/src/main/java/org/zanata/page/CorePage.java
M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionDocumentsTab.java
A functional-test/src/main/java/org/zanata/page/utility/NamedPredicate.java
M functional-test/src/test/java/org/zanata/feature/document/MultiFileUploadTest.java
M functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java
M zanata-test-war/src/main/java/org/zanata/rest/SampleDataResourceImpl.java
M zanata-test-war/src/main/java/org/zanata/util/SampleProjectProfile.java
Log Message:
-----------
Merge pull request #702 from zanata/fix-functional-test
Fix failed functional test
Commit: 69eb5776d9ca18e1391f7905be5e345d693d8d85
https://github.com/zanata/zanata-server/commit/69eb5776d9ca18e1391f7905be5e345d693d8d85
Author: Alex Eng <aeng at redhat.com>
Date: 2015-02-26 (Thu, 26 Feb 2015)
Changed paths:
M functional-test/src/main/java/org/zanata/page/AbstractPage.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/AdministrationPage.java
R functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
R functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
M functional-test/src/main/java/org/zanata/page/languages/LanguagePage.java
M functional-test/src/main/java/org/zanata/page/languages/LanguagesPage.java
M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionDocumentsTab.java
A functional-test/src/main/java/org/zanata/page/utility/NamedPredicate.java
M functional-test/src/main/java/org/zanata/workflow/LanguageWorkFlow.java
M functional-test/src/test/java/org/zanata/feature/document/MultiFileUploadTest.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
M functional-test/src/test/java/org/zanata/feature/rest/CopyTransTest.java
M functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java
M functional-test/src/test/java/org/zanata/util/ZanataRestCaller.java
M pom.xml
M zanata-model/src/main/java/org/zanata/model/HLocale.java
M zanata-test-war/pom.xml
M zanata-test-war/src/main/java/org/zanata/rest/SampleDataResourceImpl.java
M zanata-test-war/src/main/java/org/zanata/util/SampleProjectProfile.java
M zanata-war/pom.xml
M zanata-war/src/main/java/org/zanata/ZanataInit.java
M zanata-war/src/main/java/org/zanata/action/InactiveAccountAction.java
A zanata-war/src/main/java/org/zanata/action/LanguageAction.java
M zanata-war/src/main/java/org/zanata/action/LanguageManagerAction.java
R zanata-war/src/main/java/org/zanata/action/LanguageSearchAction.java
R zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
A zanata-war/src/main/java/org/zanata/action/LanguagesAction.java
M zanata-war/src/main/java/org/zanata/action/PasswordResetAction.java
M zanata-war/src/main/java/org/zanata/action/PasswordResetRequestAction.java
M zanata-war/src/main/java/org/zanata/action/ProjectIterationZipFileAction.java
M zanata-war/src/main/java/org/zanata/action/TranslationMemoryHome.java
M zanata-war/src/main/java/org/zanata/action/UserSettingsAction.java
M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
M zanata-war/src/main/java/org/zanata/dao/AccountActivationKeyDAO.java
M zanata-war/src/main/java/org/zanata/dao/AccountResetPasswordKeyDAO.java
M zanata-war/src/main/java/org/zanata/events/DocumentStatisticUpdatedEvent.java
R zanata-war/src/main/java/org/zanata/events/LanguageDisabled.java
R zanata-war/src/main/java/org/zanata/events/LanguageEnabled.java
M zanata-war/src/main/java/org/zanata/file/TranslationDocumentUpload.java
M zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java
M zanata-war/src/main/java/org/zanata/rest/service/FileService.java
M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
M zanata-war/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
M zanata-war/src/main/java/org/zanata/security/ZanataOpenId.java
M zanata-war/src/main/java/org/zanata/service/TranslationService.java
M zanata-war/src/main/java/org/zanata/service/impl/CopyVersionServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationUpdatedManager.java
M zanata-war/src/main/java/org/zanata/service/impl/UserAccountServiceImpl.java
M zanata-war/src/main/java/org/zanata/servlet/FileUploadServlet.java
M zanata-war/src/main/java/org/zanata/ui/model/statistic/AbstractStatistic.java
M zanata-war/src/main/java/org/zanata/ui/model/statistic/WordStatistic.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/FileUploadDialog.java
A zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.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/WEB-INF/layout/dashboard/settings.xhtml
R zanata-war/src/main/webapp/WEB-INF/layout/language/contact_coodinator_modal.xhtml
A zanata-war/src/main/webapp/WEB-INF/layout/language/contact_coordinator_modal.xhtml
R zanata-war/src/main/webapp/WEB-INF/layout/language/language_list.xhtml
R zanata-war/src/main/webapp/WEB-INF/layout/language/language_view.xhtml
A zanata-war/src/main/webapp/WEB-INF/layout/language/members-tab.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/language/new_language_modal.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/language/search_user_modal.xhtml
A zanata-war/src/main/webapp/WEB-INF/layout/language/settings-tab.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/version/documents-tab.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/version/languages-tab.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml
A zanata-war/src/main/webapp/WEB-INF/layout/version/upload_translation_modal.xhtml
A zanata-war/src/main/webapp/WEB-INF/layout/version/zip_download_progress_modal.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/account/activate.xhtml
M zanata-war/src/main/webapp/account/inactive_account.xhtml
M zanata-war/src/main/webapp/account/password_reset.xhtml
M zanata-war/src/main/webapp/account/password_reset_request.xhtml
M zanata-war/src/main/webapp/account/validate_email.xhtml
M zanata-war/src/main/webapp/admin/home.xhtml
R zanata-war/src/main/webapp/admin/language.xhtml
R zanata-war/src/main/webapp/admin/languagemanager.xhtml
M zanata-war/src/main/webapp/iteration/view.xhtml
M zanata-war/src/main/webapp/language/home.xhtml
M zanata-war/src/main/webapp/language/language.xhtml
M zanata-war/src/main/webapp/resources/zanata/list-filter.xhtml
M zanata-war/src/main/webapp/resources/zanata/multi-file-upload.xhtml
M zanata-war/src/main/webapp/version-group/version_group.xhtml
M zanata-war/src/test/java/org/zanata/file/TranslationDocumentUploadTest.java
M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsCompatibilityITCase.java
M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsRawCompatibilityITCase.java
M zanata-war/src/test/java/org/zanata/rest/service/FileServiceTest.java
M zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsJpaTest.java
M zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsTest.java
M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
M zanata-war/src/test/java/org/zanata/rest/service/TranslationsResourceTestObjectFactory.java
M zanata-war/src/test/java/org/zanata/service/impl/DocumentServiceImplTest.java
M zanata-war/src/test/java/org/zanata/service/impl/TranslationServiceImplJpaTest.java
Log Message:
-----------
Merge branch 'master' into cdi-prep
Conflicts:
zanata-war/pom.xml
zanata-war/src/main/java/org/zanata/action/InactiveAccountAction.java
zanata-war/src/main/java/org/zanata/action/LanguageAction.java
zanata-war/src/main/java/org/zanata/action/LanguagesAction.java
zanata-war/src/main/java/org/zanata/action/PasswordResetAction.java
zanata-war/src/main/java/org/zanata/action/PasswordResetRequestAction.java
Compare: https://github.com/zanata/zanata-server/compare/bfcfd5438fd9...69eb5776d9ca
More information about the zanata-commits
mailing list