Skip to content
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.

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

Pixfuture Bid Adapter: updated the getUserSyncs method #7456

Merged
merged 31 commits into from
Oct 14, 2021

Conversation

pixfuture-media
Copy link
Contributor

Type of change

  • [ X] Other

Description of change

Updated the getUserSyncs method

@ChrisHuie ChrisHuie changed the title Updated the getUserSyncs method Pixfuture Bid Adapter: pdated the getUserSyncs method Sep 22, 2021
@ChrisHuie ChrisHuie changed the title Pixfuture Bid Adapter: pdated the getUserSyncs method Pixfuture Bid Adapter: updated the getUserSyncs method Sep 22, 2021
@ChrisHuie
Copy link
Collaborator

ChrisHuie commented Sep 23, 2021

@pixfuture-media it looks like your whole files are being commited instead of just the recent changes

@ChrisHuie ChrisHuie self-requested a review September 23, 2021 13:10
@ChrisHuie ChrisHuie self-assigned this Sep 23, 2021
@pixfuture-media
Copy link
Contributor Author

@pixfuture-media it looks like your whole files are being committed instead of just the recent changes

Sorry, we worried lost some changes and replaced all file.
What necessary do on our site?

@pixfuture-media
Copy link
Contributor Author

@pixfuture-media it looks like your whole files are being commited instead of just the recent changes

Hi Chris,
what necessary do on our site to finish implementation our updated adapter?

Best Regrds,
Vitali Ioussoupov

@ChrisHuie
Copy link
Collaborator

@pixfuture-media can you please pull in recent commits? That should fix most of the problem. Also, we just made it so all adapters are now only importing the utils functions they need instead of the whole file. So now you no longer need utils. in front of all the util methods. That is the current merge conflict.

…ils import by separated methods instead whole utils

updated the getUserSyncs method and changed utils import by separated methods instead whole utils
Fixed utls import
Bugfixing remove non used fill import
@pixfuture-media
Copy link
Contributor Author

Hello Chris,

its look fine everything now/ What do you think?

Regards,
Vitali

@ChrisHuie
Copy link
Collaborator

@pixfuture-media were you able to pull in recent commits. There still appear to be conflicts

@pixfuture-media
Copy link
Contributor Author

Hi Chris,

I made pull request again but it look conflict remained. Is it possible to somebody who have an write access fix it?

Regards,
Vitali

@ChrisHuie
Copy link
Collaborator

@pixfuture-media I can try and resolve it but I don't have write access to this specific pr so not entirely sure if it will let me update it.

@pixfuture-media
Copy link
Contributor Author

Hello,
please resolve conflict between our branch and master somebody who have write access to this repository.

@pixfuture-media
Copy link
Contributor Author

PR look fine right now?

@ChrisHuie ChrisHuie merged commit 8cb2250 into prebid:master Oct 14, 2021
cpabst pushed a commit to sovrn/Prebid.js that referenced this pull request Jan 10, 2022
* Add files via upload

* Add files via upload

* Update pixfutureBidAdapter.md

* Update pixfutureBidAdapter.md

* Update pixfutureBidAdapter.js

* Update pixfutureBidAdapter_spec.js

* Update pixfutureBidAdapter.js

* Update pixfutureBidAdapter.js

Bug fixing: has been lost "pubext" parameter

* Update pixfutureBidAdapter.js

* Update pixfutureBidAdapter.md

* Update pixfutureBidAdapter.js

* Update pixfutureBidAdapter.js

* Update pixfutureBidAdapter.js

* Update pixfutureBidAdapter.js

Removing the trailing spaces in lines: 168 and 172

* Add files via upload

* Update pixfutureBidAdapter.js

removing trilling spaces in the lines: 168,172,178

* Update pixfutureBidAdapter.md

* Update pixfutureBidAdapter.md

* Update pixfutureBidAdapter.js

* Update pixfutureBidAdapter.js

* Update pixfutureBidAdapter.js

* Update pixfutureBidAdapter.js

* Pixfuture Bid Adapter: updated the getUserSyncs method and changed utils import by separated methods instead whole utils

updated the getUserSyncs method and changed utils import by separated methods instead whole utils

* Fixed utls import

Fixed utls import

* Bugfixing remove non used fill import

Bugfixing remove non used fill import

* Update pixfutureBidAdapter.js

* resolving conflicts

* multiline fix

Co-authored-by: polischukPix <o.polishchuk@pixfuture.com>
Co-authored-by: Alexandr <i.polischukalexandr@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants