Commit Graph

215 Commits

Author SHA1 Message Date
Alexander Kolotov
87cbb378a7
Merge pull request #70 from poanetwork/latest-updates-migration
Migration of latest changes from the oracle and UI repos
2019-05-24 14:34:08 +03:00
Alexander Kolotov
7486ef0491 migrate changes from https://github.com/poanetwork/token-bridge/pull/147 2019-05-24 12:49:35 +03:00
Alexander Kolotov
6dcacef3bd migrate changes from https://github.com/poanetwork/token-bridge/pull/143 2019-05-24 12:49:05 +03:00
Alexander Kolotov
b19ec7a191 migrate changes from https://github.com/poanetwork/bridge-ui/pull/218 2019-05-24 12:48:34 +03:00
rzadp
d1067a94bb Removed redundant DEPLOYMENT_GAS_LIMIT env variable 2019-05-24 11:30:51 +02:00
rzadp
e2cc5e17b0 Removed contracts-2.2.0 module 2019-05-24 10:49:20 +02:00
rzadp
27ec83048f Switch ui-e2e contracts to 2.3.1. Update envs and deploy script 2019-05-24 10:47:09 +02:00
rzadp
52684a30fd Lint 2019-05-24 09:54:13 +02:00
rzadp
041d36fc3c Revert "One job."
d4327f8c0a2ccc5e9d80068a0fe187ca215c7ec8
2019-05-24 09:37:03 +02:00
rzadp
875d7972a4 Switched contracts to 2.3.1 2019-05-24 09:28:24 +02:00
rzadp
eb97b4b135 Merge master into oracle-e2e-contracts 2019-05-24 09:26:58 +02:00
Alexander Kolotov
7a1ce41d8a
Merge pull request #66 from poanetwork/docker-package-lock
Change oracle production docker context
2019-05-23 23:00:44 +03:00
rzadp
fb4f7ee85a Revert "Test script"
b085c00616a933e18fe70e8d7757c5d52b5cbaa8
2019-05-23 15:32:05 +02:00
rzadp
d4327f8c0a One job. 2019-05-23 15:27:24 +02:00
rzadp
6175ee19a1 Updated envs. 2019-05-23 15:17:57 +02:00
rzadp
f5516a42fe Update deployment script 2019-05-23 15:11:35 +02:00
rzadp
a1b85a7cc1 Changed order in Dockerfile.e2e to utilize docker build cache 2019-05-23 15:01:24 +02:00
rzadp
b085c00616 Test script 2019-05-23 15:01:17 +02:00
rzadp
84e28f46b8 Changed contracts to main sub-dir 2019-05-23 15:01:13 +02:00
rzadp
a714aec482 Merge master into docker-package-lock 2019-05-23 14:57:06 +02:00
Alexander Kolotov
d98073bb9a
Merge pull request #61 from poanetwork/dotfiles
Merge dotfiles
2019-05-23 15:32:57 +03:00
rzadp
f22e32c138 Ignoring images only in the oracle 2019-05-23 14:30:35 +02:00
rzadp
3ab05cf728 Ignoring images only in the oracle 2019-05-23 14:04:41 +02:00
rzadp
ad9cb26f66 Fix ui-e2e tests not working on CI 2019-05-23 13:53:03 +02:00
rzadp
1595405749 Fix ui-e2e tests not working on CI 2019-05-23 13:52:50 +02:00
rzadp
cbb55318ac Update dockerignore 2019-05-23 11:46:32 +02:00
rzadp
5e698821bb Ignoring .git 2019-05-23 11:45:37 +02:00
rzadp
cc9d475ece Dockerignore 2019-05-23 11:45:18 +02:00
rzadp
082db73402 Updated build paths in e2e 2019-05-23 11:39:51 +02:00
rzadp
2c7c70f608 Common dockerignore. 2019-05-23 11:16:50 +02:00
rzadp
14a298f70c Production installation 2019-05-23 11:13:22 +02:00
rzadp
ef0b9662d2 Use main yarn.lock when building oracle docker 2019-05-23 11:11:00 +02:00
rzadp
2a509990ca Removed submodules 2019-05-23 10:48:18 +02:00
rzadp
ec8493aa44 Duplicating dockerignore for oracle 2019-05-23 10:45:55 +02:00
rzadp
1aae490454 Simplidied dockerignore 2019-05-23 10:42:24 +02:00
rzadp
5085842153 Merge master into dotfiles 2019-05-23 10:25:18 +02:00
Alexander Kolotov
97f80dc95a
Merge pull request #54 from poanetwork/dockerfile-and-contracts
Remove sub-dockerfiles and sub-contracts
2019-05-22 18:46:48 +03:00
rzadp
31f2788a2b Merged dockerignore 2019-05-22 17:03:31 +02:00
rzadp
fddaab2378 Remove nyc config file (as it's not used) 2019-05-22 16:35:31 +02:00
rzadp
4b32e8de41 Move .editorconfig to root dir. 2019-05-22 16:33:28 +02:00
rzadp
6f573b9b67 Consolidated .nvmrc 2019-05-22 16:31:45 +02:00
rzadp
a957d7a827 Consolidated .gitignore 2019-05-22 16:31:45 +02:00
rzadp
697a6f4c7f Merge master into dockerfile-and-contracts 2019-05-22 16:31:36 +02:00
Przemyslaw Rzad
6dc4fc6acd
Configured Prettier (#60)
* Apply prettier fixes for UI

* Integrate prettier into linting. Remove duplicate .prettierrc.

* Common .eslintignore. Removed reduntant prettier check

* Apply prettier on ui script

* Correct linting

* Duplicate plugin

* Common plugin
2019-05-22 16:31:09 +02:00
rzadp
1f77607df2 Rename Dockerfile to Dockerfile.e2e. 2019-05-22 16:25:32 +02:00
rzadp
6b0f402cf8 Removed duplicate env variable 2019-05-22 16:14:40 +02:00
rzadp
48e591ef45 Merge master into dockerfile-and-contracts 2019-05-22 16:12:09 +02:00
Przemyslaw Rzad
19a3314c42
Added Coveralls for UI (#59)
* Adding coveralls

* cover on master only

* Added dependencies badge

* Revert "Added dependencies badge"

420d5276e1cff2557c76937f69166450dd98d340

* Added badge in ui sub-dir. fixed workflow
2019-05-22 16:09:02 +02:00
rzadp
9711fb2363 Get rid of contracts-2.1.0 no longer used 2019-05-22 11:41:03 +02:00
rzadp
fbedc7ee5e Try to run ui-e2e on 2.2.0 contracts 2019-05-22 11:29:01 +02:00