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.

Sign up for GitHub

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

Jump to bottom

✨ Lentainform. this change is very important #23942

Merged
merged 29 commits into from Oct 2, 2019
Merged

✨ Lentainform. this change is very important #23942

merged 29 commits into from Oct 2, 2019

Conversation

DenyHF
Copy link
Contributor

@DenyHF DenyHF commented Aug 14, 2019

Hello.
These changes have been lost in previous commits.

Denys Siroshtan added 28 commits April 16, 2019 14:21
Support for MGID | Idealmedia | Lentainform ads network
84c346b
update
3b8e042
test trigger
11be96d
Merge remote-tracking branch 'origin/master'
278d86d
test trigger
11e712d
Merge remote-tracking branch 'origin/master'
f9a0ede
trigger tests
aa0d6b1
Merge branch 'master' of https://github.com/mgid/amphtml
9c9c192
Support for MGID | Idealmedia | Lentainform ads network
ecb21d2
Merge branch 'master' of https://github.com/ampproject/amphtml
44ecc6e
test trigger
5b3329d
Merge branch 'master' of https://github.com/ampproject/amphtml
593b450
Merge branch 'master' of https://github.com/ampproject/amphtml
7fd8768
Merge branch 'master' of https://github.com/mgid/amphtml
4eae5e9
Idealmedia new improvements
61df75e
Lentainform new improvements
38f5dc1
Merge branch 'master' of https://github.com/mgid/amphtml into lentain…
d3413ee 
…form
Merge branch 'master' of https://github.com/mgid/amphtml into idealmedia
54cc660
Idealmedia fix
cbe9046
Revert "Idealmedia fix"
0c9be2d 
This reverts commit cbe9046.
idealmedia fix
7ea09a7
Revert "idealmedia fix"
b7c04fa 
This reverts commit 7ea09a7.
Idealmedia fix
e6f980d
change prefetch to preconnect
3ca421e
Merge branches 'lentainform' and 'master' of https://github.com/mgid/…
294633b 
…amphtml into lentainform
lentainform fix
fa8b742
Merge branch 'master' of https://github.com/ampproject/amphtml into l…
13c13da 
…entainform

# Conflicts:
#	3p/integration.js
#	ads/_config.js
lentainform. this change is very important
a25c8d5
@DenyHF DenyHF changed the title Lentainform. this change is very important ✨ Lentainform. this change is very important Aug 20, 2019
@DenyHF
Copy link
Contributor Author

DenyHF commented Sep 3, 2019

@zhouyx
Hello
Can you approve this request? thank you.

@zhouyx zhouyx requested a review from lannka September 3, 2019 12:26
@zhouyx
Copy link
Contributor

zhouyx commented Sep 3, 2019

Hi @DenyHF Sorry for the delay in review. I am currently traveling.
To @lannka and the ads team.

@DenyHF
Copy link
Contributor Author

DenyHF commented Sep 3, 2019

@zhouyx, thank you for fast answer.
Have a nice traveling.

lannka
lannka requested changes Sep 13, 2019
View reviewed changes
Copy link
Contributor

@lannka lannka left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would actually suggest you put those logic in your remote JS, for flexibility.

ads/lentainform.js Outdated Show resolved Hide resolved
@lannka lannka merged commit 63a4545 into ampproject:master Oct 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lannka lannka lannka approved these changes

Assignees
No one assigned
Labels
cla: yes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@DenyHF @zhouyx @lannka @googlebot