Skip to content

merge develop into master #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 58 commits into from
Nov 6, 2018
Merged

merge develop into master #48

merged 58 commits into from
Nov 6, 2018

Conversation

@droshev
Copy link
Contributor

@droshev droshev commented Nov 4, 2018

No description provided.

Taushanova-Atanasova, Inna and others added 30 commits October 22, 2018 10:41
package json update version
ae25ae7
Merge branch 'develop' of https://github.com/SAP/fundamental-react in…
2b3d7cb 
…to develop
@chrismanciero
Created InlineHelp component
b4bf059
@chrismanciero
Merge branch 'develop' into inline-help
010c607
Issue#10: implement menu component
ed31a77
@InnaAtanasova
Merge pull request #21 from SAP/feature/Issue#10-menu
82e79b5 
Feature/issue#10 menu
@InnaAtanasova
Merge branch 'develop' into inline-help
a1b891d
@InnaAtanasova
Merge pull request #20 from chrismanciero/inline-help
298b1f2 
Inline help Component (Feature Request - Issue #6)
adds missing import statement for Inline help
3b94739
centers inline help component in the documentation
ff4b228
Issue#7: adds status for label component
f1286c6
@InnaAtanasova
Merge pull request #22 from SAP/feature/Issue#7-status-indicator
14cf99a 
Issue#7: adds status for label component
@chrismanciero
Pagination control
bfe9c65
@chrismanciero
Merge branch 'develop' into pagination-component
3424292
@CodesOfRa
fix for megamenu console warning & selection issue
916aa43
@droshev
Merge pull request #23 from chrismanciero/pagination-component
db59f48 
Pagination control
@droshev
Merge pull request #24 from SAP/fix/megamenu
27656a1 
fix for megamenu console warnings & selection issue
@droshev
update libs in package.json
a42cfcc
@droshev
Merge pull request #26 from SAP/feature/#25-update-package.json
c53654f 
update libs in package.json
@chrismanciero
initial commit of modal component
cf8e2eb
@droshev
#27 fix github pages and put SAP favicon
8dbfb8d
@droshev
Merge pull request #28 from SAP/fix/#27-fix-gh-pages
650f9aa 
#27 fix github pages and put SAP favicon
Issue#9: implements popover component
6689bbb
@InnaAtanasova
Merge pull request #33 from SAP/feature/Issue#9-popover-component
b625d15 
Issue#9: implements popover component
Resolves missing style for popover and menu
e77b467
removes SideNavItem from index.js
057512c
Issue#8: refactor dropdown and contextual menu, reflect the changes t…
3cfc0f4 
…o the components using contextual menu
@InnaAtanasova
Update README.md
4f243bf
@InnaAtanasova
Update README.md
1d13deb
@InnaAtanasova
Update README.md
dbfc5df
droshev and others added 25 commits October 28, 2018 15:52
@droshev
Update README.md
b6d01b7
Issue#14: refactor action bar
b323916
@chrismanciero
Modal component commit
3aa7ef7
@chrismanciero
remove console.log
db49d3d
@chrismanciero
remove dup check for primaryBtnText
45c57d8
@chrismanciero
Merge branch 'develop' into Modal-component
c29aa44
@chrismanciero
update text on how to page
31b4038
@chrismanciero
Merge branch 'Modal-component' of https://github.com/chrismanciero/fu…
4d33713 
…ndamental-react into Modal-component
@droshev
Merge pull request #40 from SAP/feature/Issue#14-action-bar-refactoring
30fcba7 
Issue#14: refactor action bar
Issue#35: refactor forms
cbb9f3e
@chrismanciero
initial Search Input control
ec82d94
@chrismanciero
removed primaryBtnText and secondaryBtnText and replaced with actions
6377f06
@InnaAtanasova
Merge pull request #41 from chrismanciero/Modal-component
99c1d94 
Modal component
Issue#13: adds link and url options for Breadcrumb, Side Navigation a…
a936af5 
…nd Mega Menu
@chrismanciero
Update search input to have auto-complete and normal mode
62d9bab
@chrismanciero
update method names
f9f9160
@chrismanciero
update method names and fix doc
b59b5ba
@chrismanciero
Added more documentation
dba0f8a
@droshev
Merge pull request #42 from SAP/feature/Issue#35-refactor-forms
5a9f600 
Issue#35: refactor forms
@droshev
Merge pull request #43 from SAP/feature/Issue#13-refactor-breadcrumb-…
4a3cc56 
…megaMenu-SideNav

Issue#13: adds link and url options for Breadcrumb, SideNav and MegaMenu
@InnaAtanasova
Merge pull request #44 from chrismanciero/search-input
e9f2a1a 
Search input
@chrismanciero
fix eslint warnings, remove isRequired for itemsPerPage propType
4f0d3ca
@InnaAtanasova
Merge pull request #46 from SAP/pagination-tweaks
a8a7214 
fix eslint warnings, remove isRequired for itemsPerPage propType
@chrismanciero
reduce eslint warnings
12a1519
@droshev
Merge pull request #47 from SAP/reduce-eslint-warnings
794f21e 
reduce eslint warnings
@droshev droshev merged commit 8254a08 into master Nov 6, 2018
greg-a-smith pushed a commit that referenced this pull request Mar 5, 2019
@droshev
Merge pull request #48 from SAP/develop
359f8d0 
merge develop into master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@InnaAtanasova InnaAtanasova InnaAtanasova approved these changes

@chrismanciero chrismanciero Awaiting requested review from chrismanciero

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@droshev @InnaAtanasova @chrismanciero @CodesOfRa