Branch: refs/heads/replace-fixed-data-table
Home: https://github.com/zanata/zanata-server
Commit: 5755df14a4e9224b387a69c0ceb8e27091c009be
https://github.com/zanata/zanata-server/commit/5755df14a4e9224b387a69c0ceb8e27091c009be
Author: Luke Brooker <m...@lukebrooker.com>
Date: 2016-03-01 (Tue, 01 Mar 2016)
Changed paths:
M frontend/src/main/web/atomicCssConfig.js
M frontend/src/main/web/src/actions/glossary.js
M frontend/src/main/web/src/components/EditableText.js
M frontend/src/main/web/src/components/Header.jsx
M frontend/src/main/web/src/components/Nav.jsx
A frontend/src/main/web/src/components/Row.js
M frontend/src/main/web/src/components/ScrollView.jsx
A frontend/src/main/web/src/components/TableCell.js
M frontend/src/main/web/src/components/TableRow.js
M frontend/src/main/web/src/components/index.js
M frontend/src/main/web/src/containers/Glossary.js
M frontend/src/main/web/src/containers/Root.js
R frontend/src/main/web/src/dispatchers/GlossaryDispatcher.js
M frontend/src/main/web/src/reducers/glossary.js
A frontend/src/main/web/src/schemas.js
M frontend/src/main/web/src/styles/atomic.css
M frontend/src/main/web/src/styles/extras.css
M frontend/src/main/web/src/utils/RoutingHelpers.js
Log Message:
-----------
Get basic infinite scroll working without overflow
Commit: 36b4385c35c0bcb2536896f3cd1e5f7a31d33809
https://github.com/zanata/zanata-server/commit/36b4385c35c0bcb2536896f3cd1e5f7a31d33809
Author: Luke Brooker <m...@lukebrooker.com>
Date: 2016-03-03 (Thu, 03 Mar 2016)
Changed paths:
A frontend/src/main/web/.imdone/config.json
M frontend/src/main/web/src/actions/glossary.js
M frontend/src/main/web/src/components/EditableText.js
M frontend/src/main/web/src/components/TableCell.js
M frontend/src/main/web/src/components/TableRow.js
M frontend/src/main/web/src/components/TextInput.jsx
M frontend/src/main/web/src/containers/Glossary.js
M frontend/src/main/web/src/reducers/glossary.js
M frontend/src/main/web/src/styles/atomic.css
Log Message:
-----------
WIP: Some very basic editing
Commit: 3dac6a2b9b86ffc58ce05c40a3ccd66e4d6a07d9
https://github.com/zanata/zanata-server/commit/3dac6a2b9b86ffc58ce05c40a3ccd66e4d6a07d9
Author: Luke Brooker <m...@lukebrooker.com>
Date: 2016-03-03 (Thu, 03 Mar 2016)
Changed paths:
M frontend/README.md
M frontend/pom.xml
M frontend/src/main/web/atomicCssConfig.js
M frontend/src/main/web/bundle.js
M frontend/src/main/web/package.json
M frontend/src/main/web/src/components/Link.jsx
M frontend/src/main/web/src/components/Nav.jsx
M frontend/src/main/web/src/components/NavItem.jsx
M frontend/src/main/web/src/index.js
A frontend/src/main/web/src/legacy.js
A frontend/src/main/web/webpack.legacy.config.js
M frontend/src/main/web/webpack.prod.config.js
M
zanata-war/src/main/java/org/zanata/action/ApplicationConfigurationAction.java
M zanata-war/src/main/java/org/zanata/action/AuthenticatedAccountHome.java
M zanata-war/src/main/java/org/zanata/action/GlossaryAction.java
M zanata-war/src/main/java/org/zanata/events/WebhookEventType.java
A zanata-war/src/main/java/org/zanata/rest/editor/dto/BuildInfo.java
A zanata-war/src/main/java/org/zanata/rest/editor/dto/JsonObject.java
M zanata-war/src/main/java/org/zanata/rest/editor/dto/Permission.java
M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
M zanata-war/src/main/webapp/WEB-INF/template/template_2x.xhtml
M zanata-war/src/main/webapp/WEB-INF/template/template_ui.xhtml
A zanata-war/src/main/webapp/account/logout.xhtml
A zanata-war/src/main/webapp/account/singleopenidlogin.xhtml
M zanata-war/src/main/webapp/edit_home_content.xhtml
M zanata-war/src/main/webapp/glossary/view.xhtml
M zanata-war/src/main/webapp/home.xhtml
Log Message:
-----------
Merge branches 'replace-fixed-data-table' and 'replace-fixed-data-table' of
github.com:zanata/zanata-server into replace-fixed-data-table
# By Alex Eng
# Via Alex Eng
* 'replace-fixed-data-table' of github.com:zanata/zanata-server:
Add BuildInfo
WIP: implementing template for glossary
Include frontend legacy js file in build
WIP: fixing npm build
Fix logout link
Migrade home and edit_home to use new template
integrate links
WIP: integrating with jsf
# By Alex Eng
# Via Alex Eng
* 'replace-fixed-data-table' of github.com:zanata/zanata-server:
Add BuildInfo
WIP: implementing template for glossary
Include frontend legacy js file in build
WIP: fixing npm build
Fix logout link
Migrade home and edit_home to use new template
integrate links
WIP: integrating with jsf
Conflicts:
frontend/src/main/web/src/styles/atomic.css
Compare:
https://github.com/zanata/zanata-server/compare/040e0a187aa5...3dac6a2b9b86
_______________________________________________
zanata-commits mailing list
zanata-commits@redhat.com
https://www.redhat.com/mailman/listinfo/zanata-commits