Commit Graph

100 Commits

Author SHA1 Message Date
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
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
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
rzadp
edbe20396b Silent npm installation 2019-05-22 11:26:46 +02:00
rzadp
3cd934a18a Corrected path to contracts 2019-05-22 11:25:37 +02:00
rzadp
cfd1c66ce7 Typo. 2019-05-22 10:32:58 +02:00
rzadp
3117e7a0e2 Actually remove package-lock.json's 2019-05-22 10:16:17 +02:00
rzadp
7d4d05fae5 Constant path to contracts in ui-e2e 2019-05-22 10:15:16 +02:00
rzadp
29da871914 Constant path to contracts in oracle-e2e 2019-05-22 10:12:41 +02:00
rzadp
56b7772439 Updated link to contracts in readme because link to submodules don't work on github 2019-05-22 09:20:16 +02:00
rzadp
8bfee295fa Removed contracts. 2019-05-21 17:06:55 +02:00
rzadp
b9ad9e5332 Renames 2019-05-21 16:51:59 +02:00
rzadp
93d42a34b3 Using monorepo's contracts instead of dockerfile. 2019-05-21 16:51:59 +02:00
rzadp
b39336ea57 Removed obsole ui dockerfile 2019-05-21 16:03:31 +02:00
rzadp
add2d145df Added contracts 2.1.0 2019-05-21 15:30:02 +02:00
rzadp
7716e0e9d1 Removed ui subbmodule 2019-05-21 15:09:44 +02:00
rzadp
7b559f750b Updated readme 2019-05-21 15:07:32 +02:00
rzadp
9a94b24ba7 Removed oracle/submodule 2019-05-21 14:54:13 +02:00