osm.etsi.org Git - osm/UI.git/commit

projects / osm / UI.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 267d43e b780867)

author	KIRAN KASHALKAR <kiran.kashalkar@riftio.com>
	Thu, 20 Apr 2017 13:18:13 +0000 (09:18 -0400)
committer	KIRAN KASHALKAR <kiran.kashalkar@riftio.com>
	Thu, 20 Apr 2017 13:18:13 +0000 (09:18 -0400)
commit	2da8b7a246ba17396c5bc218a0b7f1685fb8d304
tree	b68ba87f9316bfb7e29019a59edbde4ed8116f35	tree \| snapshot
parent	267d43e391d633c26d45db31125612355665f193	commit \| diff
parent	b78086787d1db92bd71be944b16ce169dcf0f64b	commit \| diff

NOTICKET: Merging OSM/master to OSM/projects

Signed-off-by: KIRAN KASHALKAR <kiran.kashalkar@riftio.com>

18 files changed:

skyquake/framework/utils/utils.js	diff1 \|	diff2 \|	blob \| history
skyquake/framework/widgets/skyquake_container/skyquakeContainer.jsx	diff1 \|	diff2 \|	blob \| history
skyquake/framework/widgets/skyquake_container/skyquakeContainerSource.js	diff1 \|	diff2 \|	blob \| history
skyquake/framework/widgets/skyquake_container/skyquakeContainerStore.js	diff1 \|	diff2 \|	blob \| history
skyquake/framework/widgets/skyquake_nav/skyquakeNav.jsx	diff1 \|	\|	blob \| history
skyquake/plugins/accounts/src/account/account.jsx	diff1 \|	diff2 \|	blob \| history
skyquake/plugins/composer/api/composer.js	diff1 \|	diff2 \|	blob \| history
skyquake/plugins/composer/src/src/components/CatalogPanel.js	diff1 \|	diff2 \|	blob \| history
skyquake/plugins/composer/src/src/components/CatalogPanelToolbar.js	diff1 \|	diff2 \|	blob \| history
skyquake/plugins/composer/src/src/components/DetailsPanel.js	diff1 \|	diff2 \|	blob \| history
skyquake/plugins/composer/src/src/components/EditDescriptorModelProperties.js	diff1 \|	diff2 \|	blob \| history
skyquake/plugins/composer/src/src/libraries/utils.js	diff1 \|	diff2 \|	blob \| history
skyquake/plugins/launchpad/api/launchpad.js	diff1 \|	diff2 \|	blob \| history
skyquake/plugins/launchpad/package.json	diff1 \|	diff2 \|	blob \| history
skyquake/plugins/launchpad/src/instantiate/instantiateDashboard.jsx	diff1 \|	diff2 \|	blob \| history
skyquake/plugins/launchpad/src/launchpad.jsx	diff1 \|	diff2 \|	blob \| history
skyquake/plugins/launchpad/src/recordViewer/recordCard.jsx	diff1 \|	diff2 \|	blob \| history
skyquake/skyquake.js	diff1 \|	diff2 \|	blob \| history