[zanata/zanata-server] 084340: WIP: glossary data table

[GitHub]

  Branch: refs/heads/rhbz1245433-glossary
  Home:   https://github.com/zanata/zanata-server
  Commit: 084340e847389d348c1c6b1d9776d38780e494aa
      https://github.com/zanata/zanata-server/commit/084340e847389d348c1c6b1d9776d38780e494aa
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-08-17 (Mon, 17 Aug 2015)

  Changed paths:
    M frontend/src/main/web/index.html
    R frontend/src/main/web/lib/components/GlobalGlossary.jsx
    M frontend/src/main/web/lib/components/GlossaryDataTable.jsx
    A frontend/src/main/web/lib/components/SystemGlossary.jsx
    M frontend/src/main/web/lib/constants/Views.js
    M frontend/src/main/web/lib/stores/GlossaryStore.js
    M frontend/src/main/web/lib/stores/testData/glossary/locales/list.json
    M frontend/src/main/web/lib/stores/testData/glossary/src/en-US/trans/de.json
    A frontend/src/main/web/lib/stores/testData/glossary/src/en-US/trans/en-US.json
    R frontend/src/main/web/lib/stores/testData/glossary/src/en-US/trans/fr.json
    M frontend/src/main/web/lib/utils/DateHelper.js

  Log Message:
  -----------
  WIP: glossary data table


  Commit: 0ce82e881384477dca2247e252f6ba45169dd0d5
      https://github.com/zanata/zanata-server/commit/0ce82e881384477dca2247e252f6ba45169dd0d5
  Author: Luke Brooker <mail at lukebrooker.com>
  Date:   2015-08-28 (Fri, 28 Aug 2015)

  Changed paths:
    A docs/user-guide/system-admin/configuration/mac-installation.md
    M frontend/src/main/web/index.html
    M frontend/src/main/web/lib/components/SystemGlossary.jsx
    M frontend/src/main/web/package.json
    M frontend/src/main/web/webpack.config.js

  Log Message:
  -----------
  Working integration with zanata-ui


  Commit: ccc2cff94f977e1a6a3891714a62426b4570996b
      https://github.com/zanata/zanata-server/commit/ccc2cff94f977e1a6a3891714a62426b4570996b
  Author: Luke Brooker <mail at lukebrooker.com>
  Date:   2015-08-28 (Fri, 28 Aug 2015)

  Changed paths:
    M frontend/src/main/web/lib/components/SystemGlossary.jsx
    A frontend/src/main/web/lib/components/glossary/GlossaryDataTable.jsx
    A frontend/src/main/web/lib/components/glossary/TextInput.jsx
    M frontend/src/main/web/lib/stores/GlossaryStore.js

  Log Message:
  -----------
  Merge branches 'rhbz1245433-glossary' and 'rhbz1245433-glossary' of github.com:zanata/zanata-server into rhbz1245433-glossary

# By Alex Eng
# Via Alex Eng
* 'rhbz1245433-glossary' of github.com:zanata/zanata-server:
  WIP: glossary data table

# By Alex Eng
# Via Alex Eng
* 'rhbz1245433-glossary' of github.com:zanata/zanata-server:
  WIP: glossary data table

Conflicts:
	frontend/src/main/web/index.html
	frontend/src/main/web/lib/components/GlossaryDataTable.jsx
	frontend/src/main/web/lib/components/SystemGlossary.jsx
	frontend/src/main/web/lib/stores/GlossaryStore.js


  Commit: 6e9869476ab60511480d1641635d7c20842b3525
      https://github.com/zanata/zanata-server/commit/6e9869476ab60511480d1641635d7c20842b3525
  Author: Luke Brooker <mail at lukebrooker.com>
  Date:   2015-08-31 (Mon, 31 Aug 2015)

  Changed paths:
    A frontend/src/main/web/index.css
    M frontend/src/main/web/index.html
    M frontend/src/main/web/index.js
    M frontend/src/main/web/lib/components/SystemGlossary.jsx
    M frontend/src/main/web/lib/stores/GlossaryStore.js

  Log Message:
  -----------
  Update new components to work with existing data


  Commit: 48e0e2333b3a4a3ba8d67f72c98a61324c5a7231
      https://github.com/zanata/zanata-server/commit/48e0e2333b3a4a3ba8d67f72c98a61324c5a7231
  Author: Luke Brooker <mail at lukebrooker.com>
  Date:   2015-08-31 (Mon, 31 Aug 2015)

  Changed paths:
    M frontend/src/main/web/index.css
    M frontend/src/main/web/index.html
    R frontend/src/main/web/lib/components/GlossaryDataTable.jsx
    M frontend/src/main/web/lib/components/glossary/GlossaryDataTable.jsx
    M frontend/src/main/web/lib/stores/GlossaryStore.js
    A frontend/src/main/web/lib/styles/fixed-data-table.css

  Log Message:
  -----------
  Update Data Table UI


  Commit: beccc91f5a396b6d30bf4de6107de530484f7a84
      https://github.com/zanata/zanata-server/commit/beccc91f5a396b6d30bf4de6107de530484f7a84
  Author: Luke Brooker <mail at lukebrooker.com>
  Date:   2015-08-31 (Mon, 31 Aug 2015)

  Changed paths:
    M frontend/src/main/web/lib/actions/GlossaryActions.js
    M frontend/src/main/web/lib/components/glossary/GlossaryDataTable.jsx
    M frontend/src/main/web/lib/components/glossary/TextInput.jsx
    M frontend/src/main/web/lib/stores/GlossaryStore.js
    M frontend/src/main/web/lib/utils/GlossaryHelper.js
    M zanata-war/src/main/java/org/zanata/rest/service/GlossaryService.java

  Log Message:
  -----------
  Merge branch 'rhbz1245433-glossary' of github.com:zanata/zanata-server into rhbz1245433-glossary

# By Alex Eng
# Via Alex Eng
* 'rhbz1245433-glossary' of github.com:zanata/zanata-server:
  Bind clear, update and save action for glossary entry

Conflicts:
	frontend/src/main/web/lib/stores/GlossaryStore.js


Compare: https://github.com/zanata/zanata-server/compare/926071a5889f...beccc91f5a39