Commit Graph

9785 Commits

Author SHA1 Message Date
Fred Carlsen
00dbddc1aa Merge remote-tracking branch 'upstream/development' into website
# Conflicts:
#	packages/website/package.json
#	packages/website/ts/style/colors.ts
2018-12-05 16:15:44 +01:00
Leonid Logvinov
b411e2250a Merge pull request #1384 from 0xProject/feature/contracts-monorepo-3
Contracts monorepo 4 feat
2018-12-05 09:39:10 +01:00
Jacob Evans
740b73276f chore: Remove increaseTimeAsync from DutchAuction.
Dutch auctions can be made in the past so we do not need to artificially increase time
2018-12-05 18:13:48 +11:00
Steve Klebanoff
2f50cca480 Merge pull request #1382 from 0xProject/fix/instant/center-powered-by
[instant] Center powered by and change to text to Connect
2018-12-04 17:41:42 -08:00
Brandon Millman
0a944244cf Merge pull request #1379 from 0xProject/fix/instant/overlay-color
[instant] add stable class name to overlay close button and adjust overlay color
2018-12-04 17:37:53 -08:00
Steve Klebanoff
9aff0dfed0 Merge pull request #1381 from 0xProject/feature/magic-input-error
[instant] Magic input to trigger error for production Rollbar testing
2018-12-04 17:26:04 -08:00
Steve Klebanoff
40ac4509ca Wallet prompt tweaks per Chris's comment 2018-12-04 17:24:34 -08:00
Steve Klebanoff
4e7031e96d Merge pull request #1371 from 0xProject/feature/instant/log-decimals-and-add-event-properties
feat(instant): More event properties for tracking
2018-12-04 17:20:58 -08:00
Steve Klebanoff
0af1bf11c8 Use git sha and npm version from constants 2018-12-04 17:11:58 -08:00
Steve Klebanoff
d579ba1eda Please unlock -> Click to connect 2018-12-04 16:45:09 -08:00
Steve Klebanoff
f327d7b4d9 fix(instant): center powered by 0x svg 2018-12-04 16:41:47 -08:00
Steve Klebanoff
04226106a2 ethBalanceInUnitAmount -> lastEthBalanceInUnitAmount 2018-12-04 16:33:49 -08:00
Steve Klebanoff
a138ee7e83 Add GIT_SHA and NPM_VERSION constants, report git and npm version in error 2018-12-04 16:10:56 -08:00
Steve Klebanoff
1cc043d7a9 feat(instant): input to trigger error for rollbar testing 2018-12-04 15:58:36 -08:00
Steve Klebanoff
a8a6baf964 Merge pull request #1380 from 0xProject/instant/fix/heap-analytics-id-prod
[instant] Ensure build process receives build arguments
2018-12-04 15:58:13 -08:00
Francesco Agosti
243a099858 Merge pull request #1376 from 0xProject/feature/instant/padding-spacing-polish
[instant] Reduce vertical padding in instant
2018-12-04 15:53:46 -08:00
Brandon Millman
feb715a08b fix(instant): remove extra container around the button 2018-12-04 15:44:48 -08:00
Steve Klebanoff
1b4c477ddb Ensure build process receives build arguments
See https://github.com/entropitor/dotenv-cli/issues/8
2018-12-04 15:42:56 -08:00
Brandon Millman
8b659dbd77 feat(instant): give a stable class name to the close button on the overlay 2018-12-04 15:36:51 -08:00
Brandon Millman
14ad091e83 fix(instant): lighten the overlay color to 0.7 opacity from 0.9 2018-12-04 15:20:26 -08:00
fragosti
340493a0b1 polish: reduce vertical padding in instant 2018-12-04 13:36:47 -08:00
Leonid Logvinov
b1a8a5521e Merge pull request #1374 from 0xProject/feature/contracts-monorepo-4
Contracts monorepo 4
2018-12-04 17:22:25 +01:00
Leonid Logvinov
323195f4ad De-nest libs contracts 2018-12-04 17:18:10 +01:00
Leonid Logvinov
c43ba6b3c7 Merge pull request #1373 from 0xProject/feature/contracts-monorepo-3
Contracts monorepo III
2018-12-04 17:05:57 +01:00
Ezekiel Aquino
b552c2bd0c Cleanup 2018-12-04 17:00:30 +01:00
Ezekiel Aquino
ae9614ba36 Fixes Link component to user ReactRouterLink 2018-12-04 16:47:58 +01:00
Ezekiel Aquino
871ec6cfbc Adds sa bit of polish to landing page 2018-12-04 16:41:01 +01:00
Ezekiel Aquino
3c7dca37f5 Adds padding prop to text elements 2018-12-04 16:30:12 +01:00
Leonid Logvinov
8d0192c1eb Enable libs tests on CI 2018-12-04 16:07:59 +01:00
Leonid Logvinov
ac5a3fae9b Import TestLibs contract from @0x/contracts-libs 2018-12-04 16:07:59 +01:00
Leonid Logvinov
9e01f4c9a3 Refactor out libs into @0x/contracts-libs 2018-12-04 16:07:59 +01:00
Ezekiel Aquino
8acb25f577 Refactors buttons/links/header 2018-12-04 15:45:04 +01:00
Ezekiel Aquino
eec40080a0 Refactors Button component 2018-12-04 15:17:33 +01:00
Leonid Logvinov
18489161c6 Add missing dependency 2018-12-04 15:03:50 +01:00
Ezekiel Aquino
4da419cf75 Fixes all lint issues, cleanup 2018-12-04 14:58:37 +01:00
Leonid Logvinov
d63576f495 Fix homepage link 2018-12-04 14:49:01 +01:00
Leonid Logvinov
f0213f9a8e Enable contract utils tests 2018-12-04 14:42:18 +01:00
Leonid Logvinov
e8d0aff333 Refactor @0x/contracts-utils from @0x/contracts-core 2018-12-04 14:41:18 +01:00
Leonid Logvinov
79f5e36edb Merge pull request #1311 from 0xProject/feature/contracts-monorepo-2
Contracts monorepo II
2018-12-04 13:53:15 +01:00
Leonid Logvinov
a872763413 Fix calldata related linter errors 2018-12-04 13:45:19 +01:00
Leonid Logvinov
55ebb04f03 Add missing dependency 2018-12-04 13:41:17 +01:00
Leonid Logvinov
6d312f0230 Fix merge conflict 2018-12-04 13:25:37 +01:00
Leonid Logvinov
240a8a50d3 Merge branch 'development' into feature/contracts-monorepo-2 2018-12-04 12:42:28 +01:00
Leonid Logvinov
672a4b93ba Don't start the provider by default 2018-12-04 12:10:03 +01:00
Jacob Evans
a1e985a1ca Merge pull request #1225 from 0xProject/feature/contracts/dutch-auction
Implement Basic Dutch Auction
2018-12-04 12:44:19 +11:00
Brandon Millman
8c146ce231 Merge pull request #1372 from 0xProject/fix/instant/single-asset
[instant] render token selector when only one asset is available
2018-12-03 17:08:32 -08:00
Steve Klebanoff
703cea6173 Merge pull request #1370 from 0xProject/feature/instant/explicitly-enable-heap-dev
[instant] Must explicitly specify when want to send to heap when developing
2018-12-03 16:52:06 -08:00
Brandon Millman
e592b27f77 fix(instant): render token selector when only one asset is available 2018-12-03 16:36:27 -08:00
Steve Klebanoff
1107b84949 updating .env example 2018-12-03 16:10:13 -08:00
Steve Klebanoff
7a03df946d feat(instant): Add eth balance, eth address, token symbol and decimals to event properties 2018-12-03 16:01:37 -08:00