search

camptocamp / cgxp

22 stars 22 forks source link

Update OpenLayers 2 #1110

Closed kalbermattenm closed 7 years ago

kalbermattenm commented 7 years ago

To get https://github.com/camptocamp/openlayers/pull/3

Please review and eventually merge if happy

sbrunner commented 7 years ago

you should add 

git:
    submodules: false

At the start of the .travis.yaml file to make the Travis tests pass :-)

kalbermattenm commented 7 years ago

Travis is still not happy... Did I do something wrong ?

sbrunner commented 7 years ago

I will have a look on that the next week :-)

kalbermattenm commented 7 years ago

No worries, I am on holidays anyway ;-)

sbrunner commented 7 years ago

Enjoy :-)

sbrunner commented 7 years ago

Should be rebased :-)

kalbermattenm commented 7 years ago

I just updated this branch and removed a commit which was replaced by https://github.com/camptocamp/cgxp/pull/1112

Is it OK like that ?

sbrunner commented 7 years ago

Can you do a rebase to remove the merge commit?

kalbermattenm commented 7 years ago

@sbrunner, I tried... but it looks like I made a big mess...

The strangest things about it, is that my local history looks good... :

image

rbovard commented 7 years ago

Haha, see https://github.com/camptocamp/ngeo/pull/2346#issuecomment-281357484

kalbermattenm commented 7 years ago

Thanks ;-)

kalbermattenm commented 7 years ago

This time, I think we are OK... Thanks a lot for the hint @rbovard

@sbrunner, please merge if happy.

sbrunner commented 7 years ago

Many thanks @kalbermattenm

kalbermattenm commented 7 years ago

Thanks @sbrunner