GitHub user sferot opened a pull request: https://github.com/apache/brooklyn-ui/pull/114
Merge master from apache You can merge this pull request into a Git repository by running: $ git pull https://github.com/usharesoft/brooklyn-ui UFORGE-12203 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/brooklyn-ui/pull/114.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #114 ---- commit 4533207a64edd9a566ed44e64f97096b4bf76602 Author: Nicolas TITH <nico.tith@...> Date: 2018-10-05T07:08:58Z Merge pull request #2 from usharesoft/travis Travis commit b2dad6b9973aa9de7fad7d7d4092dad1a4865282 Author: Ludovic Plantin <ludovic.plantin@...> Date: 2018-10-05T08:27:14Z UFORGE-11800 Integrate USS branding into our Fork commit e6bcd0d19f313b3269480856cc38e3a2478f3bc9 Author: Ludovic Plantin <ludovic.plantin@...> Date: 2018-10-05T14:04:11Z UFORGE-11800 Integrate USS branding - Remove fujitsu logo and add apache license commit e88ff3669b447663f11c2f9e1663bf1001ea9709 Author: Ludovic Plantin <ludovic.plantin@...> Date: 2018-10-10T07:10:56Z Merge remote-tracking branch 'apache/master' commit b8f7f2764507204c28a589c9b2398fcbdd879ac9 Author: Ludovic Plantin <ludovic.plantin@...> Date: 2018-10-12T14:16:23Z UFORGE-11691 Configure our own version of brooklyn-ui commit ee970baff6b50cc2e7b62999e4796671f0d53338 Author: LudoP <ludovic.plantin@...> Date: 2018-10-15T07:26:28Z Merge pull request #4 from usharesoft/change-uss-brooklyn-version UFORGE-11691 Configure our own version of brooklyn-ui commit 1d9719cf5d008636abbad504a4a11ca73bc7bbce Author: LudoP <ludovic.plantin@...> Date: 2018-10-15T07:33:57Z Merge branch 'master' into integrate-uss-branding commit 3c988e4136ec8c90d16042876e977746fc1fc8da Author: Nicolas TITH <nico.tith@...> Date: 2018-10-15T08:17:07Z Merge pull request #3 from usharesoft/integrate-uss-branding UFORGE-11800 Integrate USS branding into our Fork commit 333da47f3a19659261809b81c11115c04ee88640 Author: Thomas Bouron <thomas.bouron@...> Date: 2018-10-09T07:05:23Z Implement missing endpoint for palette API commit 2cc96892f10018529ef301aeac3633ad8d8320e1 Author: Ludovic Plantin <ludovic.plantin@...> Date: 2018-10-22T08:32:20Z Allow to resolve different virtual type according to the entity config - Add entity config as a third parameter of paletteApi.getType method commit 5c9373cce2943d467a864a97f367a621da1408ce Author: Nicolas TITH <nico.tith@...> Date: 2018-10-24T07:37:31Z Merge pull request #6 from usharesoft/gettypeconfig-uss Allow to resolve different virtual type according to the entity config commit a611b6fdff7335b77d72de00bf3111a604340664 Author: Sylvain Ferot <sylvain.ferot@...> Date: 2018-10-24T10:04:29Z Allow to configure the blueprint loading methods commit b56635c727869fd9e3a00ed371b8365424fadb3c Author: Nicolas TITH <nico.tith@...> Date: 2018-10-24T13:50:35Z Merge pull request #7 from usharesoft/load-blueprint-from-yaml Allow to configure the blueprint loading methods commit f6cc59599807d31c608c610e3c2b2868de98fd1f Author: Sylvain Ferot <sylvain.ferot@...> Date: 2018-11-23T10:22:01Z Merge remote-tracking branch 'apache/master' into UFORGE-12203 Conflicts: ui-modules/blueprint-composer/app/components/providers/blueprint-loader-api.provider.js ui-modules/blueprint-composer/app/components/providers/blueprint-service.provider.js ui-modules/blueprint-composer/app/components/providers/palette-api.js ui-modules/blueprint-composer/app/components/providers/palette-api.provider.js ui-modules/blueprint-composer/app/index.js commit c86b07fc4f6baf8327b575fc2a448a2c9fbad8eb Author: Sylvain Ferot <sylvain.ferot@...> Date: 2018-11-23T10:22:21Z Merge commit 'refs/pull/113/head' of https://github.com/apache/brooklyn-ui into UFORGE-12203 commit bd6da8c74d2c89f1673509bb3478ed59780d74d8 Author: Sylvain Ferot <sylvain.ferot@...> Date: 2018-11-26T16:14:50Z Merge remote-tracking branch 'apache/master' into UFORGE-12203 ---- ---