[zanata/zanata-server] d00217: Exclude Hibernate Search module
GitHub
noreply at github.com
Fri Nov 6 01:57:27 UTC 2015
Branch: refs/heads/ZNTA-555-user-request
Home: https://github.com/zanata/zanata-server
Commit: d0021748e01e944e02e907f3b1851de7ac0ecb62
https://github.com/zanata/zanata-server/commit/d0021748e01e944e02e907f3b1851de7ac0ecb62
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-09-15 (Tue, 15 Sep 2015)
Changed paths:
M zanata-war/src/main/webapp-jboss/WEB-INF/jboss-deployment-structure.xml
Log Message:
-----------
Exclude Hibernate Search module
This helps with WildFly 10 compatibility.
Commit: f78ff1457a50ae53632c88a8b57da705d12ea9e7
https://github.com/zanata/zanata-server/commit/f78ff1457a50ae53632c88a8b57da705d12ea9e7
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-09-25 (Fri, 25 Sep 2015)
Changed paths:
M zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
A zanata-war/src/main/resources/db/mysql/add_missing_fks.sql
Log Message:
-----------
Add any missing foreign keys
In the past, some Zanata environments defaulted to MyISAM for new
tables, and so some tables were MyISAM when we tried to create various
foreign keys. (MySQL silently ignores ADD FOREIGN KEY for MyISAM
tables.) This commit ensures that the affected foreign keys are
created if they don't exist.
Commit: ab29509f0994b2200209251bcd6be9071dedcca9
https://github.com/zanata/zanata-server/commit/ab29509f0994b2200209251bcd6be9071dedcca9
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-09-25 (Fri, 25 Sep 2015)
Changed paths:
M zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
M zanata-war/src/main/resources/db/mysql/add_missing_fks.sql
Log Message:
-----------
Use stored proc for MySQL 5.x compatibility
Commit: 77723bd1be177c7ca22cf7e508d260d2c1866a1a
https://github.com/zanata/zanata-server/commit/77723bd1be177c7ca22cf7e508d260d2c1866a1a
Author: Luke Brooker <mail at lukebrooker.com>
Date: 2015-10-01 (Thu, 01 Oct 2015)
Changed paths:
M zanata-war/src/main/webapp/WEB-INF/layout/version-group/languages-tab.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/version-group/projects-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/template/footer.xhtml
M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
M zanata-war/src/main/webapp/iteration/view.xhtml
M zanata-war/src/main/webapp/resources/zanata/list-filter.xhtml
M zanata-war/src/main/webapp/resources/zanata/loader.xhtml
M zanata-war/src/main/webapp/version-group/version_group.xhtml
Log Message:
-----------
adjust markup and function calls for scrollable panels
The other part of the fix is in zanata-assets:
https://github.com/zanata/zanata-assets/commit/7079cddc066216c3e28ea977322e566bf98c5ddc
Commit: 54b2de4ca60d96143b14a21b31f73a25f5c0e068
https://github.com/zanata/zanata-server/commit/54b2de4ca60d96143b14a21b31f73a25f5c0e068
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-10-05 (Mon, 05 Oct 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-jboss/WEB-INF/jboss-deployment-structure.xml
Log Message:
-----------
Use JVM's built-in JavaScript engine
Now that we require Java 1.8, this should pick up Nashorn (or perhaps its replacement, one day).
Commit: e63567be09958d471eb255abd281a0ad6c860e44
https://github.com/zanata/zanata-server/commit/e63567be09958d471eb255abd281a0ad6c860e44
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-10-05 (Mon, 05 Oct 2015)
Changed paths:
M zanata-war/src/main/java/org/zanata/util/CommonMarkRenderer.java
M zanata-war/src/test/java/org/zanata/util/CommonMarkRendererTest.java
Log Message:
-----------
Reuse Nashorn bindings using ThreadLocals
Commit: 8ce2fd04dee47cdd9d3b14445eaa8904dce0a462
https://github.com/zanata/zanata-server/commit/8ce2fd04dee47cdd9d3b14445eaa8904dce0a462
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-10-05 (Mon, 05 Oct 2015)
Changed paths:
M zanata-war/src/main/java/org/zanata/util/CommonMarkRenderer.java
M zanata-war/src/test/java/org/zanata/util/CommonMarkRendererTest.java
Log Message:
-----------
Reuse CompiledScript
Commit: 3fd0a1180529348158cc829867612b702c7291d5
https://github.com/zanata/zanata-server/commit/3fd0a1180529348158cc829867612b702c7291d5
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-10-05 (Mon, 05 Oct 2015)
Changed paths:
M zanata-war/src/main/java/org/zanata/util/CommonMarkRenderer.java
Log Message:
-----------
Create 'window' binding at init time
Commit: ed84c8e625ca4d9b42a8713007628a007f122540
https://github.com/zanata/zanata-server/commit/ed84c8e625ca4d9b42a8713007628a007f122540
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-10-06 (Tue, 06 Oct 2015)
Changed paths:
M zanata-war/src/test/resources/META-INF/persistence.xml
M zanata-war/src/test/resources/arquillian/persistence.xml
Log Message:
-----------
chore: move zanatasearchindex under target dir in tests
Commit: e24ad1c19e9590c6e96658b6c143f3b729870ab2
https://github.com/zanata/zanata-server/commit/e24ad1c19e9590c6e96658b6c143f3b729870ab2
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-10-12 (Mon, 12 Oct 2015)
Changed paths:
M zanata-war/src/main/java/org/zanata/util/CommonMarkRenderer.java
M zanata-war/src/test/java/org/zanata/util/CommonMarkRendererTest.java
A zanata-war/src/test/java/org/zanata/util/Repeat.java
A zanata-war/src/test/java/org/zanata/util/RepeatRule.java
Log Message:
-----------
Eval JS script once only per thread
Commit: 92cc633494db3d6fdc063bcb80f1f87b083c10b0
https://github.com/zanata/zanata-server/commit/92cc633494db3d6fdc063bcb80f1f87b083c10b0
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-10-12 (Mon, 12 Oct 2015)
Changed paths:
M zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.java
Log Message:
-----------
feat(search): Add more checks for bad TM results
Commit: 75ecbaefed46b66e3da7de4d308b5e9a57e8033a
https://github.com/zanata/zanata-server/commit/75ecbaefed46b66e3da7de4d308b5e9a57e8033a
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-10-12 (Mon, 12 Oct 2015)
Changed paths:
M zanata-model/src/main/java/org/zanata/hibernate/search/DefaultAnalyzer.java
Log Message:
-----------
feat(search): avoid tokenising non-text fields
Commit: 0f931e6c28576528ece1379e1680f491a90f85dd
https://github.com/zanata/zanata-server/commit/0f931e6c28576528ece1379e1680f491a90f85dd
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-10-13 (Tue, 13 Oct 2015)
Changed paths:
M zanata-war/src/test/resources/META-INF/persistence.xml
M zanata-war/src/test/resources/arquillian/persistence.xml
Log Message:
-----------
Merge pull request #1000 from zanata/move-zanatasearchindex
chore: move zanatasearchindex under target dir in tests
Commit: 0edb617b156631520eee02fe92511ebbe7a2cf24
https://github.com/zanata/zanata-server/commit/0edb617b156631520eee02fe92511ebbe7a2cf24
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-10-13 (Tue, 13 Oct 2015)
Changed paths:
M zanata-model/src/main/java/org/zanata/hibernate/search/DefaultAnalyzer.java
Log Message:
-----------
Add comment
Commit: 1e7e7e8f9c231298591d168dc3c8ddc5ea160e84
https://github.com/zanata/zanata-server/commit/1e7e7e8f9c231298591d168dc3c8ddc5ea160e84
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-10-13 (Tue, 13 Oct 2015)
Changed paths:
M zanata-model/src/main/java/org/zanata/hibernate/search/DateBridge.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.java
Log Message:
-----------
fix(ZNTA-721): pre-sort TM by Lucene score
Commit: bcc0e4e960426ec1c79eafc7c6854664f7688aa3
https://github.com/zanata/zanata-server/commit/bcc0e4e960426ec1c79eafc7c6854664f7688aa3
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-10-13 (Tue, 13 Oct 2015)
Changed paths:
M functional-test/src/test/java/org/zanata/feature/editor/TranslateOpenOfficeTest.java
Log Message:
-----------
test: clean documents dir between tests
Commit: 4183cafceb0df7a03dca3c916fb109789ca1970d
https://github.com/zanata/zanata-server/commit/4183cafceb0df7a03dca3c916fb109789ca1970d
Author: Alex Eng <aeng at redhat.com>
Date: 2015-10-14 (Wed, 14 Oct 2015)
Changed paths:
M docs/release-notes.md
M zanata-war/src/main/java/org/zanata/action/MergeTransAction.java
M zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java
Log Message:
-----------
fix(merge translation):allow admin to merge from all active projects
https://zanata.atlassian.net/browse/ZNTA-718
Commit: ddb1cf69bbdd95c36c3f83da4197677fb81bb873
https://github.com/zanata/zanata-server/commit/ddb1cf69bbdd95c36c3f83da4197677fb81bb873
Author: David Mason <drdmason at gmail.com>
Date: 2015-10-14 (Wed, 14 Oct 2015)
Changed paths:
M zanata-war/src/main/webapp/app/config.json
M zanata-war/src/main/webapp/app/css/app.css
M zanata-war/src/main/webapp/app/index.html
M zanata-war/src/main/webapp/app/js/app.js
M zanata-war/src/main/webapp/app/js/libs.js
M zanata-war/src/main/webapp/app/js/templates.js
M zanata-war/src/main/webapp/app/maps/app.js.map
M zanata-war/src/main/webapp/app/maps/libs.js.map
Log Message:
-----------
refactor: update zanata-spa to commit 68a0859e97288ab494b5e01af6d06db2d8cd0dfa
This version has the header using React instead of Angular, but functionality
is not changed.
Commit: b6819e775ff18c7deba08acdf8725f01bff7df18
https://github.com/zanata/zanata-server/commit/b6819e775ff18c7deba08acdf8725f01bff7df18
Author: Zanata Build Server <jenkins at zanata.org>
Date: 2015-10-14 (Wed, 14 Oct 2015)
Changed paths:
M docs/release-notes.md
Log Message:
-----------
Merge commit '910115a516ca130f504f7a209181d830739a0fcd' into HEAD
Commit: 910115a516ca130f504f7a209181d830739a0fcd
https://github.com/zanata/zanata-server/commit/910115a516ca130f504f7a209181d830739a0fcd
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date: 2015-10-14 (Wed, 14 Oct 2015)
Changed paths:
M docs/release-notes.md
Log Message:
-----------
doc(release-notes): Add section 3.7.3
Commit: 051478556ab3dc62332335cd6d8c8b473f0beee7
https://github.com/zanata/zanata-server/commit/051478556ab3dc62332335cd6d8c8b473f0beee7
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-10-15 (Thu, 15 Oct 2015)
Changed paths:
M zanata-model/src/main/java/org/zanata/hibernate/search/DateBridge.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.java
Log Message:
-----------
Merge pull request #1006 from zanata/ZNTA-721-presort-tm-by-score
fix(ZNTA-721): pre-sort TM by Lucene score
Commit: a1c2d3bfc4098d891341db9c8a451daca8b2d3a6
https://github.com/zanata/zanata-server/commit/a1c2d3bfc4098d891341db9c8a451daca8b2d3a6
Author: Zanata Build Server <jenkins at zanata.org>
Date: 2015-10-15 (Thu, 15 Oct 2015)
Changed paths:
M zanata-model/src/main/java/org/zanata/hibernate/search/DateBridge.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.java
Log Message:
-----------
Merge commit '051478556ab3dc62332335cd6d8c8b473f0beee7' into HEAD
Commit: cd39c6dd3d55f4aabd11d7441ba7e0fb30bee23a
https://github.com/zanata/zanata-server/commit/cd39c6dd3d55f4aabd11d7441ba7e0fb30bee23a
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-10-15 (Thu, 15 Oct 2015)
Changed paths:
M docs/release-notes.md
Log Message:
-----------
Add ZNTA-721 to release notes
Commit: 47143bfa0ae810f769bb8d0a34937bfd244d3b76
https://github.com/zanata/zanata-server/commit/47143bfa0ae810f769bb8d0a34937bfd244d3b76
Author: Zanata Build Server <jenkins at zanata.org>
Date: 2015-10-15 (Thu, 15 Oct 2015)
Changed paths:
M docs/release-notes.md
Log Message:
-----------
Merge commit 'cd39c6dd3d55f4aabd11d7441ba7e0fb30bee23a' into HEAD
Commit: 779fbb5ea8e3358ba4b3b3f9c347ab44ca4c4f6c
https://github.com/zanata/zanata-server/commit/779fbb5ea8e3358ba4b3b3f9c347ab44ca4c4f6c
Author: Zanata Build Server <jenkins at zanata.org>
Date: 2015-10-15 (Thu, 15 Oct 2015)
Changed paths:
M frontend/pom.xml
M functional-test/pom.xml
M pom.xml
M zanata-liquibase/pom.xml
M zanata-model/pom.xml
M zanata-test-war/pom.xml
M zanata-war/pom.xml
Log Message:
-----------
[maven-release-plugin] prepare release server-3.7.3
Commit: acd89f9b6bfe444655d3e18bdffe785bc5176018
https://github.com/zanata/zanata-server/commit/acd89f9b6bfe444655d3e18bdffe785bc5176018
Author: Zanata Build Server <jenkins at zanata.org>
Date: 2015-10-15 (Thu, 15 Oct 2015)
Changed paths:
M frontend/pom.xml
M functional-test/pom.xml
M pom.xml
M zanata-liquibase/pom.xml
M zanata-model/pom.xml
M zanata-test-war/pom.xml
M zanata-war/pom.xml
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Commit: e4dfd91ed2f10d8148c853495a1d5f90e05f8cc1
https://github.com/zanata/zanata-server/commit/e4dfd91ed2f10d8148c853495a1d5f90e05f8cc1
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-10-16 (Fri, 16 Oct 2015)
Log Message:
-----------
Merge remote-tracking branch 'origin/release' into integration/master
Commit: fd91c6d68ce13d34bd34502e8057ff1f86525409
https://github.com/zanata/zanata-server/commit/fd91c6d68ce13d34bd34502e8057ff1f86525409
Author: Damian Jansen <djansen at redhat.com>
Date: 2015-10-19 (Mon, 19 Oct 2015)
Changed paths:
M functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java
M functional-test/src/main/java/org/zanata/page/languages/LanguagePage.java
M functional-test/src/main/java/org/zanata/page/projects/CreateProjectPage.java
M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectGeneralTab.java
M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectPermissionsTab.java
M functional-test/src/main/java/org/zanata/page/projectversion/CreateVersionPage.java
Log Message:
-----------
fix(test): Replace return this with return new Page
Return this is page functions bypasses the AbstractPage waits/checks.
Commit: 1f826e497a29e37b122d36e23c24b5a62404a988
https://github.com/zanata/zanata-server/commit/1f826e497a29e37b122d36e23c24b5a62404a988
Author: David Mason <drdmason at gmail.com>
Date: 2015-10-19 (Mon, 19 Oct 2015)
Changed paths:
M zanata-war/src/main/webapp/app/config.json
M zanata-war/src/main/webapp/app/css/app.css
M zanata-war/src/main/webapp/app/index.html
M zanata-war/src/main/webapp/app/js/app.js
M zanata-war/src/main/webapp/app/js/libs.js
M zanata-war/src/main/webapp/app/js/templates.js
M zanata-war/src/main/webapp/app/maps/app.js.map
M zanata-war/src/main/webapp/app/maps/libs.js.map
Log Message:
-----------
Merge pull request #1013 from zanata/update-spa-znta-71
refactor: update zanata-spa to commit 68a0859e97288ab494b5e01af6d06db2d8cd0dfa
Commit: adb46eb7e77e5b2128000c76ab7bba6d0f01b74c
https://github.com/zanata/zanata-server/commit/adb46eb7e77e5b2128000c76ab7bba6d0f01b74c
Author: Alex Eng <aeng at redhat.com>
Date: 2015-10-20 (Tue, 20 Oct 2015)
Changed paths:
M docs/release-notes.md
M zanata-war/src/main/java/org/zanata/action/MergeTransAction.java
M zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java
Log Message:
-----------
Merge pull request #1009 from zanata/ZTA-718
fix(merge translation):allow admin/maintainer to merge from all active projects
Commit: d7b6e915a41c5d79afb71896a952a228d523acaa
https://github.com/zanata/zanata-server/commit/d7b6e915a41c5d79afb71896a952a228d523acaa
Author: Alex Eng <aeng at redhat.com>
Date: 2015-10-20 (Tue, 20 Oct 2015)
Changed paths:
M pom.xml
Log Message:
-----------
exclude jersey dependency from zanata-api
Commit: 910cb8ae62a3c598b90ea5efad2668472f8929d4
https://github.com/zanata/zanata-server/commit/910cb8ae62a3c598b90ea5efad2668472f8929d4
Author: Patrick Huang <pahuang at redhat.com>
Date: 2015-10-20 (Tue, 20 Oct 2015)
Changed paths:
M zanata-war/src/main/java/org/zanata/rest/service/ProjectsService.java
Log Message:
-----------
put back resteasy @Wrapped annotation for jaxb response
Commit: e47782034f2196fdb8e178122a80ed88d4a2cc9b
https://github.com/zanata/zanata-server/commit/e47782034f2196fdb8e178122a80ed88d4a2cc9b
Author: Patrick Huang <pahuang at redhat.com>
Date: 2015-10-21 (Wed, 21 Oct 2015)
Changed paths:
M pom.xml
M zanata-war/src/main/java/org/zanata/rest/service/ProjectsService.java
Log Message:
-----------
Merge pull request #1015 from zanata/fix-jersey-dependency
exclude jersey dependency from zanata-api
Commit: 6f4847bffc9f3e49de455391c9e6856be27bb1f6
https://github.com/zanata/zanata-server/commit/6f4847bffc9f3e49de455391c9e6856be27bb1f6
Author: Damian Jansen <djansen at redhat.com>
Date: 2015-10-21 (Wed, 21 Oct 2015)
Changed paths:
M functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java
M functional-test/src/main/java/org/zanata/page/languages/LanguagePage.java
M functional-test/src/main/java/org/zanata/page/projects/CreateProjectPage.java
M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectGeneralTab.java
M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectPermissionsTab.java
M functional-test/src/main/java/org/zanata/page/projectversion/CreateVersionPage.java
Log Message:
-----------
Merge pull request #1014 from zanata/fix-join-language-team-test
fix(test): Replace return this with return new Page
Commit: 5e7e898f89f42cc6d225f0196c1a88f6313daa5d
https://github.com/zanata/zanata-server/commit/5e7e898f89f42cc6d225f0196c1a88f6313daa5d
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-10-21 (Wed, 21 Oct 2015)
Changed paths:
M functional-test/src/test/java/org/zanata/feature/misc/FlakyTest.java
M pom.xml
Log Message:
-----------
Rerun flaky tests with Failsafe 2.19
Commit: 3597a60e63c8983ded6fd06ca26ab4e1542ac94e
https://github.com/zanata/zanata-server/commit/3597a60e63c8983ded6fd06ca26ab4e1542ac94e
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-10-22 (Thu, 22 Oct 2015)
Changed paths:
M functional-test/src/test/java/org/zanata/feature/editor/TranslateOpenOfficeTest.java
Log Message:
-----------
Merge pull request #1008 from zanata/fix-openoffice-test
test: clean documents dir between tests
Commit: 127edfeebd7b4bcce519a596c2a1988d3930d323
https://github.com/zanata/zanata-server/commit/127edfeebd7b4bcce519a596c2a1988d3930d323
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-10-22 (Thu, 22 Oct 2015)
Changed paths:
M zanata-war/src/main/webapp-jboss/WEB-INF/jboss-deployment-structure.xml
Log Message:
-----------
Merge pull request #967 from zanata/exclude-hibernate-search
Exclude Hibernate Search module
Commit: b82af6f025267ecbef8cb844ab56b4758f3d747c
https://github.com/zanata/zanata-server/commit/b82af6f025267ecbef8cb844ab56b4758f3d747c
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-10-22 (Thu, 22 Oct 2015)
Changed paths:
M zanata-war/src/main/java/org/zanata/ZanataInit.java
Log Message:
-----------
Fix lock message at startup
Commit: 0eefe29e733e7c62f2bbf7f9740e642768748f4b
https://github.com/zanata/zanata-server/commit/0eefe29e733e7c62f2bbf7f9740e642768748f4b
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-10-23 (Fri, 23 Oct 2015)
Changed paths:
M zanata-war/pom.xml
Log Message:
-----------
Update classloader-leak-prevention to 1.15.1
Commit: c6b42e8c5809e059a02e0693151b4f7773228874
https://github.com/zanata/zanata-server/commit/c6b42e8c5809e059a02e0693151b4f7773228874
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-10-23 (Fri, 23 Oct 2015)
Changed paths:
M zanata-war/pom.xml
Log Message:
-----------
Merge pull request #1016 from zanata/update-classloader-leak-prevention
Update classloader-leak-prevention to 1.15.1
Commit: 0b002b277645c2dea9d61ba891cc3fb9b8e6dcf8
https://github.com/zanata/zanata-server/commit/0b002b277645c2dea9d61ba891cc3fb9b8e6dcf8
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-10-23 (Fri, 23 Oct 2015)
Changed paths:
M zanata-war/src/main/java/org/zanata/ZanataInit.java
Log Message:
-----------
Merge pull request #1018 from zanata/fix-lock-message
Fix lock message at startup
Commit: 97ce1663901fcba09ea9c74adcc9e89c6c51da6d
https://github.com/zanata/zanata-server/commit/97ce1663901fcba09ea9c74adcc9e89c6c51da6d
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-10-23 (Fri, 23 Oct 2015)
Changed paths:
M functional-test/src/test/java/org/zanata/feature/misc/FlakyTest.java
M pom.xml
Log Message:
-----------
Merge pull request #1017 from zanata/failsafe219
Rerun flaky tests with Failsafe 2.19
Commit: 12ca0a8d61cf098d3448fd47f1e0759bd2ccd6df
https://github.com/zanata/zanata-server/commit/12ca0a8d61cf098d3448fd47f1e0759bd2ccd6df
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-10-23 (Fri, 23 Oct 2015)
Changed paths:
M pom.xml
M zanata-war/pom.xml
Log Message:
-----------
Upgrade to groovy 2.4.5
Commit: afa3e1d49cd1f240e93ef3bc5f97675322b20304
https://github.com/zanata/zanata-server/commit/afa3e1d49cd1f240e93ef3bc5f97675322b20304
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-10-23 (Fri, 23 Oct 2015)
Changed paths:
M zanata-war/src/main/java/org/zanata/ZanataInit.java
M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
M zanata-war/src/test/resources/META-INF/persistence.xml
M zanata-war/src/test/resources/arquillian/persistence.xml
Log Message:
-----------
Use native Lucene locks for NFS safety
Commit: 7322d60a58566980fd599d8192cfd554b54e8c88
https://github.com/zanata/zanata-server/commit/7322d60a58566980fd599d8192cfd554b54e8c88
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-10-23 (Fri, 23 Oct 2015)
Changed paths:
M zanata-model/src/main/java/org/zanata/hibernate/search/DefaultAnalyzer.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.java
Log Message:
-----------
Merge pull request #1005 from zanata/fix-npe
Add more checks for bad/stale TM results
Commit: 0d5f57320ad7a11da8f49f47c95aa42c727b1b90
https://github.com/zanata/zanata-server/commit/0d5f57320ad7a11da8f49f47c95aa42c727b1b90
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-10-23 (Fri, 23 Oct 2015)
Changed paths:
M functional-test/src/test/java/org/zanata/feature/misc/FlakyTest.java
M pom.xml
M zanata-model/src/main/java/org/zanata/hibernate/search/DefaultAnalyzer.java
M zanata-war/src/main/java/org/zanata/ZanataInit.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.java
Log Message:
-----------
Merge remote-tracking branch 'origin/release' into integration/master
Commit: c57fee78443f17f66a0d78d9ebe08a2c3a0bb24c
https://github.com/zanata/zanata-server/commit/c57fee78443f17f66a0d78d9ebe08a2c3a0bb24c
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-10-26 (Mon, 26 Oct 2015)
Changed paths:
M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
Log Message:
-----------
Work around path problem for JavaMelody
On some platforms, the MonitoringFilter has no init parameters
by the time requests come in, which causes JavaMelody to appear
under /monitoring instead of /admin/monitoring. This change uses
a servlet context parameter instead of a filter parameter.
Commit: 7c87b489a6dcfe741bcec209cbf71d01212d88c2
https://github.com/zanata/zanata-server/commit/7c87b489a6dcfe741bcec209cbf71d01212d88c2
Author: Alex Eng <aeng at redhat.com>
Date: 2015-10-27 (Tue, 27 Oct 2015)
Changed paths:
M docs/release-notes.md
M zanata-war/src/main/webapp/WEB-INF/layout/version/merge_trans_modal.xhtml
Log Message:
-----------
fix(merge translation):Translation merge targets the wrong source version
https://zanata.atlassian.net/browse/ZNTA-719
Squashed commit of the following:
commit d7d15cc50fc625d2d58cd46c626dd18fde2f0f77
Merge: d48dabd adb46eb
Author: Alex Eng <aeng at redhat.com>
Date: Tue Oct 20 07:58:22 2015 +1000
Merge branch 'integration/master' into ZTA-719
commit d48dabd75c4766408fbd25d1f74a3eafaff0edd5
Author: Alex Eng <aeng at redhat.com>
Date: Wed Oct 14 08:22:10 2015 +1000
fix(merge translation):Translation merge targets the wrong source version
https://zanata.atlassian.net/browse/ZNTA-719
Commit: a5b8697671105418263a533aa91a5b6febc1c698
https://github.com/zanata/zanata-server/commit/a5b8697671105418263a533aa91a5b6febc1c698
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-10-28 (Wed, 28 Oct 2015)
Changed paths:
M pom.xml
M zanata-war/pom.xml
Log Message:
-----------
Merge pull request #1020 from zanata/groovy24
Upgrade to groovy 2.4.5
Commit: ffcbe4dd63a9b1deb3acc906790fc1e412126477
https://github.com/zanata/zanata-server/commit/ffcbe4dd63a9b1deb3acc906790fc1e412126477
Author: Luke Brooker <mail at lukebrooker.com>
Date: 2015-10-28 (Wed, 28 Oct 2015)
Changed paths:
M zanata-war/src/main/webapp/WEB-INF/layout/version-group/languages-tab.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/version-group/projects-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/template/footer.xhtml
M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
M zanata-war/src/main/webapp/iteration/view.xhtml
M zanata-war/src/main/webapp/resources/zanata/list-filter.xhtml
M zanata-war/src/main/webapp/resources/zanata/loader.xhtml
M zanata-war/src/main/webapp/version-group/version_group.xhtml
Log Message:
-----------
Merge pull request #995 from zanata/ZNTA-115-scrolable-panels
adjust markup and function calls for scrollable panels
Commit: 44f3fa294669c4676ef59a7252dba444d8976a81
https://github.com/zanata/zanata-server/commit/44f3fa294669c4676ef59a7252dba444d8976a81
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-10-28 (Wed, 28 Oct 2015)
Changed paths:
M zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
A zanata-war/src/main/resources/db/mysql/add_missing_fks.sql
Log Message:
-----------
Merge pull request #983 from zanata/add-missing-fks
Add any missing foreign keys
Commit: 3c910899f970fe9c2e031aaf8dc4caa270bb7bf9
https://github.com/zanata/zanata-server/commit/3c910899f970fe9c2e031aaf8dc4caa270bb7bf9
Author: Zanata Build Server <jenkins at zanata.org>
Date: 2015-10-28 (Wed, 28 Oct 2015)
Changed paths:
M zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
A zanata-war/src/main/resources/db/mysql/add_missing_fks.sql
Log Message:
-----------
Merge commit '44f3fa294669c4676ef59a7252dba444d8976a81' into HEAD
Commit: ead75e479b38ac90272fdcf4b571286dc2fbf3b9
https://github.com/zanata/zanata-server/commit/ead75e479b38ac90272fdcf4b571286dc2fbf3b9
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-10-28 (Wed, 28 Oct 2015)
Changed paths:
M pom.xml
Log Message:
-----------
Upgrade to Liquibase 3.4.1
Commit: 712debfdda2621d642585b484109c0cf01e97f32
https://github.com/zanata/zanata-server/commit/712debfdda2621d642585b484109c0cf01e97f32
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-10-28 (Wed, 28 Oct 2015)
Changed paths:
M zanata-war/src/main/resources/org/zanata/email/templates/email_request_to_join_language.vm
Log Message:
-----------
Fix email message generated when user joining team
Commit: 14a7d7ab6e9d9b308c0171f73e3ead9880fa2369
https://github.com/zanata/zanata-server/commit/14a7d7ab6e9d9b308c0171f73e3ead9880fa2369
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-10-28 (Wed, 28 Oct 2015)
Changed paths:
M zanata-war/src/main/java/org/zanata/ZanataInit.java
M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
M zanata-war/src/test/resources/META-INF/persistence.xml
M zanata-war/src/test/resources/arquillian/persistence.xml
Log Message:
-----------
Merge pull request #1021 from zanata/lucene-simple-locks
Use native Lucene locks for NFS safety
Commit: 68b3783893693bfa216e10b43dced560ecd388c8
https://github.com/zanata/zanata-server/commit/68b3783893693bfa216e10b43dced560ecd388c8
Author: Zanata Build Server <jenkins at zanata.org>
Date: 2015-10-28 (Wed, 28 Oct 2015)
Changed paths:
M zanata-war/src/main/java/org/zanata/ZanataInit.java
M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
M zanata-war/src/test/resources/META-INF/persistence.xml
M zanata-war/src/test/resources/arquillian/persistence.xml
Log Message:
-----------
Merge commit '14a7d7ab6e9d9b308c0171f73e3ead9880fa2369' into HEAD
Commit: 8793c9a005f23ed119eb6c6016f1222a961c60cd
https://github.com/zanata/zanata-server/commit/8793c9a005f23ed119eb6c6016f1222a961c60cd
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-10-28 (Wed, 28 Oct 2015)
Changed paths:
M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
Log Message:
-----------
Merge pull request #1023 from zanata/fix-javamelody-path
Work around path problem for JavaMelody
Commit: 6f9231bd43c197aafadd7292f60a308f45528072
https://github.com/zanata/zanata-server/commit/6f9231bd43c197aafadd7292f60a308f45528072
Author: Zanata Build Server <jenkins at zanata.org>
Date: 2015-10-28 (Wed, 28 Oct 2015)
Changed paths:
M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
Log Message:
-----------
Merge commit '8793c9a005f23ed119eb6c6016f1222a961c60cd' into HEAD
Commit: 2b0666c5f2b037ae6279e0b809f552067b475ff5
https://github.com/zanata/zanata-server/commit/2b0666c5f2b037ae6279e0b809f552067b475ff5
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-10-29 (Thu, 29 Oct 2015)
Changed paths:
M zanata-war/src/main/resources/org/zanata/email/templates/email_request_to_join_language.vm
Log Message:
-----------
Merge pull request #1026 from zanata/fix-email-message
Fix email message generated when user joining team
Commit: 6613309dabb37ac8d188011eb653de16fec7fcd2
https://github.com/zanata/zanata-server/commit/6613309dabb37ac8d188011eb653de16fec7fcd2
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-10-29 (Thu, 29 Oct 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-jboss/WEB-INF/jboss-deployment-structure.xml
M zanata-war/src/test/java/org/zanata/util/CommonMarkRendererTest.java
A zanata-war/src/test/java/org/zanata/util/Repeat.java
A zanata-war/src/test/java/org/zanata/util/RepeatRule.java
Log Message:
-----------
Merge pull request #999 from zanata/nashorn
Use Nashorn for CommonMark rendering
Commit: e78f3e5c4748ae4e69112872dc9d5dfe09999c11
https://github.com/zanata/zanata-server/commit/e78f3e5c4748ae4e69112872dc9d5dfe09999c11
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-10-29 (Thu, 29 Oct 2015)
Changed paths:
M zanata-war/src/main/resources/org/zanata/email/templates/email_request_to_join_language.vm
Log Message:
-----------
Merge remote-tracking branch 'origin/release' into integration/master
Commit: 66c9d2fcafdcd6f3e64baced7139618ac08faa03
https://github.com/zanata/zanata-server/commit/66c9d2fcafdcd6f3e64baced7139618ac08faa03
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2015-10-29 (Thu, 29 Oct 2015)
Changed paths:
M zanata-overlay/common/bin/zanata-installer/InstallZanata.groovy
Log Message:
-----------
chore(installer): minor changes to the installer script
Ask for confirmation before downloading zanata.war
Download war from github instead of sourceforge
Commit: 51f9dd808664963aaa89a79169e9749c693317c4
https://github.com/zanata/zanata-server/commit/51f9dd808664963aaa89a79169e9749c693317c4
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-11-02 (Mon, 02 Nov 2015)
Changed paths:
M pom.xml
Log Message:
-----------
Merge pull request #1025 from zanata/ZNTA-705-liquibase34
Upgrade to Liquibase 3.4.1
Commit: 4f26d4012e6823d8855e6e6de92a436c59cbe461
https://github.com/zanata/zanata-server/commit/4f26d4012e6823d8855e6e6de92a436c59cbe461
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2015-11-02 (Mon, 02 Nov 2015)
Changed paths:
M docs/release-notes.md
A zanata-war/src/main/java/org/zanata/exception/AjaxViewExpiredExceptionHandler.java
A zanata-war/src/main/java/org/zanata/exception/AjaxViewExpiredExceptionHandlerFactory.java
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml
M zanata-war/src/main/webapp/WEB-INF/faces-config.xml
M zanata-war/src/main/webapp/WEB-INF/pages.xml
A zanata-war/src/main/webapp/error/viewexpiredexception.xhtml
Log Message:
-----------
fix(ZNTA-639): handle ViewExpiredException
Handle these type of exceptions both in ajax and non-ajax requests.
For ajax requests, inform the user and ask them to reload.
For non-ajax requests, inform the user and offer to head back to the
original page.
Squashed commit of the following:
commit 40dd9a42f3cb1d2ad9b0b7a4d7acf11d2011bba6
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: Thu Oct 1 12:07:30 2015 +1000
fix(ZNTA-639): add issue to release notes
commit 84154310849fae87fdacd874ee157b09f0885152
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: Mon Sep 28 14:00:56 2015 +1000
fix(ZNTA-639): disable transaction event listener
Disable the listener that creates a JSF event whenever a transaction
fails.
commit 51baf5654aae4e729bfe55818f3b1bf6f3cc6422
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: Mon Sep 28 13:27:35 2015 +1000
fix(ZNTA-639): code review fixes
commit 66af8bf42217dd88cf024570d78be3ccbf347a31
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: Sun Sep 27 15:30:43 2015 +1000
fix(ZNTA-639): handle ViewExpiredException
Handle these type of exceptions both in ajax and non-ajax requests.
For ajax requests, inform the user and ask them to reload.
For non-ajax requests, inform the user and offer to head back to the
original page.
Commit: f17949faafab8565531874f4a41715aa4871360d
https://github.com/zanata/zanata-server/commit/f17949faafab8565531874f4a41715aa4871360d
Author: Carlos Munoz <chavo16 at hotmail.com>
Date: 2015-11-03 (Tue, 03 Nov 2015)
Changed paths:
M zanata-overlay/common/bin/zanata-installer/InstallZanata.groovy
Log Message:
-----------
Merge pull request #1027 from zanata/installer-updates
chore(installer): minor changes to the installer script
Commit: 0ab5b405818d16d94a78f2c1388a6f3e179a4d3a
https://github.com/zanata/zanata-server/commit/0ab5b405818d16d94a78f2c1388a6f3e179a4d3a
Author: Alex Eng <aeng at redhat.com>
Date: 2015-11-05 (Thu, 05 Nov 2015)
Changed paths:
M docs/release-notes.md
A docs/user-guide/system-admin/configuration/mac-installation.md
M frontend/pom.xml
A frontend/src/main/web/.gitignore
A frontend/src/main/web/README.md
A frontend/src/main/web/copy.sh
A frontend/src/main/web/index.css
A frontend/src/main/web/index.html
A frontend/src/main/web/index.js
A frontend/src/main/web/lib/actions/GlossaryActions.js
A frontend/src/main/web/lib/actions/UserMatrixActions.js
A frontend/src/main/web/lib/components/CalendarMonthMatrix.jsx
A frontend/src/main/web/lib/components/CalendarPeriodHeading.jsx
A frontend/src/main/web/lib/components/CategoryItemMatrix.jsx
A frontend/src/main/web/lib/components/CategoryMatrixTable.jsx
A frontend/src/main/web/lib/components/ContentStateFilter.jsx
A frontend/src/main/web/lib/components/ContributionChart.jsx
A frontend/src/main/web/lib/components/DayMatrix.jsx
A frontend/src/main/web/lib/components/DropDown.jsx
A frontend/src/main/web/lib/components/FilterableMatrixTable.jsx
A frontend/src/main/web/lib/components/MessageModal.jsx
A frontend/src/main/web/lib/components/RecentContributions.jsx
A frontend/src/main/web/lib/components/RootContent.jsx
A frontend/src/main/web/lib/components/SystemGlossary.jsx
A frontend/src/main/web/lib/components/UserProfile.jsx
A frontend/src/main/web/lib/components/glossary/ActionCell.jsx
A frontend/src/main/web/lib/components/glossary/ColumnHeader.jsx
A frontend/src/main/web/lib/components/glossary/Comment.jsx
A frontend/src/main/web/lib/components/glossary/DataTable.jsx
A frontend/src/main/web/lib/components/glossary/DeleteEntryModal.jsx
A frontend/src/main/web/lib/components/glossary/ImportModal.jsx
A frontend/src/main/web/lib/components/glossary/InputCell.jsx
A frontend/src/main/web/lib/components/glossary/LoadingCell.jsx
A frontend/src/main/web/lib/components/glossary/NewEntryModal.jsx
A frontend/src/main/web/lib/components/glossary/SourceActionCell.jsx
A frontend/src/main/web/lib/components/glossary/__tests__/ActionCellTest.js
A frontend/src/main/web/lib/constants/ActionTypes.js
A frontend/src/main/web/lib/constants/Configs.js
A frontend/src/main/web/lib/constants/Options.js
A frontend/src/main/web/lib/constants/Views.js
A frontend/src/main/web/lib/dispatchers/GlossaryDispatcher.js
A frontend/src/main/web/lib/dispatchers/UserMatrixDispatcher.js
A frontend/src/main/web/lib/stores/GlossaryAPIStore.js
A frontend/src/main/web/lib/stores/GlossaryStore.js
A frontend/src/main/web/lib/stores/UserMatrixStore.js
A frontend/src/main/web/lib/stores/__mocks__/superagent.js
A frontend/src/main/web/lib/stores/__tests__/GlossaryStoreTest.js
A frontend/src/main/web/lib/stores/__tests__/UserMatrixStoreTest.js
A frontend/src/main/web/lib/stores/testData/glossary/entries.json
A frontend/src/main/web/lib/stores/testData/glossary/info.json
A frontend/src/main/web/lib/stores/testData/stats/user/test-user.json
A frontend/src/main/web/lib/utils/DateHelper.js
A frontend/src/main/web/lib/utils/GlossaryHelper.js
A frontend/src/main/web/lib/utils/StringUtils.js
A frontend/src/main/web/lib/utils/__tests__/GlossaryHelperTest.js
A frontend/src/main/web/lib/utils/__tests__/StringUtilsTest.js
A frontend/src/main/web/package.json
A frontend/src/main/web/preprocessor.js
A frontend/src/main/web/server.js
R frontend/src/main/web/user-profile-page/README.md
R frontend/src/main/web/user-profile-page/copy.sh
R frontend/src/main/web/user-profile-page/index.html
R frontend/src/main/web/user-profile-page/index.js
R frontend/src/main/web/user-profile-page/lib/actions/Actions.js
R frontend/src/main/web/user-profile-page/lib/components/CalendarMonthMatrix.jsx
R frontend/src/main/web/user-profile-page/lib/components/CalendarPeriodHeading.jsx
R frontend/src/main/web/user-profile-page/lib/components/CategoryItemMatrix.jsx
R frontend/src/main/web/user-profile-page/lib/components/CategoryMatrixTable.jsx
R frontend/src/main/web/user-profile-page/lib/components/ContentStateFilter.jsx
R frontend/src/main/web/user-profile-page/lib/components/ContributionChart.jsx
R frontend/src/main/web/user-profile-page/lib/components/DayMatrix.jsx
R frontend/src/main/web/user-profile-page/lib/components/DropDown.jsx
R frontend/src/main/web/user-profile-page/lib/components/FilterableMatrixTable.jsx
R frontend/src/main/web/user-profile-page/lib/components/RecentContributions.jsx
R frontend/src/main/web/user-profile-page/lib/constants/ActionTypes.js
R frontend/src/main/web/user-profile-page/lib/constants/Configs.js
R frontend/src/main/web/user-profile-page/lib/constants/Options.js
R frontend/src/main/web/user-profile-page/lib/dispatchers/UserMatrixDispatcher.js
R frontend/src/main/web/user-profile-page/lib/stores/UserMatrixStore.js
R frontend/src/main/web/user-profile-page/lib/stores/__mocks__/superagent.js
R frontend/src/main/web/user-profile-page/lib/stores/__tests__/UserMatrixStoreTest.js
R frontend/src/main/web/user-profile-page/lib/stores/userStats.json
R frontend/src/main/web/user-profile-page/lib/utils/DateHelper.js
R frontend/src/main/web/user-profile-page/npm-shrinkwrap.json
R frontend/src/main/web/user-profile-page/package.json
R frontend/src/main/web/user-profile-page/preprocessor.js
R frontend/src/main/web/user-profile-page/server.js
R frontend/src/main/web/user-profile-page/webpack.config.js
R frontend/src/main/web/user-profile-page/webpack.prod.config.js
A frontend/src/main/web/webpack.config.js
A frontend/src/main/web/webpack.prod.config.js
M functional-test/src/main/java/org/zanata/page/BasePage.java
R functional-test/src/main/java/org/zanata/page/glossary/GlossaryPage.java
M functional-test/src/test/java/org/zanata/feature/clientserver/ProjectMaintainerTest.java
M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryAdminTest.java
R functional-test/src/test/java/org/zanata/feature/glossary/GlossaryDeleteTest.java
M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryPushTest.java
M functional-test/src/test/java/org/zanata/feature/testharness/TestPlan.java
M zanata-model/src/main/java/org/zanata/model/HGlossaryEntry.java
M zanata-model/src/main/java/org/zanata/model/HGlossaryTerm.java
R zanata-model/src/main/java/org/zanata/model/HTermComment.java
A zanata-model/src/main/java/org/zanata/util/GlossaryUtil.java
M zanata-model/src/main/java/org/zanata/util/ZanataEntities.java
M zanata-test-war/src/main/java/org/zanata/util/SampleProjectProfile.java
M zanata-war/src/main/java/org/zanata/action/GlossaryAction.java
M zanata-war/src/main/java/org/zanata/action/ProfileHome.java
M zanata-war/src/main/java/org/zanata/dao/GlossaryDAO.java
A zanata-war/src/main/java/org/zanata/exception/DuplicateGlossaryEntryException.java
A zanata-war/src/main/java/org/zanata/liquibase/custom/GenerateHashForGlossaryEntry.java
A zanata-war/src/main/java/org/zanata/liquibase/custom/MigrateHTermCommentToString.java
A zanata-war/src/main/java/org/zanata/rest/editor/dto/Permission.java
M zanata-war/src/main/java/org/zanata/rest/editor/dto/User.java
M zanata-war/src/main/java/org/zanata/rest/editor/service/UserService.java
M zanata-war/src/main/java/org/zanata/rest/editor/service/resource/UserResource.java
M zanata-war/src/main/java/org/zanata/rest/service/GlossaryService.java
M zanata-war/src/main/java/org/zanata/service/GlossaryFileService.java
M zanata-war/src/main/java/org/zanata/service/impl/GlossaryFileServiceImpl.java
M zanata-war/src/main/java/org/zanata/util/DateUtil.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/GlossaryDetailsPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryDetailsDisplay.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryDetailsView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryDetailsView.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetGlossaryDetailsHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateGlossaryTermHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/model/GlossaryDetails.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/UpdateGlossaryTermAction.java
M zanata-war/src/main/resources/db/changelogs/db.changelog-3.8.xml
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
R zanata-war/src/main/webapp/WEB-INF/layout/glossary/upload_glossary_modal.xhtml
A zanata-war/src/main/webapp/WEB-INF/template/template_ui.xhtml
M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
M zanata-war/src/main/webapp/glossary/view.xhtml
M zanata-war/src/main/webapp/profile/home.xhtml
M zanata-war/src/test/java/org/zanata/dao/GlossaryDAOTest.java
M zanata-war/src/test/java/org/zanata/model/HGlossaryEntryJPATest.java
M zanata-war/src/test/java/org/zanata/rest/editor/dto/UserTest.java
M zanata-war/src/test/java/org/zanata/rest/editor/service/UserServiceTest.java
M zanata-war/src/test/java/org/zanata/rest/service/raw/GlossaryRawRestITCase.java
A zanata-war/src/test/java/org/zanata/service/impl/GlossaryFileServiceImplTest.java
M zanata-war/src/test/java/org/zanata/service/impl/LockManagerServiceImplTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/GlossaryDetailsPresenterTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetGlossaryDetailsCommand.java
M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/UpdateGlossaryTermHandlerTest.java
M zanata-war/src/test/resources/META-INF/persistence.xml
M zanata-war/src/test/resources/arquillian/persistence.xml
M zanata-war/src/test/resources/org/zanata/test/model/ClearAllTables.dbunit.xml
M zanata-war/src/test/resources/org/zanata/test/model/GlossaryData.dbunit.xml
M zanata-war/src/test/resources/performance/GlossaryTest.dbunit.xml
Log Message:
-----------
Glossary management update
https://zanata.atlassian.net/browse/ZNTA-108
Squashed commit of the following:
commit 15d1640a0872ff150561f7d51ed787c175b446a6
Author: Alex Eng <aeng at redhat.com>
Date: Tue Nov 3 15:24:18 2015 +0900
Fix unit test
commit d3fa0a4f72c9da3c32ee973660b01211052ae69b
Merge: adda6ed f17949f
Author: Alex Eng <aeng at redhat.com>
Date: Tue Nov 3 14:42:15 2015 +0900
Merge branch 'integration/master' into rhbz1245433-glossary
commit adda6ede3d1061566b3beca64338a5d414b9b056
Author: Alex Eng <aeng at redhat.com>
Date: Fri Oct 23 10:52:46 2015 +1000
Fix upload file notification
commit 88f86a2f205ab60639f68dc842d62cd7e6391c8a
Merge: 07c2977 127edfe
Author: Alex Eng <aeng at redhat.com>
Date: Fri Oct 23 10:13:44 2015 +1000
Merge branch 'integration/master' into rhbz1245433-glossary
commit 07c2977ccf12fa455b08c679dc2d4a9c1a2903aa
Author: Alex Eng <aeng at redhat.com>
Date: Thu Oct 22 16:10:34 2015 +1000
Update notification model
commit 3f561211bb69dadb42464fcc4c9fc8276e6f05cb
Author: Alex Eng <aeng at redhat.com>
Date: Thu Oct 22 12:17:29 2015 +1000
Update warning message when uploading file
commit 81148109017f80a5b4c00ee26166d53964a8aafc
Author: Alex Eng <aeng at redhat.com>
Date: Wed Oct 21 20:42:23 2015 +1000
Add warning message when duplicate entry
commit 2bd5898cef309f7df3388509e6706ac8486c1a4f
Author: Luke Brooker <mail at lukebrooker.com>
Date: Wed Oct 21 15:21:33 2015 +1000
Remove webpack debug and read shrink-wrap
commit d6d71414776fce022113b9d1d659d29757402760
Author: Luke Brooker <mail at lukebrooker.com>
Date: Wed Oct 21 14:12:29 2015 +1000
Ignore front-end build script
commit 3fa8fe30e8aae106cbe4bbb9146fd57ee7493cc1
Author: Alex Eng <aeng at redhat.com>
Date: Wed Oct 21 14:38:23 2015 +1000
Fix auto saving for glossary entry
commit bae5f9aa07d703b396ccb56130afbce9b22067df
Merge: e137199 6f4847b
Author: Alex Eng <aeng at redhat.com>
Date: Wed Oct 21 11:20:58 2015 +1000
Merge branch 'integration/master' into rhbz1245433-glossary
commit e1371999db1e06c5e2c0839b24e0164294c3f884
Author: Alex Eng <aeng at redhat.com>
Date: Tue Oct 20 14:41:49 2015 +1000
Update zanata-ui
commit 4e353afa287c00bc73a8a8bc74526220621265a3
Merge: 40af402 e4dfd91
Author: Alex Eng <aeng at redhat.com>
Date: Mon Oct 19 08:26:17 2015 +1000
Merge branch 'integration/master' into rhbz1245433-glossary
commit 40af4026bef5dc7fd0c1c3e85df8db8f40438065
Author: Alex Eng <aeng at redhat.com>
Date: Fri Oct 16 15:53:56 2015 +1000
Add notification modal for message
commit 8653e88295e09a92380470d9de8f0b89ee9f0e23
Author: Alex Eng <aeng at redhat.com>
Date: Thu Oct 15 17:47:03 2015 +1000
More refactoring based on review comment
commit 9cb00d61df58b47c9273dfa3dcf5949f7e02ac80
Author: Alex Eng <aeng at redhat.com>
Date: Thu Oct 15 16:22:19 2015 +1000
Update glossary term lastModifiedBy
commit 72d3361457d49b7758b76c12828ffbe0904fc967
Author: Alex Eng <aeng at redhat.com>
Date: Thu Oct 15 12:51:19 2015 +1000
Update field name
commit 31375a05216e023fe19425048a0e2a4e0c14d2fb
Author: Alex Eng <aeng at redhat.com>
Date: Wed Oct 14 09:09:49 2015 +1000
Remove shrinkwrap
commit 2082345817e6cbcc8f008180f9e89f3ab04baedd
Author: Alex Eng <aeng at redhat.com>
Date: Tue Oct 13 19:58:53 2015 +1000
Add prod-debug config
commit eb8bc739c4bbe8eac675b41e6219e04fbf5b9d8e
Author: Alex Eng <aeng at redhat.com>
Date: Tue Oct 13 08:18:55 2015 +1000
update shrinkwrap
commit 17b2363b1b87d12f6eed8ca90f7080faa7499811
Author: Luke Brooker <mail at lukebrooker.com>
Date: Fri Oct 9 10:26:06 2015 +1000
Updated zanata-ui to use npm dependency
And small plural adaption fix when deleting a term
commit 284ab24b5da0e9e47631d38eee8207a2cf3de5db
Author: Alex Eng <aeng at redhat.com>
Date: Thu Oct 8 21:40:15 2015 +1000
Refactor frontend module - review 1
commit 2686163285e5f7814913ee4f6e1becc63674d151
Author: Alex Eng <aeng at redhat.com>
Date: Wed Oct 7 13:09:30 2015 +1000
Refactor react module for glossary
commit 947ecb43d917bb248a37e07b555645c7b67e3e55
Author: Alex Eng <aeng at redhat.com>
Date: Tue Oct 6 06:05:29 2015 +1000
Remove unused method
commit 3c57ca901f5d424540c37356df6055d189b72b0b
Author: Alex Eng <aeng at redhat.com>
Date: Thu Oct 1 10:09:45 2015 +1000
Update shrinkwrap and delete button
commit 25f55cda006688d9bdc3004cd961c0f87c4d7a4b
Author: Alex Eng <aeng at redhat.com>
Date: Wed Sep 30 08:33:06 2015 +1000
Rename method name in UserService
commit db9e3f62903f6ada03ef673e8da903f5c3bb9a83
Author: Alex Eng <aeng at redhat.com>
Date: Tue Sep 29 16:08:55 2015 +1000
Fix checkstyle
commit e2633bef6a3d3719ebc6ff263a28ac195f6b19d8
Author: Alex Eng <aeng at redhat.com>
Date: Tue Sep 29 15:22:30 2015 +1000
fix cancel button
commit 8a8355be2fe1ff9af01b15d93216f43c8270b83e
Author: Alex Eng <aeng at redhat.com>
Date: Tue Sep 29 09:34:53 2015 +1000
Update shrinkwrap.json
commit 9c0dec75fe2fe9a5f241f87ab3cb2d974a0c2fd7
Merge: 6319a1d 5cbc534
Author: Alex Eng <aeng at redhat.com>
Date: Mon Sep 28 16:38:48 2015 +1000
Merge branch 'integration/master' into rhbz1245433-glossary
commit 6319a1d07d3830de6df3ecde41ffcdee07d0eb21
Author: Alex Eng <aeng at redhat.com>
Date: Mon Sep 28 16:30:00 2015 +1000
Add delete confirmation
commit 75ef3ff03178fd7b3732b776cb63b0b6adfb09d4
Merge: b7c9240 a380e6e
Author: Alex Eng <aeng at redhat.com>
Date: Fri Sep 25 19:59:46 2015 +1000
Merge branch 'rhbz1245433-glossary' of github.com:zanata/zanata-server into rhbz1245433-glossary
commit b7c9240a1d9f5743c244a0469980cfd703456916
Author: Alex Eng <aeng at redhat.com>
Date: Fri Sep 25 19:59:18 2015 +1000
WIP: component test
commit a380e6ebaae2250b3224f003d75870f4eb90151d
Author: Luke Brooker <mail at lukebrooker.com>
Date: Fri Sep 25 16:48:16 2015 +1000
Design tweaks to modal and language selection
commit 293acb48c3308ed53e57ff80f9d9a26c10b641de
Author: Alex Eng <aeng at redhat.com>
Date: Fri Sep 25 10:59:25 2015 +1000
Update functional test
commit c5e021e86ea4bc71855e40068b082d01ca1f8a46
Author: Alex Eng <aeng at redhat.com>
Date: Fri Sep 25 10:48:26 2015 +1000
Refactor upload file modal
commit 8603dd72ac7370194e4f13790163e1177a17f4ba
Author: Alex Eng <aeng at redhat.com>
Date: Thu Sep 24 16:15:11 2015 +1000
New glossary modal
commit 08f110d4a96d4909605e4bf6ab74c2188f7b3713
Author: Alex Eng <aeng at redhat.com>
Date: Thu Sep 24 16:02:40 2015 +1000
Fix css for span cell
commit 8465e6a8896f3b5bf2d82b702fe6c08898b0728a
Author: Alex Eng <aeng at redhat.com>
Date: Thu Sep 24 15:53:34 2015 +1000
Unit test on glossary store
commit 5ae90be06a677c78c5279b8304e6359d5021e1d2
Author: Alex Eng <aeng at redhat.com>
Date: Thu Sep 24 11:33:21 2015 +1000
Listener from InputCell
commit 9b38b394474bb42f8177d796e982d7b811a09675
Author: Alex Eng <aeng at redhat.com>
Date: Thu Sep 24 08:52:26 2015 +1000
Add glossaryhelper test
commit 0dce13a1be093b4253fbb5c975a9b1f37766937c
Author: Alex Eng <aeng at redhat.com>
Date: Wed Sep 23 21:18:04 2015 +1000
Fix listener warning
commit c8445d345c119afd4e717e1591207c031236478a
Author: Alex Eng <aeng at redhat.com>
Date: Wed Sep 23 16:16:36 2015 +1000
Add hovering on row
commit 6945b391db5068a6f8cd1f46acb7994ae12aab9d
Merge: 4bd8a0d 05f5b7f
Author: Alex Eng <aeng at redhat.com>
Date: Wed Sep 23 14:52:06 2015 +1000
Merge branch 'integration/master' into rhbz1245433-glossary
commit 4bd8a0d68cd4602b707fc31501b509363bab1842
Author: Alex Eng <aeng at redhat.com>
Date: Tue Sep 22 16:16:23 2015 +1000
Implement hover and focus behaviour
commit 2ef007c75012cd846f7ff30edac7d8f202c82ec8
Author: Alex Eng <aeng at redhat.com>
Date: Tue Sep 22 10:32:33 2015 +1000
Update test
commit c8beff944fb6067548f4f847a06d9bc8024561ca
Author: Alex Eng <aeng at redhat.com>
Date: Mon Sep 21 13:17:20 2015 +1000
Fix comment and DataTable selection
commit ec39c975d76200193438735c23a4cd4041f33bef
Author: Alex Eng <aeng at redhat.com>
Date: Fri Sep 18 14:06:24 2015 +1000
Create comment component
commit 5856a729a5704d68d819bbb846a7572277b3be4c
Author: Alex Eng <aeng at redhat.com>
Date: Fri Sep 18 09:02:27 2015 +1000
Refactor datatable for glossary
commit 9ad9f5760aa001241dc458f1ed2fdc4617ee0a26
Author: Alex Eng <aeng at redhat.com>
Date: Thu Sep 17 16:06:09 2015 +1000
Add component for comment
commit 16cb36f88f9da63501af99032f60dfadc3fe1a7a
Author: Alex Eng <aeng at redhat.com>
Date: Thu Sep 17 15:29:36 2015 +1000
Add integration test for glossary service
commit b07b9941b25a71ebc4655148f524b93ac8ea1154
Author: Alex Eng <aeng at redhat.com>
Date: Thu Sep 17 08:40:54 2015 +1000
Add unit test for glossary file service
commit 6282ce9468ac9701ff8ad0e034b3dbe5b200b41f
Author: Alex Eng <aeng at redhat.com>
Date: Wed Sep 16 14:07:05 2015 +1000
Add allowSort on header
commit 8aaee9d2aef534454b1909239c5859b62c3066c2
Author: Alex Eng <aeng at redhat.com>
Date: Wed Sep 16 09:51:33 2015 +1000
Update shrinkwrap.json
commit d490b6c1cf9a064e9c2f3792a52660a563e990fb
Author: Alex Eng <aeng at redhat.com>
Date: Wed Sep 16 09:47:57 2015 +1000
Add tooltip component
commit 43f00b39383b980ade1cd3445c1856c079d1f9c7
Author: Alex Eng <aeng at redhat.com>
Date: Tue Sep 15 16:38:24 2015 +1000
Fix glossary search
commit 80801120f47524c34fdb4c997ebb6c34b6c17789
Author: Alex Eng <aeng at redhat.com>
Date: Tue Sep 15 08:58:35 2015 +1000
Update shrinkwrap.json
commit 78d34a4ccf3b2d3c28cae12b8d449a1e05291b8b
Author: Alex Eng <aeng at redhat.com>
Date: Mon Sep 14 16:52:04 2015 +1000
Implement glossary permission
commit ce1ed7f5d408cb913d45e49243d6bbf6703de79b
Author: Alex Eng <aeng at redhat.com>
Date: Mon Sep 14 16:35:09 2015 +1000
Fix glossary loading
commit 6d43adcae74b5e5d8db823d0fbfbdf5b207ff352
Author: Alex Eng <aeng at redhat.com>
Date: Mon Sep 14 11:29:05 2015 +1000
fix modified entry
commit 18c29f2629a985eae750ab4300ba492932dd8b03
Author: Alex Eng <aeng at redhat.com>
Date: Mon Sep 14 09:27:23 2015 +1000
Fix user information
commit 5cc7f51e99f8c8915f8845f42bab72a18b7e826b
Author: Luke Brooker <mail at lukebrooker.com>
Date: Fri Sep 11 16:41:08 2015 +1000
Replace pre with span on cell
commit d39c5d06db2e84867044fdab8baf0346504beb50
Author: Luke Brooker <mail at lukebrooker.com>
Date: Fri Sep 11 16:40:46 2015 +1000
Add loading cell
commit 5b26a018affba7ab1490eb40099f72746e1c2986
Author: Luke Brooker <mail at lukebrooker.com>
Date: Fri Sep 11 16:40:23 2015 +1000
Update icons
commit d84511288aca17504df2d6c9b8e625250975cad4
Author: Luke Brooker <mail at lukebrooker.com>
Date: Fri Sep 11 15:49:55 2015 +1000
Update search with new input options
commit 66f1656656d79aa73bcc8e79a0d056e1c9033889
Author: Alex Eng <aeng at redhat.com>
Date: Fri Sep 11 15:10:45 2015 +1000
Refactor user profile endpoint
commit bba05a81dd320106f25c801d474df3060370c360
Author: Alex Eng <aeng at redhat.com>
Date: Fri Sep 11 11:12:28 2015 +1000
Implement action cell
commit 2b5a0eaab370e67de27f386133890644a5d7ee39
Author: Alex Eng <aeng at redhat.com>
Date: Thu Sep 10 15:46:27 2015 +1000
WIP: action cell
commit 18aa597241e8d40163c9414f93bf3bc12fe2e323
Author: Alex Eng <aeng at redhat.com>
Date: Thu Sep 10 09:32:55 2015 +1000
Implement file upload for glossary
commit 4eb7953ae0db735050cf357d823e0978f922d65d
Author: Alex Eng <aeng at redhat.com>
Date: Tue Sep 8 14:23:12 2015 +1000
WIP: uploading file
commit ec32e3c3693b443ba446bfd8f79f09cf88cf0916
Merge: 4fddb56 a2d0f30
Author: Alex Eng <aeng at redhat.com>
Date: Tue Sep 8 11:37:06 2015 +1000
Merge branch 'rhbz1245433-glossary' of github.com:zanata/zanata-server into rhbz1245433-glossary
commit 4fddb5640a6cbebf68f0278d79dd02086cb39ea2
Author: Alex Eng <aeng at redhat.com>
Date: Tue Sep 8 11:36:39 2015 +1000
WIP: sorting for table header
commit a2d0f303c36b2b30924fe5c724040b9a212a01da
Author: Luke Brooker <mail at lukebrooker.com>
Date: Mon Sep 7 15:11:47 2015 +1000
Remove need for extra fixed-data-table CSS
commit ff1904f3faf79ead9a91e9be152be6275655e90e
Author: Alex Eng <aeng at redhat.com>
Date: Fri Sep 4 15:52:27 2015 +1000
WIP: bind focused row to state
commit 6ab96db37e978c318c67056348f374a237dd861e
Author: Alex Eng <aeng at redhat.com>
Date: Fri Sep 4 13:30:00 2015 +1000
Add loading, new template for glossary
commit d1268d6f2d6da0aca526b4cbbe0f308f82f11009
Author: Alex Eng <aeng at redhat.com>
Date: Fri Sep 4 13:29:38 2015 +1000
Add loading, new template for glossary
commit 0c9d8b0e0e1546c3c450a5a5bb234a24904c3951
Author: Alex Eng <aeng at redhat.com>
Date: Fri Sep 4 10:13:54 2015 +1000
Fix search input
commit f73e853da68a375e772941785e16a6d240db6b14
Author: Alex Eng <aeng at redhat.com>
Date: Thu Sep 3 20:03:35 2015 +1000
WIP: fix infinite scroll
commit ad5bd0ae4e1e1ab2108e0605de7babe8d41d5436
Author: Luke Brooker <mail at lukebrooker.com>
Date: Thu Sep 3 15:11:46 2015 +1000
Fix row height and placeholder
commit 120fbc39fbd8d3c5434cf38362cc19cff3bbad8f
Author: Luke Brooker <mail at lukebrooker.com>
Date: Tue Sep 1 12:14:54 2015 +1000
Fix search input and row height
commit 39aea21ae813560bcf5254e66a52462fd4cad9c5
Author: Alex Eng <aeng at redhat.com>
Date: Thu Sep 3 15:20:42 2015 +1000
WIP: infinite scroll for glossary table
commit dfde467b1aef1f575189bd8634ce3d2de8488cc2
Author: Alex Eng <aeng at redhat.com>
Date: Thu Sep 3 14:47:29 2015 +1000
WIP: infinite scroll for glossary data table
commit f17787753415aaeb91b7018a3f8ffd85a463ae7d
Author: Alex Eng <aeng at redhat.com>
Date: Wed Sep 2 17:33:58 2015 +1000
Remove data state from glossary table
commit 49263b6229c689c5a170e018e8bcdc1623935eab
Author: Alex Eng <aeng at redhat.com>
Date: Tue Sep 1 16:30:19 2015 +1000
WIP: add glossary search
commit bb4c5cdc446e51e47733b0d9246b95ae312ec71c
Author: Alex Eng <aeng at redhat.com>
Date: Tue Sep 1 09:09:31 2015 +1000
WIP: source and translation data table
commit ca4be077e38a75d26b758449f269aa6a7758d444
Author: Alex Eng <aeng at redhat.com>
Date: Mon Aug 31 16:12:23 2015 +1000
WIP: infinate scroll
commit a8a8c8d8da2ce03dc0b42426f448832efdb4a131
Author: Alex Eng <aeng at redhat.com>
Date: Mon Aug 31 16:12:00 2015 +1000
WIP: infinate scroll
commit beccc91f5a396b6d30bf4de6107de530484f7a84
Merge: 48e0e23 926071a
Author: Luke Brooker <mail at lukebrooker.com>
Date: Mon Aug 31 12:38:24 2015 +1000
Merge branch 'rhbz1245433-glossary' of github.com:zanata/zanata-server into rhbz1245433-glossary
# By Alex Eng
# Via Alex Eng
* 'rhbz1245433-glossary' of github.com:zanata/zanata-server:
Bind clear, update and save action for glossary entry
Conflicts:
frontend/src/main/web/lib/stores/GlossaryStore.js
commit 48e0e2333b3a4a3ba8d67f72c98a61324c5a7231
Author: Luke Brooker <mail at lukebrooker.com>
Date: Mon Aug 31 12:34:58 2015 +1000
Update Data Table UI
commit 926071a5889f278f1b6f80df3340a946126c762f
Author: Alex Eng <aeng at redhat.com>
Date: Mon Aug 31 11:22:11 2015 +1000
Bind clear, update and save action for glossary entry
commit 6e9869476ab60511480d1641635d7c20842b3525
Author: Luke Brooker <mail at lukebrooker.com>
Date: Mon Aug 31 10:28:58 2015 +1000
Update new components to work with existing data
commit ccc2cff94f977e1a6a3891714a62426b4570996b
Merge: 0ce82e8 1f268ef
Author: Luke Brooker <mail at lukebrooker.com>
Date: Fri Aug 28 22:27:02 2015 +1000
Merge branches 'rhbz1245433-glossary' and 'rhbz1245433-glossary' of github.com:zanata/zanata-server into rhbz1245433-glossary
# By Alex Eng
# Via Alex Eng
* 'rhbz1245433-glossary' of github.com:zanata/zanata-server:
WIP: glossary data table
# By Alex Eng
# Via Alex Eng
* 'rhbz1245433-glossary' of github.com:zanata/zanata-server:
WIP: glossary data table
Conflicts:
frontend/src/main/web/index.html
frontend/src/main/web/lib/components/GlossaryDataTable.jsx
frontend/src/main/web/lib/components/SystemGlossary.jsx
frontend/src/main/web/lib/stores/GlossaryStore.js
commit 0ce82e881384477dca2247e252f6ba45169dd0d5
Author: Luke Brooker <mail at lukebrooker.com>
Date: Fri Aug 28 22:22:19 2015 +1000
Working integration with zanata-ui
commit 1f268ef8297db8ac40b3e4b7d46648faf341edaf
Author: Alex Eng <aeng at redhat.com>
Date: Fri Aug 14 14:05:02 2015 +1000
WIP: glossary data table
commit 084340e847389d348c1c6b1d9776d38780e494aa
Author: Alex Eng <aeng at redhat.com>
Date: Fri Aug 14 14:05:02 2015 +1000
WIP: glossary data table
commit d9bcf195f25c5706bc4e115c5d9ed817431002e0
Author: Alex Eng <aeng at redhat.com>
Date: Fri Aug 14 09:56:05 2015 +1000
Fix tests
commit a1b72752ed125283dc8fa952cf011f0005a0a716
Author: Alex Eng <aeng at redhat.com>
Date: Thu Aug 13 16:51:54 2015 +1000
Modified test data with new structure
commit 458c1d6a679b19b4484f2cdefb95b17376fe9012
Merge: 1ec2a30 9d0387e
Author: Alex Eng <aeng at redhat.com>
Date: Thu Aug 13 14:12:44 2015 +1000
Merge branch 'integration/master' into rhbz1245433-glossary
commit 1ec2a30e782f9e28b6dc19a9b7633776a94d7b73
Author: Alex Eng <aeng at redhat.com>
Date: Tue Aug 11 16:36:46 2015 +1000
WIP: add pos, and description for glossary entity
commit 1de186f2b1df2b166111201687d2d5bda2bed0b2
Author: Alex Eng <aeng at redhat.com>
Date: Fri Aug 7 16:30:02 2015 +1000
WIP: fixed-data-table
commit c0ed8ccabb5976646462bcee43996e05bc80f884
Author: Alex Eng <aeng at redhat.com>
Date: Wed Aug 5 16:19:39 2015 +1000
Add lastmodified person to HGlossaryTerm
commit d596cefcd88123c0f75f9ff562025c5e4cd632b6
Author: Alex Eng <aeng at redhat.com>
Date: Tue Aug 4 15:44:27 2015 +1000
WIP: implement glossary add, update and delete action
commit da1a90e4c528a3d05939a19ba5acba66d69576ac
Author: Alex Eng <aeng at redhat.com>
Date: Tue Aug 4 11:11:03 2015 +1000
Add delete glossary method
commit 86c23ddb081a9cabb4e4d43db69ce09ac49194bb
Author: Alex Eng <aeng at redhat.com>
Date: Tue Aug 4 10:43:11 2015 +1000
Load glossary when locale selected
commit aa2d6a396fb52bbce495fafc7374a4cc95c0d8ef
Author: Alex Eng <aeng at redhat.com>
Date: Mon Aug 3 16:07:34 2015 +1000
Add glossary store and event in frontend
commit 66d179d585b0f9d16186fb7441ffef32dee38534
Author: Alex Eng <aeng at redhat.com>
Date: Thu Jul 30 11:41:33 2015 +1000
Implement delete glossary, get glossary locale stats API
commit 0fff2413f299cc3eae78aaada6692ae4bbf2c2c7
Author: Alex Eng <aeng at redhat.com>
Date: Thu Jul 30 11:20:36 2015 +1000
Move 'User' creation to UserService
commit 58105651f080fbfa0cc3075ce9840abf38638b90
Author: Alex Eng <aeng at redhat.com>
Date: Wed Jul 29 14:21:57 2015 +1000
Add testing page for different views
commit eca30c7a56dd8fb53777fb536d434d1a46d1f167
Author: Alex Eng <aeng at redhat.com>
Date: Tue Jul 28 16:28:14 2015 +1000
Refactor frontend for different view
commit 724697d768fe60d91211e385434806b6296dcf2d
Author: Alex Eng <aeng at redhat.com>
Date: Tue Jul 28 10:50:56 2015 +1000
Move user-profile-page as frontend package
Commit: 4b45b0b3b841f82487f5cfe9d92d29352abc488c
https://github.com/zanata/zanata-server/commit/4b45b0b3b841f82487f5cfe9d92d29352abc488c
Author: Alex Eng <aeng at redhat.com>
Date: 2015-11-06 (Fri, 06 Nov 2015)
Changed paths:
M frontend/src/main/web/lib/components/glossary/DataTable.jsx
M frontend/src/main/web/lib/components/glossary/InputCell.jsx
M frontend/src/main/web/lib/components/glossary/NewEntryModal.jsx
M zanata-war/src/main/java/org/zanata/service/impl/GlossaryFileServiceImpl.java
Log Message:
-----------
fix(glossary): limit glossary input field
https://zanata.atlassian.net/browse/ZNTA-755
https://zanata.atlassian.net/browse/ZNTA-753
Commit: c3f27464bf209fb1bc32ce1fff4b3181bbb1ffb6
https://github.com/zanata/zanata-server/commit/c3f27464bf209fb1bc32ce1fff4b3181bbb1ffb6
Author: Alex Eng <aeng at redhat.com>
Date: 2015-11-06 (Fri, 06 Nov 2015)
Changed paths:
M frontend/src/main/web/lib/components/glossary/DataTable.jsx
M frontend/src/main/web/lib/components/glossary/InputCell.jsx
M frontend/src/main/web/lib/components/glossary/NewEntryModal.jsx
M zanata-war/src/main/java/org/zanata/service/impl/GlossaryFileServiceImpl.java
Log Message:
-----------
Merge pull request #1030 from zanata/ZNTA-573
fix(glossary): limit glossary input field
Commit: b5e69b5018d1d42b4974bca7a880b3186e85eb6b
https://github.com/zanata/zanata-server/commit/b5e69b5018d1d42b4974bca7a880b3186e85eb6b
Author: Alex Eng <aeng at redhat.com>
Date: 2015-11-06 (Fri, 06 Nov 2015)
Changed paths:
M docs/release-notes.md
A docs/user-guide/system-admin/configuration/mac-installation.md
M frontend/pom.xml
A frontend/src/main/web/.gitignore
A frontend/src/main/web/README.md
A frontend/src/main/web/copy.sh
A frontend/src/main/web/index.css
A frontend/src/main/web/index.html
A frontend/src/main/web/index.js
A frontend/src/main/web/lib/actions/GlossaryActions.js
A frontend/src/main/web/lib/actions/UserMatrixActions.js
A frontend/src/main/web/lib/components/CalendarMonthMatrix.jsx
A frontend/src/main/web/lib/components/CalendarPeriodHeading.jsx
A frontend/src/main/web/lib/components/CategoryItemMatrix.jsx
A frontend/src/main/web/lib/components/CategoryMatrixTable.jsx
A frontend/src/main/web/lib/components/ContentStateFilter.jsx
A frontend/src/main/web/lib/components/ContributionChart.jsx
A frontend/src/main/web/lib/components/DayMatrix.jsx
A frontend/src/main/web/lib/components/DropDown.jsx
A frontend/src/main/web/lib/components/FilterableMatrixTable.jsx
A frontend/src/main/web/lib/components/MessageModal.jsx
A frontend/src/main/web/lib/components/RecentContributions.jsx
A frontend/src/main/web/lib/components/RootContent.jsx
A frontend/src/main/web/lib/components/SystemGlossary.jsx
A frontend/src/main/web/lib/components/UserProfile.jsx
A frontend/src/main/web/lib/components/glossary/ActionCell.jsx
A frontend/src/main/web/lib/components/glossary/ColumnHeader.jsx
A frontend/src/main/web/lib/components/glossary/Comment.jsx
A frontend/src/main/web/lib/components/glossary/DataTable.jsx
A frontend/src/main/web/lib/components/glossary/DeleteEntryModal.jsx
A frontend/src/main/web/lib/components/glossary/ImportModal.jsx
A frontend/src/main/web/lib/components/glossary/InputCell.jsx
A frontend/src/main/web/lib/components/glossary/LoadingCell.jsx
A frontend/src/main/web/lib/components/glossary/NewEntryModal.jsx
A frontend/src/main/web/lib/components/glossary/SourceActionCell.jsx
A frontend/src/main/web/lib/components/glossary/__tests__/ActionCellTest.js
A frontend/src/main/web/lib/constants/ActionTypes.js
A frontend/src/main/web/lib/constants/Configs.js
A frontend/src/main/web/lib/constants/Options.js
A frontend/src/main/web/lib/constants/Views.js
A frontend/src/main/web/lib/dispatchers/GlossaryDispatcher.js
A frontend/src/main/web/lib/dispatchers/UserMatrixDispatcher.js
A frontend/src/main/web/lib/stores/GlossaryAPIStore.js
A frontend/src/main/web/lib/stores/GlossaryStore.js
A frontend/src/main/web/lib/stores/UserMatrixStore.js
A frontend/src/main/web/lib/stores/__mocks__/superagent.js
A frontend/src/main/web/lib/stores/__tests__/GlossaryStoreTest.js
A frontend/src/main/web/lib/stores/__tests__/UserMatrixStoreTest.js
A frontend/src/main/web/lib/stores/testData/glossary/entries.json
A frontend/src/main/web/lib/stores/testData/glossary/info.json
A frontend/src/main/web/lib/stores/testData/stats/user/test-user.json
A frontend/src/main/web/lib/utils/DateHelper.js
A frontend/src/main/web/lib/utils/GlossaryHelper.js
A frontend/src/main/web/lib/utils/StringUtils.js
A frontend/src/main/web/lib/utils/__tests__/GlossaryHelperTest.js
A frontend/src/main/web/lib/utils/__tests__/StringUtilsTest.js
A frontend/src/main/web/package.json
A frontend/src/main/web/preprocessor.js
A frontend/src/main/web/server.js
R frontend/src/main/web/user-profile-page/README.md
R frontend/src/main/web/user-profile-page/copy.sh
R frontend/src/main/web/user-profile-page/index.html
R frontend/src/main/web/user-profile-page/index.js
R frontend/src/main/web/user-profile-page/lib/actions/Actions.js
R frontend/src/main/web/user-profile-page/lib/components/CalendarMonthMatrix.jsx
R frontend/src/main/web/user-profile-page/lib/components/CalendarPeriodHeading.jsx
R frontend/src/main/web/user-profile-page/lib/components/CategoryItemMatrix.jsx
R frontend/src/main/web/user-profile-page/lib/components/CategoryMatrixTable.jsx
R frontend/src/main/web/user-profile-page/lib/components/ContentStateFilter.jsx
R frontend/src/main/web/user-profile-page/lib/components/ContributionChart.jsx
R frontend/src/main/web/user-profile-page/lib/components/DayMatrix.jsx
R frontend/src/main/web/user-profile-page/lib/components/DropDown.jsx
R frontend/src/main/web/user-profile-page/lib/components/FilterableMatrixTable.jsx
R frontend/src/main/web/user-profile-page/lib/components/RecentContributions.jsx
R frontend/src/main/web/user-profile-page/lib/constants/ActionTypes.js
R frontend/src/main/web/user-profile-page/lib/constants/Configs.js
R frontend/src/main/web/user-profile-page/lib/constants/Options.js
R frontend/src/main/web/user-profile-page/lib/dispatchers/UserMatrixDispatcher.js
R frontend/src/main/web/user-profile-page/lib/stores/UserMatrixStore.js
R frontend/src/main/web/user-profile-page/lib/stores/__mocks__/superagent.js
R frontend/src/main/web/user-profile-page/lib/stores/__tests__/UserMatrixStoreTest.js
R frontend/src/main/web/user-profile-page/lib/stores/userStats.json
R frontend/src/main/web/user-profile-page/lib/utils/DateHelper.js
R frontend/src/main/web/user-profile-page/npm-shrinkwrap.json
R frontend/src/main/web/user-profile-page/package.json
R frontend/src/main/web/user-profile-page/preprocessor.js
R frontend/src/main/web/user-profile-page/server.js
R frontend/src/main/web/user-profile-page/webpack.config.js
R frontend/src/main/web/user-profile-page/webpack.prod.config.js
A frontend/src/main/web/webpack.config.js
A frontend/src/main/web/webpack.prod.config.js
M functional-test/src/main/java/org/zanata/page/BasePage.java
R functional-test/src/main/java/org/zanata/page/glossary/GlossaryPage.java
M functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java
M functional-test/src/main/java/org/zanata/page/languages/LanguagePage.java
M functional-test/src/main/java/org/zanata/page/projects/CreateProjectPage.java
M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectGeneralTab.java
M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectPermissionsTab.java
M functional-test/src/main/java/org/zanata/page/projectversion/CreateVersionPage.java
M functional-test/src/test/java/org/zanata/feature/clientserver/ProjectMaintainerTest.java
M functional-test/src/test/java/org/zanata/feature/editor/TranslateOpenOfficeTest.java
M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryAdminTest.java
R functional-test/src/test/java/org/zanata/feature/glossary/GlossaryDeleteTest.java
M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryPushTest.java
M functional-test/src/test/java/org/zanata/feature/misc/FlakyTest.java
M functional-test/src/test/java/org/zanata/feature/testharness/TestPlan.java
M pom.xml
M zanata-model/src/main/java/org/zanata/hibernate/search/DateBridge.java
M zanata-model/src/main/java/org/zanata/hibernate/search/DefaultAnalyzer.java
M zanata-model/src/main/java/org/zanata/model/HGlossaryEntry.java
M zanata-model/src/main/java/org/zanata/model/HGlossaryTerm.java
R zanata-model/src/main/java/org/zanata/model/HTermComment.java
A zanata-model/src/main/java/org/zanata/util/GlossaryUtil.java
M zanata-model/src/main/java/org/zanata/util/ZanataEntities.java
M zanata-overlay/common/bin/zanata-installer/InstallZanata.groovy
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/GlossaryAction.java
M zanata-war/src/main/java/org/zanata/action/MergeTransAction.java
M zanata-war/src/main/java/org/zanata/action/ProfileHome.java
M zanata-war/src/main/java/org/zanata/dao/GlossaryDAO.java
A zanata-war/src/main/java/org/zanata/exception/AjaxViewExpiredExceptionHandler.java
A zanata-war/src/main/java/org/zanata/exception/AjaxViewExpiredExceptionHandlerFactory.java
A zanata-war/src/main/java/org/zanata/exception/DuplicateGlossaryEntryException.java
A zanata-war/src/main/java/org/zanata/liquibase/custom/GenerateHashForGlossaryEntry.java
A zanata-war/src/main/java/org/zanata/liquibase/custom/MigrateHTermCommentToString.java
A zanata-war/src/main/java/org/zanata/rest/editor/dto/Permission.java
M zanata-war/src/main/java/org/zanata/rest/editor/dto/User.java
M zanata-war/src/main/java/org/zanata/rest/editor/service/UserService.java
M zanata-war/src/main/java/org/zanata/rest/editor/service/resource/UserResource.java
M zanata-war/src/main/java/org/zanata/rest/service/GlossaryService.java
M zanata-war/src/main/java/org/zanata/rest/service/ProjectsService.java
M zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java
M zanata-war/src/main/java/org/zanata/service/GlossaryFileService.java
M zanata-war/src/main/java/org/zanata/service/impl/GlossaryFileServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.java
M zanata-war/src/main/java/org/zanata/util/CommonMarkRenderer.java
M zanata-war/src/main/java/org/zanata/util/DateUtil.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/GlossaryDetailsPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryDetailsDisplay.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryDetailsView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryDetailsView.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetGlossaryDetailsHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateGlossaryTermHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/model/GlossaryDetails.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/UpdateGlossaryTermAction.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
A zanata-war/src/main/resources/db/mysql/add_missing_fks.sql
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/resources/org/zanata/email/templates/email_request_to_join_language.vm
M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml
M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
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/faces-config.xml
R zanata-war/src/main/webapp/WEB-INF/layout/glossary/upload_glossary_modal.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/version-group/languages-tab.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/version-group/projects-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/merge_trans_modal.xhtml
M zanata-war/src/main/webapp/WEB-INF/pages.xml
M zanata-war/src/main/webapp/WEB-INF/template/footer.xhtml
M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
A zanata-war/src/main/webapp/WEB-INF/template/template_ui.xhtml
M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
M zanata-war/src/main/webapp/app/config.json
M zanata-war/src/main/webapp/app/css/app.css
M zanata-war/src/main/webapp/app/index.html
M zanata-war/src/main/webapp/app/js/app.js
M zanata-war/src/main/webapp/app/js/libs.js
M zanata-war/src/main/webapp/app/js/templates.js
M zanata-war/src/main/webapp/app/maps/app.js.map
M zanata-war/src/main/webapp/app/maps/libs.js.map
A zanata-war/src/main/webapp/error/viewexpiredexception.xhtml
M zanata-war/src/main/webapp/glossary/view.xhtml
M zanata-war/src/main/webapp/iteration/view.xhtml
M zanata-war/src/main/webapp/profile/home.xhtml
M zanata-war/src/main/webapp/resources/zanata/list-filter.xhtml
M zanata-war/src/main/webapp/resources/zanata/loader.xhtml
M zanata-war/src/main/webapp/version-group/version_group.xhtml
M zanata-war/src/test/java/org/zanata/dao/GlossaryDAOTest.java
M zanata-war/src/test/java/org/zanata/model/HGlossaryEntryJPATest.java
M zanata-war/src/test/java/org/zanata/rest/editor/dto/UserTest.java
M zanata-war/src/test/java/org/zanata/rest/editor/service/UserServiceTest.java
M zanata-war/src/test/java/org/zanata/rest/service/raw/GlossaryRawRestITCase.java
A zanata-war/src/test/java/org/zanata/service/impl/GlossaryFileServiceImplTest.java
M zanata-war/src/test/java/org/zanata/service/impl/LockManagerServiceImplTest.java
M zanata-war/src/test/java/org/zanata/util/CommonMarkRendererTest.java
A zanata-war/src/test/java/org/zanata/util/Repeat.java
A zanata-war/src/test/java/org/zanata/util/RepeatRule.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/GlossaryDetailsPresenterTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetGlossaryDetailsCommand.java
M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/UpdateGlossaryTermHandlerTest.java
M zanata-war/src/test/resources/META-INF/persistence.xml
M zanata-war/src/test/resources/arquillian/persistence.xml
M zanata-war/src/test/resources/org/zanata/test/model/ClearAllTables.dbunit.xml
M zanata-war/src/test/resources/org/zanata/test/model/GlossaryData.dbunit.xml
M zanata-war/src/test/resources/performance/GlossaryTest.dbunit.xml
Log Message:
-----------
Merge branch 'integration/master' into ZNTA-555-user-request
Compare: https://github.com/zanata/zanata-server/compare/3fb837f7800a...b5e69b5018d1
More information about the zanata-commits
mailing list