[zanata-commits] [zanata/zanata] 274007: Merge branch 'rhbz749439'
noreply at github.com
noreply at github.com
Fri Nov 25 05:56:59 UTC 2011
Branch: refs/heads/rhbz749439
Home: https://github.com/zanata/zanata
Commit: 274007456b4668bcd9280167b6c61e293f7013ec
https://github.com/zanata/zanata/commit/274007456b4668bcd9280167b6c61e293f7013ec
Author: Carlos Munoz <chavo16 at hotmail.com>
Date: 2011-11-08 (Tue, 08 Nov 2011)
Changed paths:
M client/pom.xml
R client/zanata-adapter-po/pom.xml
R client/zanata-adapter-po/src/main/java/org/zanata/adapter/po/PoReader2.java
R client/zanata-adapter-po/src/main/java/org/zanata/adapter/po/PoWriter2.java
R client/zanata-adapter-po/src/test/java/org/zanata/adapter/po/PoReader2Test.java
R client/zanata-adapter-po/src/test/resources/ja-JP/RPM.po
R client/zanata-adapter-po/src/test/resources/pot/RPM.pot
M common/pom.xml
A common/zanata-adapter-po/pom.xml
A common/zanata-adapter-po/src/main/java/org/zanata/adapter/po/PoReader2.java
A common/zanata-adapter-po/src/main/java/org/zanata/adapter/po/PoWriter2.java
A common/zanata-adapter-po/src/test/java/org/zanata/adapter/po/PoReader2Test.java
A common/zanata-adapter-po/src/test/resources/ja-JP/RPM.po
A common/zanata-adapter-po/src/test/resources/pot/RPM.pot
A common/zanata-common-api/src/main/java/org/zanata/rest/service/FileResource.java
M server/zanata-war/pom.xml
M server/zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
A server/zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
A server/zanata-war/src/main/java/org/zanata/action/ProjectIterationZipFileAction.java
M server/zanata-war/src/main/java/org/zanata/action/ProjectMaintainerManageAction.java
M server/zanata-war/src/main/java/org/zanata/action/SlugHome.java
M server/zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java
M server/zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.java
A server/zanata-war/src/main/java/org/zanata/job/DownloadFileCleanupJob.java
A server/zanata-war/src/main/java/org/zanata/job/ZanataJobScheduler.java
A server/zanata-war/src/main/java/org/zanata/job/ZanataSchedulableJob.java
A server/zanata-war/src/main/java/org/zanata/process/BackgroundProcess.java
A server/zanata-war/src/main/java/org/zanata/process/IterationZipFileBuildProcess.java
A server/zanata-war/src/main/java/org/zanata/process/IterationZipFileBuildProcessHandle.java
A server/zanata-war/src/main/java/org/zanata/process/ProcessHandle.java
A server/zanata-war/src/main/java/org/zanata/rest/service/FileService.java
M server/zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
M server/zanata-war/src/main/java/org/zanata/rest/service/TranslationResourcesService.java
A server/zanata-war/src/main/java/org/zanata/security/BaseSecurityChecker.java
A server/zanata-war/src/main/java/org/zanata/security/SecurityChecker.java
A server/zanata-war/src/main/java/org/zanata/service/FileSystemService.java
A server/zanata-war/src/main/java/org/zanata/service/impl/FileSystemServiceImpl.java
M server/zanata-war/src/main/resources/messages.properties
M server/zanata-war/src/main/resources/security.drl
M server/zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml
M server/zanata-war/src/main/webapp/WEB-INF/layout/iteration_view_inline.xhtml
M server/zanata-war/src/main/webapp/WEB-INF/pages.xml
M server/zanata-war/src/main/webapp/language/language.xhtml
M server/zanata-war/src/main/webapp/project/assign_maintainer.xhtml
M server/zanata-war/src/main/webapp/project/home.xhtml
A server/zanata-war/src/main/webapp/project/iteration_files.xhtml
M server/zanata-war/src/main/webapp/project/maintainerdetail.xhtml
M server/zanata-war/src/main/webapp/project/project.xhtml
M server/zanata-war/src/main/webapp/stylesheet/theme.css
M zanata-parent/pom.xml
Log Message:
-----------
Merge branch 'rhbz749439'
Conflicts:
server/zanata-war/pom.xml
server/zanata-war/src/main/resources/security.drl
server/zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
Commit: 3e5823d0c929f3b3115ebe194add328c547fdb37
https://github.com/zanata/zanata/commit/3e5823d0c929f3b3115ebe194add328c547fdb37
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2011-11-08 (Tue, 08 Nov 2011)
Changed paths:
M zanata-parent/pom.xml
Log Message:
-----------
Disallow timestamped snapshots in maven-release-plugin config
Commit: aa574db9149de33e17d1fa0ac5d3706109cfe610
https://github.com/zanata/zanata/commit/aa574db9149de33e17d1fa0ac5d3706109cfe610
Author: Alex Eng <aeng at redhat.com>
Date: 2011-11-09 (Wed, 09 Nov 2011)
Changed paths:
M client/pom.xml
R client/zanata-adapter-po/pom.xml
R client/zanata-adapter-po/src/main/java/org/zanata/adapter/po/PoReader2.java
R client/zanata-adapter-po/src/main/java/org/zanata/adapter/po/PoWriter2.java
R client/zanata-adapter-po/src/test/java/org/zanata/adapter/po/PoReader2Test.java
R client/zanata-adapter-po/src/test/resources/ja-JP/RPM.po
R client/zanata-adapter-po/src/test/resources/pot/RPM.pot
M common/pom.xml
A common/zanata-adapter-po/pom.xml
A common/zanata-adapter-po/src/main/java/org/zanata/adapter/po/PoReader2.java
A common/zanata-adapter-po/src/main/java/org/zanata/adapter/po/PoWriter2.java
A common/zanata-adapter-po/src/test/java/org/zanata/adapter/po/PoReader2Test.java
A common/zanata-adapter-po/src/test/resources/ja-JP/RPM.po
A common/zanata-adapter-po/src/test/resources/pot/RPM.pot
A common/zanata-common-api/src/main/java/org/zanata/rest/service/FileResource.java
M server/zanata-model/pom.xml
M server/zanata-model/src/main/java/org/zanata/model/type/ContentTypeType.java
M server/zanata-model/src/main/java/org/zanata/model/type/LocaleIdType.java
A server/zanata-model/src/main/java/org/zanata/util/ZanataDialectResolver.java
A server/zanata-model/src/main/java/org/zanata/util/ZanataMySQL5InnoDBDialect.java
A server/zanata-model/src/main/resources/.gitignore
A server/zanata-model/src/test/resources/.gitignore
M server/zanata-war/etc/scripts/zanata-deploy.sh
M server/zanata-war/pom.xml
R server/zanata-war/src/main/java/org/zanata/ZanataMySQL5InnoDBDialect.java
A server/zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
A server/zanata-war/src/main/java/org/zanata/action/ProjectIterationZipFileAction.java
M server/zanata-war/src/main/java/org/zanata/action/ProjectSearch.java
M server/zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java
M server/zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.java
A server/zanata-war/src/main/java/org/zanata/job/DownloadFileCleanupJob.java
A server/zanata-war/src/main/java/org/zanata/job/ZanataJobScheduler.java
A server/zanata-war/src/main/java/org/zanata/job/ZanataSchedulableJob.java
A server/zanata-war/src/main/java/org/zanata/process/BackgroundProcess.java
A server/zanata-war/src/main/java/org/zanata/process/IterationZipFileBuildProcess.java
A server/zanata-war/src/main/java/org/zanata/process/IterationZipFileBuildProcessHandle.java
A server/zanata-war/src/main/java/org/zanata/process/ProcessHandle.java
A server/zanata-war/src/main/java/org/zanata/rest/service/FileService.java
M server/zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
M server/zanata-war/src/main/java/org/zanata/rest/service/TranslationResourcesService.java
A server/zanata-war/src/main/java/org/zanata/service/FileSystemService.java
A server/zanata-war/src/main/java/org/zanata/service/impl/FileSystemServiceImpl.java
M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/filter/TransFilterPresenter.java
M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/filter/TransFilterView.java
M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorPresenter.java
M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationEditorPresenter.java
M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ClearableTextBox.java
M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
M server/zanata-war/src/main/resources/messages.properties
M server/zanata-war/src/main/resources/security.drl
M server/zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml
M server/zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
M server/zanata-war/src/main/webapp/WEB-INF/facelets/email/activation.xhtml
M server/zanata-war/src/main/webapp/WEB-INF/facelets/email/email_activation.xhtml
M server/zanata-war/src/main/webapp/WEB-INF/facelets/email/email_validation.xhtml
M server/zanata-war/src/main/webapp/WEB-INF/facelets/email/password_reset.xhtml
A server/zanata-war/src/main/webapp/WEB-INF/facelets/email/template_email.xhtml
M server/zanata-war/src/main/webapp/WEB-INF/layout/iteration_view_inline.xhtml
M server/zanata-war/src/main/webapp/WEB-INF/pages.xml
M server/zanata-war/src/main/webapp/help/email_admin.xhtml
M server/zanata-war/src/main/webapp/language/email_coordinator.xhtml
M server/zanata-war/src/main/webapp/language/email_request_to_join.xhtml
A server/zanata-war/src/main/webapp/project/iteration_files.xhtml
M server/zanata-war/src/main/webapp/project/project.xhtml
M server/zanata-war/src/main/webapp/stylesheet/theme.css
M server/zanata-war/src/test/jboss-embedded-bootstrap/META-INF/persistence.properties
M server/zanata-war/src/test/jboss-embedded-bootstrap/META-INF/persistence.xml
M server/zanata-war/src/test/resources/META-INF/persistence.xml
M zanata-parent/pom.xml
Log Message:
-----------
Merge branch 'master' into rhbz750673
Conflicts:
server/zanata-war/src/main/resources/security.drl
Commit: d62307ce523c7061790de2e7a13a81e387531a82
https://github.com/zanata/zanata/commit/d62307ce523c7061790de2e7a13a81e387531a82
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2011-11-09 (Wed, 09 Nov 2011)
Changed paths:
M server/zanata-model/src/main/java/org/zanata/model/HLocaleMember.java
M server/zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
Log Message:
-----------
rhbz748154: Reactivate HLocaleMember hibernate security level restrictions.
Reactivate the hibernate level security restrictions and add a precautionary pre-fetching of a lazily loaded conllection which is being used in the security rules. This prevents hibernate from loading said collection while in the middle of a Drools security check, a scenario that was causing issues.
Commit: 59f9c074d3231926f86fa0d807c00dfd70c5ca88
https://github.com/zanata/zanata/commit/59f9c074d3231926f86fa0d807c00dfd70c5ca88
Author: Alex Eng <aeng at redhat.com>
Date: 2011-11-10 (Thu, 10 Nov 2011)
Changed paths:
M server/zanata-war/pom.xml
Log Message:
-----------
Fix l10n-maven-plugin to read from src/main/resources to target folder
Commit: a12bb323329db9beb123cdbaad2f640a3d8385d9
https://github.com/zanata/zanata/commit/a12bb323329db9beb123cdbaad2f640a3d8385d9
Author: Alex Eng <aeng at redhat.com>
Date: 2011-11-10 (Thu, 10 Nov 2011)
Changed paths:
M server/zanata-model/src/main/java/org/zanata/model/HLocaleMember.java
M server/zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
Log Message:
-----------
Merge branch 'master' of github.com:zanata/zanata
Commit: dc8d5a52406d18a0c393d1d613f86ff9df8561fb
https://github.com/zanata/zanata/commit/dc8d5a52406d18a0c393d1d613f86ff9df8561fb
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2011-11-10 (Thu, 10 Nov 2011)
Changed paths:
M server/zanata-model/src/main/java/org/zanata/model/HLocaleMember.java
Log Message:
-----------
Disable HLocaleMember hibernate level restrictions.
Action level restrictions are still active in this revision nonetheless, but there are still issues with hibernate's collection loading inside the security rules.
Commit: a6600dbef47cf8fcb080e233b3c7347374fde286
https://github.com/zanata/zanata/commit/a6600dbef47cf8fcb080e233b3c7347374fde286
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2011-11-10 (Thu, 10 Nov 2011)
Changed paths:
M server/zanata-war/pom.xml
Log Message:
-----------
Merge branch 'master' of github.com:zanata/zanata
Commit: 7a9ad3cc5fa6e239437842a17bcf4c0355dccfb2
https://github.com/zanata/zanata/commit/7a9ad3cc5fa6e239437842a17bcf4c0355dccfb2
Author: David Mason <dr.d.mason at gmail.com>
Date: 2011-11-10 (Thu, 10 Nov 2011)
Changed paths:
M server/zanata-war/src/main/java/org/zanata/action/SendEmailAction.java
A server/zanata-war/src/main/webapp/WEB-INF/facelets/email/email_admin.xhtml
A server/zanata-war/src/main/webapp/WEB-INF/facelets/email/email_coordinator.xhtml
A server/zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join.xhtml
R server/zanata-war/src/main/webapp/help/email_admin.xhtml
R server/zanata-war/src/main/webapp/language/email_coordinator.xhtml
R server/zanata-war/src/main/webapp/language/email_request_to_join.xhtml
Log Message:
-----------
move some email templates to WEB-INF so they are not accessible by users
Commit: 3ccf32ea966fbb2bbd5c724a14c0e7ef19a0ca6c
https://github.com/zanata/zanata/commit/3ccf32ea966fbb2bbd5c724a14c0e7ef19a0ca6c
Author: David Mason <dr.d.mason at gmail.com>
Date: 2011-11-10 (Thu, 10 Nov 2011)
Changed paths:
M client/pom.xml
R client/zanata-adapter-po/pom.xml
R client/zanata-adapter-po/src/main/java/org/zanata/adapter/po/PoReader2.java
R client/zanata-adapter-po/src/main/java/org/zanata/adapter/po/PoWriter2.java
R client/zanata-adapter-po/src/test/java/org/zanata/adapter/po/PoReader2Test.java
R client/zanata-adapter-po/src/test/resources/ja-JP/RPM.po
R client/zanata-adapter-po/src/test/resources/pot/RPM.pot
M common/pom.xml
A common/zanata-adapter-po/pom.xml
A common/zanata-adapter-po/src/main/java/org/zanata/adapter/po/PoReader2.java
A common/zanata-adapter-po/src/main/java/org/zanata/adapter/po/PoWriter2.java
A common/zanata-adapter-po/src/test/java/org/zanata/adapter/po/PoReader2Test.java
A common/zanata-adapter-po/src/test/resources/ja-JP/RPM.po
A common/zanata-adapter-po/src/test/resources/pot/RPM.pot
A common/zanata-common-api/src/main/java/org/zanata/rest/service/FileResource.java
M server/zanata-model/src/main/java/org/zanata/model/HLocaleMember.java
M server/zanata-war/pom.xml
M server/zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
A server/zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
A server/zanata-war/src/main/java/org/zanata/action/ProjectIterationZipFileAction.java
M server/zanata-war/src/main/java/org/zanata/action/ProjectMaintainerManageAction.java
M server/zanata-war/src/main/java/org/zanata/action/SlugHome.java
M server/zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java
M server/zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.java
A server/zanata-war/src/main/java/org/zanata/job/DownloadFileCleanupJob.java
A server/zanata-war/src/main/java/org/zanata/job/ZanataJobScheduler.java
A server/zanata-war/src/main/java/org/zanata/job/ZanataSchedulableJob.java
A server/zanata-war/src/main/java/org/zanata/process/BackgroundProcess.java
A server/zanata-war/src/main/java/org/zanata/process/IterationZipFileBuildProcess.java
A server/zanata-war/src/main/java/org/zanata/process/IterationZipFileBuildProcessHandle.java
A server/zanata-war/src/main/java/org/zanata/process/ProcessHandle.java
A server/zanata-war/src/main/java/org/zanata/rest/service/FileService.java
M server/zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
M server/zanata-war/src/main/java/org/zanata/rest/service/TranslationResourcesService.java
A server/zanata-war/src/main/java/org/zanata/security/BaseSecurityChecker.java
A server/zanata-war/src/main/java/org/zanata/security/SecurityChecker.java
A server/zanata-war/src/main/java/org/zanata/service/FileSystemService.java
A server/zanata-war/src/main/java/org/zanata/service/impl/FileSystemServiceImpl.java
M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/filter/TransFilterPresenter.java
M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/filter/TransFilterView.java
M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorPresenter.java
M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationEditorPresenter.java
M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ClearableTextBox.java
M server/zanata-war/src/main/resources/messages.properties
M server/zanata-war/src/main/resources/security.drl
M server/zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml
M server/zanata-war/src/main/webapp/WEB-INF/layout/iteration_view_inline.xhtml
M server/zanata-war/src/main/webapp/WEB-INF/pages.xml
M server/zanata-war/src/main/webapp/language/language.xhtml
M server/zanata-war/src/main/webapp/project/assign_maintainer.xhtml
M server/zanata-war/src/main/webapp/project/home.xhtml
A server/zanata-war/src/main/webapp/project/iteration_files.xhtml
M server/zanata-war/src/main/webapp/project/maintainerdetail.xhtml
M server/zanata-war/src/main/webapp/project/project.xhtml
M server/zanata-war/src/main/webapp/stylesheet/theme.css
M zanata-parent/pom.xml
Log Message:
-----------
Merge branch 'master' of github.com:zanata/zanata
Commit: 4500fdb03d51e95767a432df7ac261b467c2662d
https://github.com/zanata/zanata/commit/4500fdb03d51e95767a432df7ac261b467c2662d
Author: Alex Eng <aeng at redhat.com>
Date: 2011-11-10 (Thu, 10 Nov 2011)
Changed paths:
M server/zanata-war/src/main/java/org/zanata/action/ProjectAction.java
M server/zanata-war/src/main/java/org/zanata/action/ProjectHome.java
A server/zanata-war/src/main/java/org/zanata/action/ProjectIterationAction.java
M server/zanata-war/src/main/resources/messages.properties
M server/zanata-war/src/main/resources/security.drl
M server/zanata-war/src/main/webapp/WEB-INF/layout/iteration_edit_form.xhtml
M server/zanata-war/src/main/webapp/WEB-INF/layout/iteration_view_inline.xhtml
M server/zanata-war/src/main/webapp/WEB-INF/layout/project_edit_form.xhtml
M server/zanata-war/src/main/webapp/project/home.xhtml
M server/zanata-war/src/main/webapp/project/project.xhtml
M server/zanata-war/src/main/webapp/stylesheet/theme.css
Log Message:
-----------
Show obsolete UI component - project and project iteration
Commit: c79175c14c19e96838dd99352cdd53ebc07d0228
https://github.com/zanata/zanata/commit/c79175c14c19e96838dd99352cdd53ebc07d0228
Author: Alex Eng <aeng at redhat.com>
Date: 2011-11-10 (Thu, 10 Nov 2011)
Changed paths:
M server/zanata-model/src/main/java/org/zanata/model/HLocaleMember.java
M server/zanata-war/pom.xml
M server/zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
M server/zanata-war/src/main/java/org/zanata/action/SendEmailAction.java
A server/zanata-war/src/main/webapp/WEB-INF/facelets/email/email_admin.xhtml
A server/zanata-war/src/main/webapp/WEB-INF/facelets/email/email_coordinator.xhtml
A server/zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join.xhtml
R server/zanata-war/src/main/webapp/help/email_admin.xhtml
R server/zanata-war/src/main/webapp/language/email_coordinator.xhtml
R server/zanata-war/src/main/webapp/language/email_request_to_join.xhtml
Log Message:
-----------
Merge branch 'master' into rhbz750673
Commit: 3cb259f03bf1e0fb36a6b9a8db3c14283ae3e311
https://github.com/zanata/zanata/commit/3cb259f03bf1e0fb36a6b9a8db3c14283ae3e311
Author: Alex Eng <aeng at redhat.com>
Date: 2011-11-10 (Thu, 10 Nov 2011)
Changed paths:
M server/zanata-war/src/main/java/org/zanata/action/ProjectAction.java
M server/zanata-war/src/main/java/org/zanata/action/ProjectHome.java
M server/zanata-war/src/main/java/org/zanata/action/ProjectIterationAction.java
M server/zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspaceManager.java
M server/zanata-war/src/main/resources/security.drl
M server/zanata-war/src/main/webapp/WEB-INF/layout/iteration_view_inline.xhtml
M server/zanata-war/src/main/webapp/project/home.xhtml
M server/zanata-war/src/main/webapp/project/project.xhtml
Log Message:
-----------
Implement restriction on workspace creation on obsolete project /project iteration.
Hide obsolete iteration section from public.
Commit: c949db8dc17ebf2078d36d9867833a3b3692fd68
https://github.com/zanata/zanata/commit/c949db8dc17ebf2078d36d9867833a3b3692fd68
Author: Alex Eng <aeng at redhat.com>
Date: 2011-11-10 (Thu, 10 Nov 2011)
Changed paths:
M server/zanata-war/src/main/java/org/zanata/webtrans/client/AppPresenter.java
M server/zanata-war/src/main/java/org/zanata/webtrans/client/TranslationEditorPresenter.java
M server/zanata-war/src/main/java/org/zanata/webtrans/client/TranslationPresenter.java
M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/filter/TransFilterPresenter.java
M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/filter/TransFilterView.java
M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorPresenter.java
M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ClearableTextBox.java
Log Message:
-----------
Fix on Ghost translation after search for 1.4 branch: https://bugzilla.redhat.com/show_bug.cgi?id=751264
Commit: 00df0df18e1acb9213ee995a5c377be1c98b158b
https://github.com/zanata/zanata/commit/00df0df18e1acb9213ee995a5c377be1c98b158b
Author: Alex Eng <aeng at redhat.com>
Date: 2011-11-10 (Thu, 10 Nov 2011)
Changed paths:
M zanata-parent/pom.xml
Log Message:
-----------
Merge branch '1.4' of github.com:zanata/zanata into 1.4
Commit: a443a9db473e6fb1911672ee807cc1d3523e2072
https://github.com/zanata/zanata/commit/a443a9db473e6fb1911672ee807cc1d3523e2072
Author: Alex Eng <aeng at redhat.com>
Date: 2011-11-10 (Thu, 10 Nov 2011)
Log Message:
-----------
Merge branch 'rhbz751264-1.4'
Conflicts:
server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorPresenter.java
server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationEditorPresenter.java
server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java
server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ClearableTextBox.java
Commit: 8664a913ffbb26d72ddf4fb54401075515ebd19c
https://github.com/zanata/zanata/commit/8664a913ffbb26d72ddf4fb54401075515ebd19c
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2011-11-15 (Tue, 15 Nov 2011)
Changed paths:
M server/zanata-war/src/main/resources/messages.properties
M server/zanata-war/src/main/webapp/WEB-INF/pages.xml
A server/zanata-war/src/main/webapp/project/homepage_edit.xhtml
M server/zanata-war/src/main/webapp/project/project.xhtml
Log Message:
-----------
Add Project Page Code edit functionality.
(rhbz727716)
Added a new Project Home page edit page (Admin access only in the current revision) which allows direct Seam text editing. This page should be used when incorrect seam text makes its way into the database and the rich editor cannot handle it properly.
Commit: 49254c1a34f45d865f0c4361ea0efa00405174c8
https://github.com/zanata/zanata/commit/49254c1a34f45d865f0c4361ea0efa00405174c8
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2011-11-15 (Tue, 15 Nov 2011)
Changed paths:
M server/zanata-war/src/main/resources/messages.properties
M server/zanata-war/src/main/webapp/WEB-INF/pages.xml
A server/zanata-war/src/main/webapp/edit_home_content_code.xhtml
M server/zanata-war/src/main/webapp/home.xhtml
Log Message:
-----------
Add Zanata Home Page Code edit functionality.
(rhbz727716)
Added a new Zanata Home page edit page (Admin access only in the current revision) which allows direct Seam text editing. This page should be used when incorrect seam text makes its way into the database and the rich editor cannot handle it properly.
Commit: 14d999363c67924933f6f5f2475386385783705b
https://github.com/zanata/zanata/commit/14d999363c67924933f6f5f2475386385783705b
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2011-11-15 (Tue, 15 Nov 2011)
Changed paths:
M server/zanata-war/src/main/resources/messages.properties
M server/zanata-war/src/main/webapp/WEB-INF/pages.xml
A server/zanata-war/src/main/webapp/edit_home_content_code.xhtml
M server/zanata-war/src/main/webapp/home.xhtml
A server/zanata-war/src/main/webapp/project/homepage_edit.xhtml
M server/zanata-war/src/main/webapp/project/project.xhtml
M zanata-parent/pom.xml
Log Message:
-----------
Merge remote branch 'origin/rhbz727716'
Conflicts:
server/zanata-war/src/main/webapp/project/project.xhtml
Commit: aaccbd1e03e38c1597371561f7cf4d6800f7497e
https://github.com/zanata/zanata/commit/aaccbd1e03e38c1597371561f7cf4d6800f7497e
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2011-11-17 (Thu, 17 Nov 2011)
Changed paths:
M server/zanata-war/src/main/webapp/language/language.xhtml
M server/zanata-war/src/main/webapp/stylesheet/theme.css
Log Message:
-----------
Fix minor styling issue with background images.
Commit: a24b5cd32d79ff716e65d303bcd2404567207ae4
https://github.com/zanata/zanata/commit/a24b5cd32d79ff716e65d303bcd2404567207ae4
Author: Alex Eng <aeng at redhat.com>
Date: 2011-11-17 (Thu, 17 Nov 2011)
Changed paths:
R server/zanata-war/eclipse/launch/debug-jboss-flies.launch
A server/zanata-war/eclipse/launch/debug-jboss-zanata.launch
R server/zanata-war/eclipse/launch/debug-surefire-flies (mvn -Dmaven.surefire.debug).launch
A server/zanata-war/eclipse/launch/debug-surefire-zanata (mvn -Dmaven.surefire.debug).launch
M server/zanata-war/src/main/java/org/zanata/rest/service/TranslationResourcesService.java
Log Message:
-----------
Restriction on zanata:push option for obsolete project/project iteration
Commit: 3396066e73d990c6ec907b28d028e5c449fc3703
https://github.com/zanata/zanata/commit/3396066e73d990c6ec907b28d028e5c449fc3703
Author: Alex Eng <aeng at redhat.com>
Date: 2011-11-17 (Thu, 17 Nov 2011)
Changed paths:
M server/zanata-war/src/main/resources/messages.properties
M server/zanata-war/src/main/webapp/WEB-INF/pages.xml
A server/zanata-war/src/main/webapp/edit_home_content_code.xhtml
M server/zanata-war/src/main/webapp/home.xhtml
M server/zanata-war/src/main/webapp/language/language.xhtml
A server/zanata-war/src/main/webapp/project/homepage_edit.xhtml
M server/zanata-war/src/main/webapp/project/project.xhtml
M server/zanata-war/src/main/webapp/stylesheet/theme.css
M zanata-parent/pom.xml
Log Message:
-----------
Merge branch 'master' into rhbz750673
Commit: c24c4594eefd17d222826ce235632116568fb2be
https://github.com/zanata/zanata/commit/c24c4594eefd17d222826ce235632116568fb2be
Author: Alex Eng <aeng at redhat.com>
Date: 2011-11-17 (Thu, 17 Nov 2011)
Changed paths:
M server/zanata-war/src/main/java/org/zanata/rest/service/TranslationResourcesService.java
M server/zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
M server/zanata-war/src/test/resources/org/zanata/test/model/DocumentsData.dbunit.xml
M server/zanata-war/src/test/resources/org/zanata/test/model/ProjectsData.dbunit.xml
Log Message:
-----------
Fix failed test on new 'obsolete' column
Commit: 53c24da5ce4897041bce717c0207c2bf64c25e75
https://github.com/zanata/zanata/commit/53c24da5ce4897041bce717c0207c2bf64c25e75
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2011-11-20 (Sun, 20 Nov 2011)
Changed paths:
M server/zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
Log Message:
-----------
Modify PO file headers according to Zanata state.
(complement to rhbz749439)
When downloading PO files, Zanata will now modify the Last-Translator and PO-Revision-Date comments (if present) with the appropriate values.
Also, a small issue is now corrected that prevents an extra empty reference and flag header from being added to the files.
Commit: 3998979ec98e9ef969999bee4271f79ac1aa559d
https://github.com/zanata/zanata/commit/3998979ec98e9ef969999bee4271f79ac1aa559d
Author: Alex Eng <aeng at redhat.com>
Date: 2011-11-21 (Mon, 21 Nov 2011)
Changed paths:
M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
Log Message:
-----------
Disable Translation Memory search on obsolete project/project iteration text flow
Commit: efac31a3e24684241c74126fd95e5b5f5191ecdb
https://github.com/zanata/zanata/commit/efac31a3e24684241c74126fd95e5b5f5191ecdb
Author: Alex Eng <aeng at redhat.com>
Date: 2011-11-21 (Mon, 21 Nov 2011)
Changed paths:
M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
Log Message:
-----------
Merge branch 'rhbz750673'
Commit: 1dae9a21b55c5726ef1263d8b8d58588021ca366
https://github.com/zanata/zanata/commit/1dae9a21b55c5726ef1263d8b8d58588021ca366
Author: Alex Eng <aeng at redhat.com>
Date: 2011-11-21 (Mon, 21 Nov 2011)
Changed paths:
M server/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
Log Message:
-----------
Implement padding top and botton for each row in translation unit
Commit: 9c8749b37383c9d67c0b1008dd4a7753c1a35a45
https://github.com/zanata/zanata/commit/9c8749b37383c9d67c0b1008dd4a7753c1a35a45
Author: Alex Eng <aeng at redhat.com>
Date: 2011-11-21 (Mon, 21 Nov 2011)
Changed paths:
M server/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
Log Message:
-----------
Merge branch 'rhbz755735'
Commit: 60b33b72e30d43031c21a8c8a84cae50b7acdb91
https://github.com/zanata/zanata/commit/60b33b72e30d43031c21a8c8a84cae50b7acdb91
Author: Alex Eng <aeng at redhat.com>
Date: 2011-11-21 (Mon, 21 Nov 2011)
Changed paths:
M server/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
Log Message:
-----------
Restore bottom border of selected transUnit
Commit: 331f385da0226fb706bff58781a2ed8cfd2db8b0
https://github.com/zanata/zanata/commit/331f385da0226fb706bff58781a2ed8cfd2db8b0
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2011-11-21 (Mon, 21 Nov 2011)
Changed paths:
M server/zanata-war/src/main/java/org/zanata/action/ConfigurationAction.java
M server/zanata-war/src/main/java/org/zanata/action/ProjectIterationZipFileAction.java
M server/zanata-war/src/main/java/org/zanata/process/IterationZipFileBuildProcess.java
A server/zanata-war/src/main/java/org/zanata/service/ConfigurationService.java
A server/zanata-war/src/main/java/org/zanata/service/impl/ConfigurationServiceImpl.java
M server/zanata-war/src/main/resources/messages.properties
M server/zanata-war/src/main/webapp/project/iteration_files.xhtml
Log Message:
-----------
Add zanata.xml config file to the "All Files" zip dpwnload.
(rhbz749439)
Also includes a few minor GUI changes like specifying that the downloaded file is a zip and sorting individual files by path first when displaying them.
Commit: c11c4521ce286714e0672abe01b6e272e45ec8d8
https://github.com/zanata/zanata/commit/c11c4521ce286714e0672abe01b6e272e45ec8d8
Author: Alex Eng <aeng at redhat.com>
Date: 2011-11-21 (Mon, 21 Nov 2011)
Changed paths:
M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/CheckKey.java
M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/CheckKeyImpl.java
M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorPresenter.java
Log Message:
-----------
Fix translation lost in next page: https://bugzilla.redhat.com/show_bug.cgi?id=755764
Commit: a6c8d2d6de776279751b3a628ac54827a4f89d31
https://github.com/zanata/zanata/commit/a6c8d2d6de776279751b3a628ac54827a4f89d31
Author: Alex Eng <aeng at redhat.com>
Date: 2011-11-21 (Mon, 21 Nov 2011)
Changed paths:
M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/CheckKey.java
M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/CheckKeyImpl.java
M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorPresenter.java
Log Message:
-----------
Merge branch '1.4'
Commit: ac590db2dbb2db3a6e5190b37806af4f85a7a5ea
https://github.com/zanata/zanata/commit/ac590db2dbb2db3a6e5190b37806af4f85a7a5ea
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2011-11-21 (Mon, 21 Nov 2011)
Changed paths:
A server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/bar_background.png
A server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/footer_background.png
A server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/panel-header-bg.png
M server/zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml
M server/zanata-war/src/main/webapp/stylesheet/theme.css
A server/zanata-war/src/main/webapp/stylesheet/zanata-theme.css
Log Message:
-----------
UI theme changes.
A few styling changes are being introduced to the UI in this revision. All of them sit in the zanata-theme.css file. Should these changes need to be reverted, either clearing out this file, or removing it's reference from the template.xhtml file should accomplish that.
Commit: d17eefcd1318b82a561612a00d29414ef8dfe8b1
https://github.com/zanata/zanata/commit/d17eefcd1318b82a561612a00d29414ef8dfe8b1
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2011-11-21 (Mon, 21 Nov 2011)
Changed paths:
M server/zanata-war/src/main/java/org/zanata/rest/service/FileService.java
M server/zanata-war/src/main/java/org/zanata/rest/service/TranslationResourcesService.java
Log Message:
-----------
Add missing extensions (headers) to generated PO files.
Commit: 59547b32df051d83a7d8eea66c98b49136cbb08d
https://github.com/zanata/zanata/commit/59547b32df051d83a7d8eea66c98b49136cbb08d
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2011-11-21 (Mon, 21 Nov 2011)
Changed paths:
M server/zanata-model/src/main/java/org/zanata/model/HProject.java
M server/zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
R server/zanata-war/eclipse/launch/debug-jboss-flies.launch
A server/zanata-war/eclipse/launch/debug-jboss-zanata.launch
R server/zanata-war/eclipse/launch/debug-surefire-flies (mvn -Dmaven.surefire.debug).launch
A server/zanata-war/eclipse/launch/debug-surefire-zanata (mvn -Dmaven.surefire.debug).launch
M server/zanata-war/eclipse/launch/webtrans-dummy.launch
M server/zanata-war/eclipse/launch/webtrans-jboss.launch
M server/zanata-war/src/main/java/org/zanata/action/ProjectAction.java
M server/zanata-war/src/main/java/org/zanata/action/ProjectHome.java
A server/zanata-war/src/main/java/org/zanata/action/ProjectIterationAction.java
M server/zanata-war/src/main/java/org/zanata/action/ProjectPagedListDataModel.java
M server/zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java
M server/zanata-war/src/main/java/org/zanata/rest/service/TranslationResourcesService.java
M server/zanata-war/src/main/java/org/zanata/security/BaseSecurityChecker.java
M server/zanata-war/src/main/java/org/zanata/security/SecurityChecker.java
M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/CheckKey.java
M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/CheckKeyImpl.java
M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorPresenter.java
M server/zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspaceManager.java
M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.5.xml
M server/zanata-war/src/main/resources/messages.properties
M server/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
M server/zanata-war/src/main/resources/security.drl
M server/zanata-war/src/main/webapp/WEB-INF/layout/iteration_edit_form.xhtml
M server/zanata-war/src/main/webapp/WEB-INF/layout/iteration_view_inline.xhtml
M server/zanata-war/src/main/webapp/WEB-INF/layout/project_edit_form.xhtml
M server/zanata-war/src/main/webapp/WEB-INF/pages.xml
M server/zanata-war/src/main/webapp/project/home.xhtml
M server/zanata-war/src/main/webapp/project/project.xhtml
M server/zanata-war/src/main/webapp/stylesheet/theme.css
M server/zanata-war/src/main/webapp/stylesheet/zanata.css
M server/zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
M server/zanata-war/src/test/resources/org/zanata/test/model/DocumentsData.dbunit.xml
M server/zanata-war/src/test/resources/org/zanata/test/model/ProjectsData.dbunit.xml
Log Message:
-----------
Merge branch 'master' of github.com:zanata/zanata
Commit: 51d8a384e2c18815d4f052251bf7906488d2553b
https://github.com/zanata/zanata/commit/51d8a384e2c18815d4f052251bf7906488d2553b
Author: Alex Eng <aeng at redhat.com>
Date: 2011-11-22 (Tue, 22 Nov 2011)
Changed paths:
M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/GlossaryPresenter.java
M server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/UiMessages.java
M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.java
M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.ui.xml
Log Message:
-----------
Temporary disable glossary functionality and UI
Commit: 4c40347fbbc8706e08cf4fd849959b8ca7fae0a4
https://github.com/zanata/zanata/commit/4c40347fbbc8706e08cf4fd849959b8ca7fae0a4
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2011-11-22 (Tue, 22 Nov 2011)
Changed paths:
M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/GlossaryPresenter.java
M server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/UiMessages.java
M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.java
M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.ui.xml
Log Message:
-----------
Merge branch 'master' of github.com:zanata/zanata
Commit: abeb4a625e4cdb2d38f269880a6f2824ee223617
https://github.com/zanata/zanata/commit/abeb4a625e4cdb2d38f269880a6f2824ee223617
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2011-11-22 (Tue, 22 Nov 2011)
Changed paths:
M server/zanata-war/src/main/resources/messages.properties
M server/zanata-war/src/main/webapp/edit_home_content_code.xhtml
M server/zanata-war/src/main/webapp/project/homepage_edit.xhtml
M server/zanata-war/src/main/webapp/stylesheet/theme.css
Log Message:
-----------
Minor UI changes.
(rhbz727716)
Renamed labels "Project Page" and "Home Page" to simply "Page".
Changed styling of the seam text code editors.
Commit: 1b592e917a90c01ad5999d788ce955a240449bd6
https://github.com/zanata/zanata/commit/1b592e917a90c01ad5999d788ce955a240449bd6
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2011-11-22 (Tue, 22 Nov 2011)
Changed paths:
M server/zanata-war/src/main/resources/messages.properties
M server/zanata-war/src/main/webapp/edit_home_content_code.xhtml
M server/zanata-war/src/main/webapp/project/homepage_edit.xhtml
M server/zanata-war/src/main/webapp/stylesheet/theme.css
Log Message:
-----------
Merge remote branch 'origin/rhbz727716'
Commit: 29e0b257db222b1baedf36fc74ef16dfc1e5e666
https://github.com/zanata/zanata/commit/29e0b257db222b1baedf36fc74ef16dfc1e5e666
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2011-11-22 (Tue, 22 Nov 2011)
Changed paths:
M server/zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
Log Message:
-----------
Change handling of single empty references and flags in PO files.
Before this revision, no flags/references and a single empty flag/reference would be stored in the same manner in the database (an empty string), and interpreted as the later when pulling or generating a PO file. In this revision, empty tag/references list are handled with a null entry in the database.
Commit: 0e18b6a6b4d4df6293648de9ff8f2795c33a8d83
https://github.com/zanata/zanata/commit/0e18b6a6b4d4df6293648de9ff8f2795c33a8d83
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2011-11-24 (Thu, 24 Nov 2011)
Changed paths:
M common/zanata-adapter-po/src/main/java/org/zanata/adapter/po/PoWriter2.java
R common/zanata-common-api/src/main/java/org/zanata/resources/OutputSource.java
M server/zanata-war/src/main/java/org/zanata/process/IterationZipFileBuildProcess.java
M server/zanata-war/src/main/java/org/zanata/rest/service/FileService.java
M server/zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
M server/zanata-war/src/main/java/org/zanata/rest/service/TranslationResourcesService.java
M server/zanata-war/src/main/webapp/stylesheet/zanata.css
Log Message:
-----------
PO File Generation changes.
(rhbz749439)
Add support for charset encoding when using the PO file generation APIs.
Clean up the PO file generation libraries, removing unnecesary classes.
Add generation of several PO headers based on Zanata's records (Plural forms headers not completed in this revision).
Commit: f3f2ae85c21b17ded168902a1ce68f92f86a000e
https://github.com/zanata/zanata/commit/f3f2ae85c21b17ded168902a1ce68f92f86a000e
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2011-11-24 (Thu, 24 Nov 2011)
Changed paths:
M server/zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
Log Message:
-----------
Generate PO file header even if not originally imported.
(rhbz749439)
The PO file header was not being generated when not imported originally into the system.
Compare: https://github.com/zanata/zanata/compare/bfd407b...f3f2ae8
More information about the zanata-commits
mailing list