Branch: refs/heads/redux-app
  Home:   https://github.com/zanata/zanata-server
  Commit: b081b768022d49a161b862004d8d14fa86748bfd
      
https://github.com/zanata/zanata-server/commit/b081b768022d49a161b862004d8d14fa86748bfd
  Author: Luke Brooker <m...@lukebrooker.com>
  Date:   2016-03-21 (Mon, 21 Mar 2016)

  Changed paths:
    M frontend/src/main/web/package.json
    A frontend/src/main/web/src/actions/explore.js
    M frontend/src/main/web/src/actions/glossary.js
    M frontend/src/main/web/src/components/EditableText.js
    A frontend/src/main/web/src/components/LanguageTeamTeaser.jsx
    M frontend/src/main/web/src/components/Nav.jsx
    A frontend/src/main/web/src/components/PersonTeaser.jsx
    A frontend/src/main/web/src/components/ProjectTeaser.jsx
    A frontend/src/main/web/src/components/TeaserList.jsx
    A frontend/src/main/web/src/components/TeaserListHeader.jsx
    M frontend/src/main/web/src/components/index.js
    M frontend/src/main/web/src/containers/App.js
    A frontend/src/main/web/src/containers/Explore/index.jsx
    M frontend/src/main/web/src/containers/Glossary/index.js
    M frontend/src/main/web/src/containers/Root.js
    M frontend/src/main/web/src/containers/UserProfile/CalendarMonthMatrix.jsx
    M frontend/src/main/web/src/containers/UserProfile/index.jsx
    M frontend/src/main/web/src/index.js
    A frontend/src/main/web/src/reducers/explore.js
    M frontend/src/main/web/src/reducers/index.js
    M frontend/src/main/web/src/schemas.js
    M frontend/src/main/web/src/utils/DateHelper.js
    M frontend/src/main/web/src/utils/GlossaryHelper.js
    M frontend/src/main/web/webpack.dev.config.js

  Log Message:
  -----------
  WIP: Basic integration of search/explore page


  Commit: 4a6025d1a4abcf3e466cb244b7007c92a21710bc
      
https://github.com/zanata/zanata-server/commit/4a6025d1a4abcf3e466cb244b7007c92a21710bc
  Author: Luke Brooker <m...@lukebrooker.com>
  Date:   2016-03-21 (Mon, 21 Mar 2016)

  Changed paths:
    M docs/release-notes.md
    R frontend/src/main/web/.babelrc
    M frontend/src/main/web/atomicCssConfig.js
    M frontend/src/main/web/index.html
    M frontend/src/main/web/src/actions/glossary.js
    M frontend/src/main/web/src/components/Nav.jsx
    M frontend/src/main/web/src/containers/App.js
    M frontend/src/main/web/src/legacy.js
    M frontend/src/main/web/src/stores/UserMatrixStore.js
    M frontend/src/main/web/webpack.prod.config.js
    M pom.xml
    M zanata-model/pom.xml
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/action/AuthenticatedAccountHome.java
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    M zanata-war/src/main/java/org/zanata/dao/VersionGroupDAO.java
    M zanata-war/src/main/java/org/zanata/servlet/UrlRewriteConfig.java
    M zanata-war/src/main/resources/messages.properties
    A zanata-war/src/main/webapp/WEB-INF/layout/dashboard/groups.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/projects.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/languages-list.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    M zanata-war/src/main/webapp/a/index.xhtml
    M zanata-war/src/main/webapp/dashboard/home.xhtml
    R zanata-war/src/main/webapp/glossary/view.xhtml
    R zanata-war/src/main/webapp/profile/home.xhtml

  Log Message:
  -----------
  Merge branch 'redux-app' of github.com:zanata/zanata-server into redux-app

# By Alex Eng (5) and others
# Via Alex Eng (4) and Ding-Yi Chen (1)
* 'redux-app' of github.com:zanata/zanata-server:
  Fix build, add group in dashboard
  Fix build
  WIP: fix prod build
  Upgrade zanata-parent, fix dependencies
  Remove some duplication
  Update fastinfoset to fix dependency mismatch
  Revert change caused by bad merge
  fix(js zanata): fix undefined zanata jquery plugin
  fix(version): delete version
  chore(dependency): Update dependencies to what Fedora 23 has

Conflicts:
        frontend/src/main/web/src/actions/glossary.js
        frontend/src/main/web/src/components/Nav.jsx


Compare: 
https://github.com/zanata/zanata-server/compare/9e3d3dc16ef8...4a6025d1a4ab
_______________________________________________
zanata-commits mailing list
zanata-commits@redhat.com
https://www.redhat.com/mailman/listinfo/zanata-commits

Reply via email to