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

Move Canonical Chartbeat to UserContext #3622

Merged
merged 47 commits into from
Sep 20, 2019
Merged
Changes from 2 commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
006ef90
:rocket: POC Chartbeat Hook
Sep 8, 2019
1d10348
Merge branch 'latest' into ChartbeatHook
Sep 10, 2019
30f3ad0
:rocket: Fixed AMP
Sep 10, 2019
3277062
set virtualReferrer to default value
rhenshaw56 Sep 11, 2019
b84f1a8
Merge branch 'latest' of https://github.com/bbc/simorgh into Chartbea…
rhenshaw56 Sep 11, 2019
ee70ee3
fixed linting
rhenshaw56 Sep 11, 2019
eefda94
Merge branch 'latest' of https://github.com/bbc/simorgh into Chartbea…
rhenshaw56 Sep 11, 2019
938ac00
updated tests and snaps
rhenshaw56 Sep 11, 2019
5744d76
added test for getConfig
rhenshaw56 Sep 12, 2019
2e43213
Merge branch 'latest' of https://github.com/bbc/simorgh into Chartbea…
rhenshaw56 Sep 12, 2019
a06c210
Merge branch 'latest' into ChartbeatHook
rhenshaw56 Sep 16, 2019
bb9edd6
added commit suggestion
rhenshaw56 Sep 16, 2019
2d34e38
Merge branch 'ChartbeatHook' of https://github.com/bbc/simorgh into C…
rhenshaw56 Sep 16, 2019
6369546
updated snaps for canonical chartbeat
rhenshaw56 Sep 16, 2019
dabc854
added isCanonicalAndEnabled flag
rhenshaw56 Sep 16, 2019
16b1e05
added feedback suggestion in test
rhenshaw56 Sep 16, 2019
637af68
added toHaveBeenCalledTimes
rhenshaw56 Sep 16, 2019
70417c7
refactored tests
rhenshaw56 Sep 17, 2019
a5a0df5
refactored tests
rhenshaw56 Sep 17, 2019
6e039ee
moved proptypes to models
rhenshaw56 Sep 17, 2019
5cc03c9
adjusted prop for tests
rhenshaw56 Sep 17, 2019
59f18a0
adjusted prop for tests
rhenshaw56 Sep 17, 2019
a6ae5d5
added asserttion for amp not too have been called
rhenshaw56 Sep 17, 2019
4d60a35
Merge branch 'latest' into ChartbeatHook
jamesdonoh Sep 17, 2019
8a9d3d0
Merge branch 'latest' into ChartbeatHook
Sep 18, 2019
dda738a
Merge branch 'latest' into ChartbeatHook
rhenshaw56 Sep 18, 2019
f19a150
refactored proptype
rhenshaw56 Sep 18, 2019
3136add
Merge branch 'ChartbeatHook' of https://github.com/bbc/simorgh into C…
rhenshaw56 Sep 18, 2019
a59888e
resolved conflicts
rhenshaw56 Sep 18, 2019
8743d4f
swiitched up toggle in tests
rhenshaw56 Sep 18, 2019
e7b8303
changed tests to use test env
rhenshaw56 Sep 18, 2019
3df80c0
restored test file
rhenshaw56 Sep 18, 2019
e052482
Merge branch 'latest' of https://github.com/bbc/simorgh into Chartbea…
rhenshaw56 Sep 18, 2019
171fb37
Merge branch 'latest' into ChartbeatHook
jamesdonoh Sep 18, 2019
84cafa7
resolved conflicts
rhenshaw56 Sep 19, 2019
a840c03
Merge branch 'ChartbeatHook' of https://github.com/bbc/simorgh into C…
rhenshaw56 Sep 19, 2019
7c54f28
Merge branch 'latest' into ChartbeatHook
staylos92 Sep 19, 2019
fca449c
Merge branch 'latest' into ChartbeatHook
jamesdonoh Sep 19, 2019
a6fe3b8
Merge branch 'latest' into ChartbeatHook
jamesdonoh Sep 19, 2019
6a3b854
Merge branch 'latest' into ChartbeatHook
staylos92 Sep 19, 2019
ffc5974
Merge branch 'latest' into ChartbeatHook
rhenshaw56 Sep 19, 2019
84e66e3
Merge branch 'latest' into ChartbeatHook
rhenshaw56 Sep 19, 2019
8561da9
Merge branch 'latest' into ChartbeatHook
amywalkerdev Sep 19, 2019
524e1c2
Merge branch 'latest' of https://github.com/bbc/simorgh into Chartbea…
rhenshaw56 Sep 19, 2019
34306c7
Merge branch 'latest' into ChartbeatHook
rhenshaw56 Sep 20, 2019
4c8bf4f
Merge branch 'ChartbeatHook' of https://github.com/bbc/simorgh into C…
rhenshaw56 Sep 20, 2019
a53d66c
added mock for chartbeat in ArticleMain
rhenshaw56 Sep 20, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

These merge commits were added into this branch cleanly.

There are no new changes to show.