Skip to content
This repository was archived by the owner on Nov 6, 2023. It is now read-only.

Rebased Amazon main shopping sites - #5033

Merged
Hainish merged 11 commits into
EFForg:masterfrom
J0WI:amazon
Aug 14, 2016
Merged

Hainish merged 11 commits into
EFForg:masterfrom
J0WI:amazon

Conversation

@J0WI

@J0WI J0WI commented Jun 4, 2016

Copy link
Copy Markdown
Contributor

This should fix #4997 and all issues mentioned there.

ping @fuglede @Hainish for review

@J0WI J0WI added this to the Before the Next Release milestone Jun 4, 2016
@J0WI

J0WI commented Jun 7, 2016

Copy link
Copy Markdown
Contributor Author

Blocked by #4997 (comment)

@J0WI J0WI removed this from the Before the Next Release milestone Jun 7, 2016
@J0WI J0WI added the conflict label Jul 24, 2016
@J0WI

J0WI commented Jul 26, 2016

Copy link
Copy Markdown
Contributor Author

rebased

@J0WI J0WI added this to the Before the Next Release milestone Jul 26, 2016
@Hainish

Hainish commented Jul 28, 2016

Copy link
Copy Markdown
Member

@J0WI lmk when this is ready for review again and I can check & merge

@J0WI

J0WI commented Jul 28, 2016

Copy link
Copy Markdown
Contributor Author

@Hainish should already be ready.

@Hainish

Hainish commented Jul 29, 2016

Copy link
Copy Markdown
Member

@J0WI okay, I'll review next week (I'm off today)

@J0WI

J0WI commented Aug 3, 2016

Copy link
Copy Markdown
Contributor Author

I also addressed #4997 (comment) now.
cc @loveithateit

@Hainish

Hainish commented Aug 5, 2016

Copy link
Copy Markdown
Member

Some things have come up which means I'll have to postpone reviewing this till next week

@Hainish

Hainish commented Aug 12, 2016

Copy link
Copy Markdown
Member

Looks like ruleset validation isn't passing: payments.amazon.com is included in both src/chrome/content/rules/Amazon.xml as well as src/chrome/content/rules/AmazonAWS.xml. Seems more appropriate in Amazon.xml

@Hainish

Hainish commented Aug 12, 2016

Copy link
Copy Markdown
Member

All the fetch tests look good, and I've looked over the ruleset changes, these look fine. Ready to merge once you remove payments.amazon.com from either of the above-mentioned rulesets.

- removed obsolete sis.
- code style
@J0WI

J0WI commented Aug 13, 2016

Copy link
Copy Markdown
Contributor Author

done

@Hainish
Hainish merged commit 6a64db5 into EFForg:master Aug 14, 2016
@J0WI
J0WI deleted the amazon branch August 14, 2016 13:46
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

HTTPS on Amazon

2 participants