[zanata/zanata-server] 35fb9f: Enable CommonMark preview with Caja Sanitizer
GitHub
noreply at github.com
Thu Jul 9 22:25:31 UTC 2015
Branch: refs/heads/rhbz1213630-webhook
Home: https://github.com/zanata/zanata-server
Commit: 35fb9f083047e8ac3b4270910fd05463c56f13d8
https://github.com/zanata/zanata-server/commit/35fb9f083047e8ac3b4270910fd05463c56f13d8
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-06-17 (Wed, 17 Jun 2015)
Changed paths:
M zanata-war/pom.xml
M zanata-war/src/main/java/org/zanata/util/CommonMarkRenderer.java
M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml
M zanata-war/src/main/webapp/edit_home_content.xhtml
M zanata-war/src/main/webapp/resources/script/commonmark-preview.js
Log Message:
-----------
Enable CommonMark preview with Caja Sanitizer
Commit: 31690ee7793529c0593912ffefd747ea4741eddb
https://github.com/zanata/zanata-server/commit/31690ee7793529c0593912ffefd747ea4741eddb
Author: Alex Eng <aeng at redhat.com>
Date: 2015-07-07 (Tue, 07 Jul 2015)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Breadcrumb.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Breadcrumb.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/DiffColorLegendPanel.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TooltipPopupPanel.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TooltipPopupPanel.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitNavigationView.ui.xml
Log Message:
-----------
Update editor color
Commit: ec3b5fa4903db1f6e98a8241bdd728a3c157007e
https://github.com/zanata/zanata-server/commit/ec3b5fa4903db1f6e98a8241bdd728a3c157007e
Author: Alex Eng <aeng at redhat.com>
Date: 2015-07-09 (Thu, 09 Jul 2015)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Breadcrumb.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Breadcrumb.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/DiffColorLegendPanel.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TooltipPopupPanel.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TooltipPopupPanel.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitNavigationView.ui.xml
Log Message:
-----------
Merge pull request #896 from zanata/update-editor-color
Update editor color
Commit: d1c0a379ff9a0e6408d8488790542c5830f07c28
https://github.com/zanata/zanata-server/commit/d1c0a379ff9a0e6408d8488790542c5830f07c28
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-07-09 (Thu, 09 Jul 2015)
Changed paths:
M zanata-war/pom.xml
M zanata-war/src/main/java/org/zanata/util/CommonMarkRenderer.java
M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml
M zanata-war/src/main/webapp/edit_home_content.xhtml
M zanata-war/src/main/webapp/resources/script/commonmark-preview.js
Log Message:
-----------
Merge pull request #877 from zanata/reenable-commonmark-preview
Re-enable commonmark preview
Commit: 17cf90d599a801c3393910eb6bed45aa309dca89
https://github.com/zanata/zanata-server/commit/17cf90d599a801c3393910eb6bed45aa309dca89
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-07-09 (Thu, 09 Jul 2015)
Changed paths:
M zanata-war/pom.xml
M zanata-war/src/main/java/org/zanata/util/CommonMarkRenderer.java
Log Message:
-----------
Upgrade to commonmark.js 0.20
Commit: 7e90a9b74ecb888710e67bbd0a87d4058e00699a
https://github.com/zanata/zanata-server/commit/7e90a9b74ecb888710e67bbd0a87d4058e00699a
Author: Alex Eng <aeng at redhat.com>
Date: 2015-07-09 (Thu, 09 Jul 2015)
Changed paths:
M docs/release-notes.md
M zanata-war/src/main/java/org/zanata/dao/AccountRoleDAO.java
M zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java
M zanata-war/src/main/java/org/zanata/util/EssentialDataCreator.java
M zanata-war/src/main/webapp/project/home.xhtml
M zanata-war/src/test/java/org/zanata/util/EssentialDataCreatorTest.java
Log Message:
-----------
feat: role: New permission for create project
https://bugzilla.redhat.com/show_bug.cgi?id=1214502
Squashed commit of the following:
commit 3e8da24ecd73683fd1cc8713d1e80cf2c61fcc07
Author: Alex Eng <aeng at redhat.com>
Date: Thu Jul 9 12:34:53 2015 +1000
Refactor create role method
commit e9fde4cd5fe19fa35c37ff7f9da1b406b8fd4ce2
Author: Alex Eng <aeng at redhat.com>
Date: Thu Jul 9 08:36:41 2015 +1000
Update security comment
commit 3005d2d657636de4044d1099a41c3e0a1ae5d2bd
Author: Alex Eng <aeng at redhat.com>
Date: Thu Jul 9 08:11:18 2015 +1000
New permission for create project: https://bugzilla.redhat.com/show_bug.cgi?id=1214502
Commit: e2036b54cb5107607fff50139f683f9f412ac4a4
https://github.com/zanata/zanata-server/commit/e2036b54cb5107607fff50139f683f9f412ac4a4
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-07-09 (Thu, 09 Jul 2015)
Changed paths:
M docs/user-guide/system-admin/configuration/authentication.md
M docs/user-guide/system-admin/configuration/installation.md
Log Message:
-----------
Update platform requirements and mention Bouncy Castle
Pull request: https://github.com/zanata/zanata-server/pull/879
Commit: 7d9dda0593a8389eb0a85fd189bf100fe7fc3c48
https://github.com/zanata/zanata-server/commit/7d9dda0593a8389eb0a85fd189bf100fe7fc3c48
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-07-09 (Thu, 09 Jul 2015)
Changed paths:
M zanata-war/pom.xml
M zanata-war/src/main/java/org/zanata/util/CommonMarkRenderer.java
Log Message:
-----------
Merge pull request #878 from zanata/commonmarkjs-0.20
Upgrade to commonmark.js 0.20
Commit: fd950955676d356e838fc2b654997a4c4386e622
https://github.com/zanata/zanata-server/commit/fd950955676d356e838fc2b654997a4c4386e622
Author: Alex Eng <aeng at redhat.com>
Date: 2015-07-10 (Fri, 10 Jul 2015)
Changed paths:
M docs/release-notes.md
M zanata-model/src/main/java/org/zanata/model/Activity.java
M zanata-model/src/main/java/org/zanata/model/HDocument.java
M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
M zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
M zanata-model/src/main/java/org/zanata/model/ITextFlowTargetHistory.java
M zanata-model/src/main/java/org/zanata/model/IsEntityWithType.java
M zanata-model/src/main/java/org/zanata/model/type/EntityType.java
A zanata-model/src/main/java/org/zanata/model/type/EntityTypeType.java
A zanata-model/src/main/java/org/zanata/model/type/EntityTypeTypeDescriptor.java
M zanata-model/src/main/java/org/zanata/model/type/TranslationSourceTypeTypeDescriptor.java
M zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TransMemoryMergeServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
M zanata-war/src/main/java/org/zanata/util/TranslationUtil.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransUnitUpdateRequest.java
M zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
R zanata-war/src/main/resources/db/changelogs/db.changelog-3.8.xml
M zanata-war/src/main/resources/db/db.changelog.xml
M zanata-war/src/main/webapp/WEB-INF/layout/delete_confirmation_modal.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml
M zanata-war/src/test/java/org/zanata/dao/TextFlowTargetDAOTest.java
M zanata-war/src/test/java/org/zanata/service/impl/CopyVersionServiceImplTest.java
M zanata-war/src/test/java/org/zanata/util/TranslationUtilTest.java
Log Message:
-----------
feat(statistic): Exclude copied translation from user stats
https://github.com/zanata/zanata-server/pull/900
https://bugzilla.redhat.com/show_bug.cgi?id=1235070
Squashed commit of the following:
commit 56de5bcfa5bd2e0e0a2fccfe9f4a080a675c3d8c
Author: Alex Eng <aeng at redhat.com>
Date: Thu Jul 9 12:54:07 2015 +1000
Fix indentation format
commit c9942efed283e8ac0c3c82cbaebc7732ae886ac5
Author: Alex Eng <aeng at redhat.com>
Date: Tue Jul 7 20:59:49 2015 +1000
Merge entityType with TranslationEntityType
commit db993dd410f4fa447088f1e434f769291c9050c3
Author: Alex Eng <aeng at redhat.com>
Date: Tue Jul 7 16:06:27 2015 +1000
Merge db-changelog 3.8 to 3.7
commit 8f4031047a5ae931d43a3279b3b38dc04699d1c1
Author: Alex Eng <aeng at redhat.com>
Date: Thu Jul 2 15:58:13 2015 +1000
Add metadata of how translation is being input:
https://bugzilla.redhat.com/show_bug.cgi?id=1235070
Squashed commit of the following:
commit 4af776a092935490089944e8ea84a66316303c8b
Author: Alex Eng <aeng at redhat.com>
Date: Thu Jul 2 12:02:17 2015 +1000
fix unit test
commit 289ea093666888121d212a70dec320683d0157d0
Author: Alex Eng <aeng at redhat.com>
Date: Thu Jul 2 08:43:26 2015 +1000
Set entity properties for HTextFlowTargetHistory when copy version
commit 618c5e057fd46749ed0bf61713f7b53809764207
Author: Alex Eng <aeng at redhat.com>
Date: Wed Jul 1 13:11:58 2015 +1000
Set automatedEntry when update in HTextFlowTarget
commit e0d3eada4565ef0e1f8e3afbe791668ce8824920
Author: Alex Eng <aeng at redhat.com>
Date: Tue Jun 30 08:13:13 2015 +1000
Add javadoc for new type
commit d493b441e61a74954ba9bab19e2c7168979d42ba
Author: Alex Eng <aeng at redhat.com>
Date: Mon Jun 29 11:07:07 2015 +1000
Update release notes
commit 0fc402133864a2ea4fb65407f0ef8b950a7dad86
Merge: 0eb64ff 158ad02
Author: Alex Eng <aeng at redhat.com>
Date: Mon Jun 29 11:06:26 2015 +1000
Merge branch 'integration/master' into rhbz1235070-stats
commit 0eb64ff68323140c333388d6606ecba071e07272
Author: Alex Eng <aeng at redhat.com>
Date: Mon Jun 29 10:55:39 2015 +1000
Merge MessageGenerator with TranslationUtil
commit f74a132f551edac954f7d0a660fe79ee54ecd598
Author: Alex Eng <aeng at redhat.com>
Date: Fri Jun 26 16:03:59 2015 +1000
Add automatedEntry condition for user statistic query
commit 23deb7ace51ba8f6a14069039b3ae407ebcc7fe8
Author: Alex Eng <aeng at redhat.com>
Date: Fri Jun 26 13:24:15 2015 +1000
Add revision comment in editor history
commit bd98cc73c36adf836d98b90615e368ad231d0463
Author: Alex Eng <aeng at redhat.com>
Date: Thu Jun 25 16:27:22 2015 +1000
Add sourceType for all translation update
commit dbb4efbbe49f59fd13e7a820fc3dbbf66400b20e
Author: Alex Eng <aeng at redhat.com>
Date: Thu Jun 25 15:12:32 2015 +1000
Add entityType, sourceType, entityId and automatedEntry to HTextFlowTarget and HTextFlowTargetHistory
commit ae9cd703553dbb63b1cb6e1f8d9cf760084620a1
Author: Alex Eng <aeng at redhat.com>
Date: Thu Jun 25 11:40:25 2015 +1000
Add revision comment from TM Merge action
Commit: 434ce8429824b59be93392a1d3e8081003c9e87f
https://github.com/zanata/zanata-server/commit/434ce8429824b59be93392a1d3e8081003c9e87f
Author: Alex Eng <aeng at redhat.com>
Date: 2015-07-10 (Fri, 10 Jul 2015)
Changed paths:
M docs/release-notes.md
M docs/user-guide/system-admin/configuration/authentication.md
M docs/user-guide/system-admin/configuration/installation.md
M zanata-model/src/main/java/org/zanata/model/Activity.java
M zanata-model/src/main/java/org/zanata/model/HDocument.java
M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
M zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
M zanata-model/src/main/java/org/zanata/model/ITextFlowTargetHistory.java
M zanata-model/src/main/java/org/zanata/model/IsEntityWithType.java
M zanata-model/src/main/java/org/zanata/model/type/EntityType.java
A zanata-model/src/main/java/org/zanata/model/type/EntityTypeType.java
A zanata-model/src/main/java/org/zanata/model/type/EntityTypeTypeDescriptor.java
M zanata-model/src/main/java/org/zanata/model/type/TranslationSourceTypeTypeDescriptor.java
M zanata-war/pom.xml
M zanata-war/src/main/java/org/zanata/dao/AccountRoleDAO.java
M zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java
M zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TransMemoryMergeServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
M zanata-war/src/main/java/org/zanata/util/CommonMarkRenderer.java
M zanata-war/src/main/java/org/zanata/util/EssentialDataCreator.java
M zanata-war/src/main/java/org/zanata/util/TranslationUtil.java
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Breadcrumb.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Breadcrumb.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/DiffColorLegendPanel.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TooltipPopupPanel.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TooltipPopupPanel.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitNavigationView.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransUnitUpdateRequest.java
M zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
M zanata-war/src/main/resources/db/changelogs/db.changelog-3.8.xml
M zanata-war/src/main/webapp/WEB-INF/layout/delete_confirmation_modal.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml
M zanata-war/src/main/webapp/edit_home_content.xhtml
M zanata-war/src/main/webapp/project/home.xhtml
M zanata-war/src/main/webapp/resources/script/commonmark-preview.js
M zanata-war/src/test/java/org/zanata/dao/TextFlowTargetDAOTest.java
M zanata-war/src/test/java/org/zanata/service/impl/CopyVersionServiceImplTest.java
M zanata-war/src/test/java/org/zanata/util/EssentialDataCreatorTest.java
M zanata-war/src/test/java/org/zanata/util/TranslationUtilTest.java
Log Message:
-----------
Merge branch 'integration/master' into rhbz1213630-webhook
Compare: https://github.com/zanata/zanata-server/compare/d6e68c5bbe00...434ce8429824
More information about the zanata-commits
mailing list