Branch: refs/heads/redux-app
Home: https://github.com/zanata/zanata-server
Commit: b9faf632d9dc483ef630ad519159526d523f4b7b
https://github.com/zanata/zanata-server/commit/b9faf632d9dc483ef630ad519159526d523f4b7b
Author: Alex Eng <a...@redhat.com>
Date: 2016-04-15 (Fri, 15 Apr 2016)
Changed paths:
M docs/images/admin-contact-link.png
M docs/images/admin-menu-access.png
M docs/images/create-group.png
M docs/images/create-project.png
M docs/images/glossary-edit-trans.png
M docs/images/glossary-edit.png
M docs/images/glossary-new-term-modal.png
R docs/images/glossary-options.png
M docs/images/glossary-page.png
M docs/images/glossary-select-language.png
A docs/images/menu-dashboard.png
A docs/images/menu-more.png
M docs/user-guide/admin/contact-admin.md
M docs/user-guide/groups/create-group.md
M docs/user-guide/projects/create-project.md
M frontend/src/main/web/src/actions/common.js
M frontend/src/main/web/src/actions/explore.js
M frontend/src/main/web/src/actions/glossary.js
M frontend/src/main/web/src/components/GroupTeaser.jsx
M frontend/src/main/web/src/components/LanguageTeamTeaser.jsx
M frontend/src/main/web/src/components/ProjectTeaser.jsx
M frontend/src/main/web/src/components/TeaserList.jsx
M frontend/src/main/web/src/components/TeaserListHeader.jsx
M frontend/src/main/web/src/components/TextInput.jsx
M frontend/src/main/web/src/containers/Explore/index.js
M frontend/src/main/web/src/containers/Root.js
M zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java
M zanata-war/src/main/java/org/zanata/dao/VersionGroupDAO.java
M
zanata-war/src/main/java/org/zanata/rest/ZanataRestResponseInterceptor.java
M zanata-war/src/main/java/org/zanata/rest/search/dto/GroupSearchResult.java
M
zanata-war/src/main/java/org/zanata/rest/search/dto/ProjectSearchResult.java
M zanata-war/src/main/java/org/zanata/rest/search/service/SearchService.java
M zanata-war/src/main/java/org/zanata/rest/service/GlossaryService.java
Log Message:
-----------
Update docs
Commit: 6eb4256f928eaf571fa34e9d2af9ad9620ee49f9
https://github.com/zanata/zanata-server/commit/6eb4256f928eaf571fa34e9d2af9ad9620ee49f9
Author: Alex Eng <a...@redhat.com>
Date: 2016-04-15 (Fri, 15 Apr 2016)
Changed paths:
M README.md
M docs/release-notes.md
M docs/user-guide/system-admin/configuration/installation.md
A etc/scripts/quickbuild.sh
A functional-test/src/main/java/org/zanata/page/utility/Error404Page.java
M functional-test/src/main/java/org/zanata/workflow/ClientWorkFlow.java
M
functional-test/src/test/java/org/zanata/feature/clientserver/ProjectMaintainerTest.java
M
functional-test/src/test/java/org/zanata/feature/clientserver/PropertiesRoundTripTest.java
A
functional-test/src/test/java/org/zanata/feature/misc/PageNotFoundTest.java
M pom.xml
M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
A zanata-overlay/README.md
M zanata-overlay/build.gradle
A zanata-overlay/common/bin/standalone-zanata.bat
A zanata-overlay/common/bin/standalone-zanata.sh
R zanata-overlay/common/bin/zanata-installer/InstallZanata.groovy
R zanata-overlay/common/bin/zanata-installer/install.bat
R zanata-overlay/common/bin/zanata-installer/install.sh
R zanata-overlay/common/bin/zanata-installer/installer.properties
A zanata-overlay/common/standalone/configuration/zanata.properties
M
zanata-overlay/distros/wildfly/standalone/configuration/standalone-zanata.xml
M zanata-war/src/main/java/org/zanata/action/VersionHome.java
R
zanata-war/src/main/java/org/zanata/exception/AjaxViewExpiredExceptionHandler.java
R
zanata-war/src/main/java/org/zanata/exception/AjaxViewExpiredExceptionHandlerFactory.java
M
zanata-war/src/main/java/org/zanata/exception/handler/ViewExpiredExceptionHandler.java
R
zanata-war/src/main/java/org/zanata/seam/interceptor/MonitoringWrapper.java
M zanata-war/src/main/java/org/zanata/service/TranslationMergeService.java
M
zanata-war/src/main/java/org/zanata/service/impl/CopyVersionServiceImpl.java
M
zanata-war/src/main/java/org/zanata/service/impl/MergeTranslationsServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationMergeAuto.java
M
zanata-war/src/main/java/org/zanata/service/impl/TranslationMergeFirstTran.java
M
zanata-war/src/main/java/org/zanata/service/impl/TranslationMergeImport.java
M
zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
A zanata-war/src/main/java/org/zanata/servlet/JavaMelodyFilter.java
M zanata-war/src/main/java/org/zanata/servlet/UrlRewriteConfig.java
M zanata-war/src/main/java/org/zanata/util/UrlUtil.java
M zanata-war/src/main/resources/messages.properties
R zanata-war/src/main/resources/org/zanata/seam/resteasy/resteasy-2.3.xsd
M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
A zanata-war/src/main/webapp/404.xhtml
M zanata-war/src/main/webapp/WEB-INF/faces-config.xml
M zanata-war/src/test/java/org/zanata/arquillian/Deployments.java
M
zanata-war/src/test/java/org/zanata/service/impl/CopyVersionServiceImplTest.java
Log Message:
-----------
Merge branch 'master' into redux-app
Commit: 9fc8db29e11abf1a9f73c5dfac0638a98c89418b
https://github.com/zanata/zanata-server/commit/9fc8db29e11abf1a9f73c5dfac0638a98c89418b
Author: Alex Eng <a...@redhat.com>
Date: 2016-04-15 (Fri, 15 Apr 2016)
Changed paths:
M frontend/src/main/web/atomicCssConfig.js
M frontend/src/main/web/src/components/Nav.jsx
M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
Log Message:
-----------
fix on permission, style, search
Compare:
https://github.com/zanata/zanata-server/compare/8375a818d2a1...9fc8db29e11a
_______________________________________________
zanata-commits mailing list
zanata-commits@redhat.com
https://www.redhat.com/mailman/listinfo/zanata-commits