Branch: refs/heads/ZNTA-153-glossary-export
Home: https://github.com/zanata/zanata-server
Commit: a7d364fb7bf634f64a907ba2a95da0b3681ef705
https://github.com/zanata/zanata-server/commit/a7d364fb7bf634f64a907ba2a95da0b3681ef705
Author: Alex Eng <a...@redhat.com>
Date: 2016-06-24 (Fri, 24 Jun 2016)
Changed paths:
M frontend/src/main/web/npm-shrinkwrap.json
M frontend/src/main/web/package.json
A frontend/src/main/web/src/actions/profile.js
R frontend/src/main/web/src/actions/userMatrix.js
R frontend/src/main/web/src/constants/ActionTypes.js
M frontend/src/main/web/src/constants/Options.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/CalendarPeriodHeading.jsx
M frontend/src/main/web/src/containers/UserProfile/ContentStateFilter.jsx
M frontend/src/main/web/src/containers/UserProfile/DayMatrix.jsx
M frontend/src/main/web/src/containers/UserProfile/FilterableMatrixTable.jsx
M frontend/src/main/web/src/containers/UserProfile/RecentContributions.jsx
M frontend/src/main/web/src/containers/UserProfile/index.jsx
R frontend/src/main/web/src/dispatchers/UserMatrixDispatcher.js
M frontend/src/main/web/src/reducers/index.js
A frontend/src/main/web/src/reducers/profile.js
R frontend/src/main/web/src/stores/UserMatrixStore.js
R frontend/src/main/web/src/stores/__mocks__/superagent.js
R frontend/src/main/web/src/stores/__tests__/UserMatrixStoreTest.js
R frontend/src/main/web/src/stores/testData/glossary/entries.json
R frontend/src/main/web/src/stores/testData/glossary/info.json
R frontend/src/main/web/src/stores/testData/stats/user/test-user.json
M pom.xml
Log Message:
-----------
Merge branch 'master' into ZNTA-153-glossary-export
_______________________________________________
zanata-commits mailing list
zanata-commits@redhat.com
https://www.redhat.com/mailman/listinfo/zanata-commits
