[zanata/zanata-server] ce51f9: fix(glossary): Fix glossary permission
GitHub
noreply at github.com
Thu Aug 27 01:01:24 UTC 2015
Branch: refs/heads/project-roles-ui
Home: https://github.com/zanata/zanata-server
Commit: ce51f92f454c1b2865166cea9aa39b3ff0a4508d
https://github.com/zanata/zanata-server/commit/ce51f92f454c1b2865166cea9aa39b3ff0a4508d
Author: Alex Eng <aeng at redhat.com>
Date: 2015-08-14 (Fri, 14 Aug 2015)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandler.java
M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandlerTest.java
Log Message:
-----------
fix(glossary): Fix glossary permission
https://zanata.atlassian.net/browse/ZNTA-615
Commit: 75c2f34c674f0f9ef397282c70db9195f8257909
https://github.com/zanata/zanata-server/commit/75c2f34c674f0f9ef397282c70db9195f8257909
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-08-18 (Tue, 18 Aug 2015)
Changed paths:
M etc/scripts/extractAppserver.groovy
Log Message:
-----------
chore: check appserver properties before use
Commit: 48ee1d0c49dda5430042feb413b452798be24a5e
https://github.com/zanata/zanata-server/commit/48ee1d0c49dda5430042feb413b452798be24a5e
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date: 2015-08-18 (Tue, 18 Aug 2015)
Changed paths:
M pom.xml
Log Message:
-----------
chore(dependency): update version for server-3.8.0
Commit: 13b26d875cbeff1beaac25a9d8f2570ad2988b8e
https://github.com/zanata/zanata-server/commit/13b26d875cbeff1beaac25a9d8f2570ad2988b8e
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date: 2015-08-20 (Thu, 20 Aug 2015)
Changed paths:
M pom.xml
Log Message:
-----------
fix(build): revert the zanata-assets to 7.4-SNAPSHOT
Commit: 5f04dba0373d781aa923cae5cfb963e3fd8b9f9b
https://github.com/zanata/zanata-server/commit/5f04dba0373d781aa923cae5cfb963e3fd8b9f9b
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-08-20 (Thu, 20 Aug 2015)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/LanguageAction.java
Log Message:
-----------
fix(ZNTA-629): check for null locale
Commit: aba3f2e57b31971723066748294e4fcd739100ac
https://github.com/zanata/zanata-server/commit/aba3f2e57b31971723066748294e4fcd739100ac
Author: Alex Eng <aeng at redhat.com>
Date: 2015-08-24 (Mon, 24 Aug 2015)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/VersionHome.java
Log Message:
-----------
fix(version language): Fix concurrent map modification
https://zanata.atlassian.net/browse/ZNTA-643
Commit: 67f685ab1dfe970dcf01f5f1980c6dca682b81b1
https://github.com/zanata/zanata-server/commit/67f685ab1dfe970dcf01f5f1980c6dca682b81b1
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date: 2015-08-24 (Mon, 24 Aug 2015)
Changed paths:
M pom.xml
Log Message:
-----------
Merge pull request #932 from zanata/server-3.8.0-depencency
chore(dependency): update version for server-3.8.0
Commit: 6ba040ca467347965f2907c4cd82c3697a16a4ef
https://github.com/zanata/zanata-server/commit/6ba040ca467347965f2907c4cd82c3697a16a4ef
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-08-24 (Mon, 24 Aug 2015)
Changed paths:
M zanata-war/pom.xml
Log Message:
-----------
fix(ZNTA-638): upgrade ehcache
Commit: 0f93756304fdfdabe5b5473ccaab870777315bee
https://github.com/zanata/zanata-server/commit/0f93756304fdfdabe5b5473ccaab870777315bee
Author: Alex Eng <aeng at redhat.com>
Date: 2015-08-24 (Mon, 24 Aug 2015)
Changed paths:
M pom.xml
Log Message:
-----------
Merge branch 'integration/master' into fix-concurrent-map
Commit: b04843b6daae9f8f91ae14f62dc238d7ea184938
https://github.com/zanata/zanata-server/commit/b04843b6daae9f8f91ae14f62dc238d7ea184938
Author: Alex Eng <aeng at redhat.com>
Date: 2015-08-24 (Mon, 24 Aug 2015)
Changed paths:
M functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java
M functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.java
Log Message:
-----------
fix(functional test): fix broken functional test
Commit: 9076adb423c0b8a5f06b5ef94dd0f2f8ea3e2281
https://github.com/zanata/zanata-server/commit/9076adb423c0b8a5f06b5ef94dd0f2f8ea3e2281
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2015-08-24 (Mon, 24 Aug 2015)
Changed paths:
M zanata-war/src/main/java/org/zanata/ZanataInit.java
Log Message:
-----------
feat(banner): change startup banner to show logo
Commit: 1cf92473034ffbe238a6ce6c707f218c2fbb9293
https://github.com/zanata/zanata-server/commit/1cf92473034ffbe238a6ce6c707f218c2fbb9293
Author: Alex Eng <aeng at redhat.com>
Date: 2015-08-25 (Tue, 25 Aug 2015)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/VersionHome.java
Log Message:
-----------
fix checkstyle
Commit: 82cdb572aa36eba3359a10bb6fbf24c391ab6097
https://github.com/zanata/zanata-server/commit/82cdb572aa36eba3359a10bb6fbf24c391ab6097
Author: Alex Eng <aeng at redhat.com>
Date: 2015-08-25 (Tue, 25 Aug 2015)
Changed paths:
M functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java
M functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.java
Log Message:
-----------
Merge pull request #943 from zanata/fix-functional-test
fix(functional test): fix broken functional test
Commit: cf0a3e196b7da474013eaaa405b8b5dcf5f4cc8f
https://github.com/zanata/zanata-server/commit/cf0a3e196b7da474013eaaa405b8b5dcf5f4cc8f
Author: Alex Eng <aeng at redhat.com>
Date: 2015-08-25 (Tue, 25 Aug 2015)
Changed paths:
M functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java
M functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.java
M pom.xml
M zanata-war/src/main/java/org/zanata/ZanataInit.java
Log Message:
-----------
Merge branch 'integration/master' into ZNTA-615-glossary-permission
Commit: d287c2d5fcc5c2fa40a5339b78d5db03a5991370
https://github.com/zanata/zanata-server/commit/d287c2d5fcc5c2fa40a5339b78d5db03a5991370
Author: Alex Eng <aeng at redhat.com>
Date: 2015-08-26 (Wed, 26 Aug 2015)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandler.java
M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandlerTest.java
Log Message:
-----------
Merge pull request #929 from zanata/ZNTA-615-glossary-permission
fix(glossary): Fix glossary permission
Commit: 15de1d5b53f266b71b87c9d810df4f7a37e580d7
https://github.com/zanata/zanata-server/commit/15de1d5b53f266b71b87c9d810df4f7a37e580d7
Author: Alex Eng <aeng at redhat.com>
Date: 2015-08-26 (Wed, 26 Aug 2015)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/VersionHome.java
Log Message:
-----------
Merge pull request #942 from zanata/fix-concurrent-map
fix(version language): Fix concurrent map modification
Commit: 298436f45959f0502b157b8eac40fb6b1652171f
https://github.com/zanata/zanata-server/commit/298436f45959f0502b157b8eac40fb6b1652171f
Author: Alex Eng <aeng at redhat.com>
Date: 2015-08-26 (Wed, 26 Aug 2015)
Changed paths:
M docs/release-notes.md
Log Message:
-----------
docs(release notes): update release notes for ZNTA-615 and ZNTA-643
Commit: 5e54acfb0af3a60f5220228f8ad813f3d9606002
https://github.com/zanata/zanata-server/commit/5e54acfb0af3a60f5220228f8ad813f3d9606002
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-08-26 (Wed, 26 Aug 2015)
Changed paths:
M zanata-war/pom.xml
Log Message:
-----------
Merge pull request #941 from zanata/ZNTA-638-upgrade-ehcache
fix(ZNTA-638): upgrade ehcache
Commit: b5fe9305ff445485df437d77152fb85a95b74e03
https://github.com/zanata/zanata-server/commit/b5fe9305ff445485df437d77152fb85a95b74e03
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-08-26 (Wed, 26 Aug 2015)
Changed paths:
M etc/scripts/extractAppserver.groovy
Log Message:
-----------
Merge pull request #930 from zanata/check-appserver-properties
chore: check appserver properties before use
Commit: 3438fb2a5ccdced11ddd3283c9dddd7a70d6e461
https://github.com/zanata/zanata-server/commit/3438fb2a5ccdced11ddd3283c9dddd7a70d6e461
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-08-26 (Wed, 26 Aug 2015)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/LanguageAction.java
Log Message:
-----------
Merge pull request #936 from zanata/ZNTA-629-npe
fix(ZNTA-629): check for null locale
Commit: fb609abee79caba647ad12e19a867874fe564256
https://github.com/zanata/zanata-server/commit/fb609abee79caba647ad12e19a867874fe564256
Author: David Mason <drdmason at gmail.com>
Date: 2015-08-27 (Thu, 27 Aug 2015)
Changed paths:
M pom.xml
M zanata-model/src/main/java/org/zanata/model/HLocale.java
M zanata-model/src/main/java/org/zanata/model/HPerson.java
M zanata-model/src/main/java/org/zanata/model/HProject.java
A zanata-model/src/main/java/org/zanata/model/HProjectLocaleMember.java
A zanata-model/src/main/java/org/zanata/model/HProjectMember.java
A zanata-model/src/main/java/org/zanata/model/LocaleRole.java
M zanata-model/src/main/java/org/zanata/model/ModelEntityBase.java
A zanata-model/src/main/java/org/zanata/model/PersonProjectMemberships.java
A zanata-model/src/main/java/org/zanata/model/ProjectRole.java
A zanata-model/src/main/java/org/zanata/model/type/LocaleRoleDescriptor.java
A zanata-model/src/main/java/org/zanata/model/type/LocaleRoleType.java
A zanata-model/src/main/java/org/zanata/model/type/ProjectRoleDescriptor.java
A zanata-model/src/main/java/org/zanata/model/type/ProjectRoleType.java
M zanata-war/pom.xml
M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
M zanata-war/src/main/java/org/zanata/action/ProjectHomeAction.java
A zanata-war/src/main/java/org/zanata/action/ProjectPermissionDialog.java
M zanata-war/src/main/java/org/zanata/action/SortingType.java
M zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java
A zanata-war/src/main/java/org/zanata/dao/ProjectLocaleMemberDAO.java
A zanata-war/src/main/java/org/zanata/dao/ProjectMemberDAO.java
M zanata-war/src/main/java/org/zanata/rest/service/ProjectService.java
M zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java
M zanata-war/src/main/java/org/zanata/security/permission/PermissionGranter.java
M zanata-war/src/main/java/org/zanata/service/impl/RegisterServiceImpl.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
A zanata-war/src/main/webapp/WEB-INF/layout/project/people-tab.xhtml
A zanata-war/src/main/webapp/WEB-INF/layout/project/person-permissions-modal.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab-translation.xhtml
M zanata-war/src/main/webapp/project/project.xhtml
A zanata-war/src/main/webapp/resources/script/jsf-ajax-viewstate-fix.js
M zanata-war/src/main/webapp/resources/zanata/autocomplete.xhtml
A zanata-war/src/main/webapp/resources/zanata/person-permission-entry.xhtml
A zanata-war/src/main/webapp/resources/zanata/person-tile.xhtml
M zanata-war/src/test/resources/META-INF/persistence.xml
M zanata-war/src/test/resources/arquillian/persistence.xml
Log Message:
-----------
Merge branch 'project-roles-ui' into project-roles-final
Conflicts:
pom.xml
Just had assets version updated in the branch, and adjacent lines
had been updated in master. Kept assets version from branch and
the rest from master.
Compare: https://github.com/zanata/zanata-server/compare/fdb249453c02...fb609abee79c
More information about the zanata-commits
mailing list