[zanata/zanata-server] 469cc5: Merge branch 'master' into ZNTA-153-glossary-expor...
GitHub
noreply at github.com
Thu Jun 23 04:57:45 UTC 2016
Branch: refs/heads/ZNTA-153-glossary-export
Home: https://github.com/zanata/zanata-server
Commit: 469cc56b20f6d4394b4e57e507b7e1b0b026d34c
https://github.com/zanata/zanata-server/commit/469cc56b20f6d4394b4e57e507b7e1b0b026d34c
Author: Alex Eng <aeng at redhat.com>
Date: 2016-06-23 (Thu, 23 Jun 2016)
Changed paths:
M README.md
A docker/Dockerfile
A docker/README.md
A docker/conf/admin-user-setup.sql
A docker/conf/standalone.xml
A docker/rundb.sh
A docker/rundev.sh
A docs/favicon.ico
M frontend/README.md
R frontend/src/main/web/README.md
M frontend/src/main/web/src/actions/glossary.js
M frontend/src/main/web/src/components/OverlayTrigger/index.jsx
M frontend/src/main/web/src/reducers/glossary.js
M mkdocs.yml
M zanata-war/src/main/java/org/zanata/action/AuthenticationEvents.java
M zanata-war/src/main/java/org/zanata/file/FileSystemPersistService.java
R zanata-war/src/main/java/org/zanata/rest/editor/dto/Locale.java
M zanata-war/src/main/java/org/zanata/rest/editor/service/LocalesService.java
M zanata-war/src/main/java/org/zanata/rest/service/ProjectVersionService.java
M zanata-war/src/main/java/org/zanata/security/ZanataIdentity.java
M zanata-war/src/main/java/org/zanata/util/EssentialDataCreator.java
M zanata-war/src/main/java/org/zanata/webtrans/client/Application.java
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/version-group/settings-tab.xhtml
A zanata-war/src/main/webapp/app/bundle.css
A zanata-war/src/main/webapp/app/bundle.css.map
A zanata-war/src/main/webapp/app/bundle.js
A zanata-war/src/main/webapp/app/bundle.js.map
R zanata-war/src/main/webapp/app/config.json
R zanata-war/src/main/webapp/app/css/app.css
R zanata-war/src/main/webapp/app/css/libs.css
R zanata-war/src/main/webapp/app/images/logo-loader/loader.svg
R zanata-war/src/main/webapp/app/images/logo-loader/logo.svg
M zanata-war/src/main/webapp/app/index.html
R zanata-war/src/main/webapp/app/js/app.js
R zanata-war/src/main/webapp/app/js/libs.js
R zanata-war/src/main/webapp/app/js/templates.js
R zanata-war/src/main/webapp/app/maps/app.js.map
R zanata-war/src/main/webapp/app/maps/libs.js.map
R zanata-war/src/main/webapp/app/translations/de.json
R zanata-war/src/main/webapp/app/translations/fr.json
R zanata-war/src/main/webapp/app/translations/locales
R zanata-war/src/test/java/org/zanata/rest/editor/dto/LocaleTest.java
M zanata-war/src/test/java/org/zanata/rest/service/ProjectVersionServiceUnitTest.java
Log Message:
-----------
Merge branch 'master' into ZNTA-153-glossary-export
More information about the zanata-commits
mailing list