Fix merge conflict#2
Merged
indexexchange merged 86 commits intoindexexchange:ix-timeoutfrom Feb 7, 2017
Merged
Conversation
…roject#7172) * Analytics root to separate top-level vs embed analytics for FIE * test fixes * more docs
The template should help make pull requests easier to read and overall more uniform. - Does not propose complicated syntax for titles (or rather forbids it). - Encourages referencing issues. This is a bit of an RFC. Feedback is welcome. One thing I don't actually know (and the GH docs don't say), is how this template influences auto-generated PR text. It would be really annoying if that no longer happened.
* add yarn.lock file for deterministic builds * switch travis to use yarn * fix logic for package.json an yarn.lock check * make sure that it also errors if only yarn.lock exists * add back yarn.lock file * update serving/building docs
* Local debug server changes to fake Cloudflare signing. * Changes to support a new A4A ad network with Cloudflare Signing
* Fix broken shadow embed test * fix lint
* Element-level signals for lifecycle events * fixing tests
* 1st commit * add preconnect ValueCommerce add preconnect ValueCommerce * remove extra space remove extra space
* Update docs for goToSlide * Update actions doc for goToSlide * Update carouse.md with type="slides" note * Update actions doc with type=slides
* Update csa.md Add note to indicate that only multiple-format AFSh ads are supported. * Update csa.md
* Squash chunk-scan commits * fix lint error * rename chunk to startupChunk, pass viewer from Chunks to StartupTask * fix lint and type errors * support timeRemaining in chunk tasks & misc clean up * justin's comments * dima's comments * malte's comments * style and lint fix * fix unit tests * missed a couple @Private declarations * fix scan iteration * remove for..of * more iteration on iteration * move element scan to helper method
* update bind docs * barb's comments
* add srcset support * fix types * rewrite urls for cache * ignore compiler warnings in third_party/caja * whitelist amp-bind to depend on sanitizer.js * ali's comments
* move bind examples to bind/ folder * add sandbox example * add ecommerce example * update titles * replace shirt images * move amp-state to <body> * move <amp-state> to bottom of body * fix amp-bind validator html and output
A single AMP page would already only connect to a given origin once ever 180 seconds. With this change the URL for doing this will not change within that time interval. That means that all AMP pages that run on computers with roughly correct clocks will request the same URL within a 180 seconds interval, which should make it easier for CDNs to respond efficiently.
We changed the label from 'Starter' to 'Great First Issues' Also, the link pointing here was not correct.
…hiding the error in our tests. (ampproject#7301)
* Eliminate uses of childElement and childElements * Forbid uses of buggy querySelector Anytime you select a descendant of a descendant (`div div`, or, really, `* *`), your matching against the entire document then filtering to elements inside the scope. This is **not** what you'd expect. Fixes a selector bug in `<amp-analytics>`. * Add tests * Use `Date.now` to avoid `.` class selector conflict * Merge latest master * Linting * Fix types * Fix merge conflict * Return NodeList * Fix tests
* Render-start analytics event * resolve cyclical dependency * restrict render-start * tests and docs * working on docs * DOMReady * redo via signals * tests * Revert * Changes to the docs * tests * lints
…ction (ampproject#7132) * Created attributes.js * Added context to direct frame rendering * Added context to rendering via nameframe * Removed unneeded files * Fixed lint and naming * Don't need to uriencode * Modified tests * Created generateSentinelAndContext and moved setStyle * Fixed test breakages, handled sentinel name change experiment * Addressed comments; ampContext now checks for window var; added/modified tests * Added docstring * Addressed comments * Added test * Attach data-amp-3p-sentinel attribute to frame * Fix a4a frames not having messages processed correctly * Added examples for manual testing * Addressed comments' * Revert "Addressed comments'" This reverts commit a61ddf8. * Changed name of function to hasSafeframeSentinel: * Added todo * Updated docstring and added todo * Fixed getListenForEvents * Collapse if block cases * Undid change to getListenForEvents * Fixed nameframe to keep context data on name * Broke out isAmpMessage function to use for parsing * Handle different ways of setting up AmpContext * Make test page take up multiple viewports * Fixed lint mistakes * Inlined ampcontext-creative.js into html * Addressed comments * Addressed comments * Add comments to explain setting of name on nameframe * removed comment
* rename 'bindings' to 'bound properties' * rename 'evaluatee' to 'binding' * use treewalker * minor tweak * justin's comments * simplify scan helper func
…luding design reviews (ampproject#7281)
* Factor out jank meter code into separate file * Rename jank-rate.js to jank-meter.js * Makes this.win_ private * address comment
* Update amp-analytics.js * review feedback. * Update amp-analytics.js
bewuethr
pushed a commit
that referenced
this pull request
Mar 7, 2018
* Development/debug setup. * Basic exp setup. * Header parsing and stuff. * Client-side changes fin. * Cleaned PR + tests. * Undoing yarn stuff. * Yarn attempt #2. * Reverting example page. * lint fix * PR feedback. * Undoing changes to test page. * Merges * Yarn * Not calling document.open/close when writing in body and not waiting for onload. Also removed accidentally merged tests. * Adding back document.open/close into default flow. * Simplified conditional. * Adsense support. * Merges/rebase. * Alphabetized imports. * Factored out common code to utils.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.