add resolve option for custom modal

[cgoessen]

I've added 'resolve' as the last param and kept data for legacy support.
My use case is to use the same controller for full page and modal, which requires to have a few promises resolved in both.

• remove as not needed after a modalInstance dismiss

[niemyjski]

@cgoessen Can you please resolve the merge conflicts.
@m-e-conroy can you take a look at this.

[cgoessen]

hi,
I rebased my branch from the new upstream but I can't test it at the moment:
https://github.com/cgoessen/angular-dialog-service/tree/rebase-upstream

I'll update my pull request when I know it works.

[niemyjski]

Thank you

[niemyjski]

Looks like there still are some conflicts

[niemyjski]

Can you please resolve any conflicts so we can review and get this merged in.

[cgoessen]

I'll see what I can do.

I don't have the project on which I was working on at that time.

[niemyjski]

Guess we can close this then or merge it in if the conflicts are resolved? Sorry about that.