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

[Amazon] Pull amazon orders/customers #1581

Open
wants to merge 117 commits into
base: master
Choose a base branch
from

Conversation

retgoat
Copy link
Contributor

@retgoat retgoat commented Apr 24, 2017

No description provided.

@annappropriate
Copy link
Contributor

Guys, sorry, I fucked up a little, need to force push

@annappropriate annappropriate force-pushed the feature/pull_amazon_orders branch from ad7c179 to 8e4e8cc Compare June 7, 2017 15:14
@annappropriate annappropriate changed the base branch from master to test-branch June 7, 2017 15:23
@annappropriate annappropriate changed the base branch from test-branch to master June 7, 2017 15:24
@annappropriate annappropriate changed the base branch from master to apple-pay-frontend June 7, 2017 15:30
@annappropriate annappropriate changed the base branch from apple-pay-frontend to master June 7, 2017 15:30
Anna Zubenko and others added 7 commits June 7, 2017 18:38
* master: (111 commits)
  Update flyway to 4.2.0 (#2140)
  Fix/solomon login fixes (#2137)
  Update goldrush config generator
  Hotfix datatype
  Another fox for support for 3.5 for builder.py
  Fix builder.py to run with python 3.5
  Indentation 😈
  Create builder.py
  Create README.md
  ArchivedAt fields on links should default to null (#2135)
  Rewrite builder.sh in Python (#2130)
  Create use-cases.md
  Fix create admin ansible playbook
  Create use-cases.md
  Create spec.md
  Create auto-apply-algorithm.md
  Create use-cases.md
  Create use-cases.md
  Create spec.md
  Create use-cases.md
  ...
@annappropriate
Copy link
Contributor

Conflicts. What's up with this branch? Was it tested as intended?

* master: (375 commits)
  fmt
  try to handle errors
  fix: nav icons styling
  chore: update missed icons
  Rename failures file to have a sane name
  Wire up creating a channel in Phoenix
  PR feedback
  Improve formatting of log messages
  Clean up failure and context usage
  Remove 0 from css values
  Add stylelint
  Big refactor of how failures and responses work
  fix quotes usage
  remove personal env file
  chore: update svg-icons
  remove prettier options from Makefile
  Change base image
  Fix docker container, rename public api module
  code review fixes
  prettier bash script. step one
  ...
* master: (309 commits)
  Clean up all remaining Root pattern occurrences
  Review fixes
  Review fixes
  Review fixes
  Review fixes
  fix class name
  minor fix for merge conflict
  fix lint
  Minor fixes
  Dinamic input change validation
  configuration variables for timeouts
  Fix rename algo for S3 uploading while dublicate name is found
  refactor error handling on discounts
  bump to 4.5 and set timeout
  Fix qualifying items label
  Fix promotions paragons usage rules - default value
  fix lint
  Added trigger for product_variant_links
  Fix GC SC txn view order_payment fill from triggers
  Images should be displayed now when searching for products
  ...
* master: (49 commits)
  Fix some broken UI on coupons modal, and proper error message placement
  Nixy integration (#2026)
  Squash and compress images during Docker build (#2142)
  Kubernetes Spike (#1908)
  Modify hotfix so that it checks if the service exists
  Add hotfix to goldrush_appliance
  PR feedback
  revert overlay deletion
  fix build
  unify overlays and use it for menu
  change typeahead z-index
  Add dependent projects into projects dependency resolver
  Lint
  Filter the deleted reviews out
  Minor improvements
  Fix lint
  Add fix-lint script
  Flow
  Style the mobile version
  Remove reviews when Ignore or Delete is pressed
  ...
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.

6 participants