diff --git a/.travis.yml b/.travis.yml index 76893581e2..80e20c0287 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ env: - ORGANIZATION_REPO: blckchnd/rudex.org - WALLET_REPO: blckchnd/market.rudex.org - CXX=g++-4.8 - - secure: QEIqqSio+7rPwcPI9jXpykKRVNEt12dzUKo50CVIGwJpF9BkGtTADc51dseFft1ZYPI+zsGd0E9PmQlCGjDj9Dz3fY8J8D4YWtN8T9HJtVH86nCJNWfAI7kNmuF2eam4UqRIg+1Wnm2BWdvzMt1Fkt5wvaQ+xNF7eKvTYACcXlJgVkK+BEyEL5xPlecxEJ536F8I1UziTXNwY5bciwwxLDuqrhnkQkBAs5SGtiyjWJ1WHwcCx8kDCRh2LP/OlegLmfx3Xag/4tGt+2eyVnvNoFYT+/P7CRN9GO9o0ZgBwYVy39K4qdrR+XWP7Dt6hkB5CqDpOno/kdGDwcZRw8KHIq5BI7qQvAWN7Q4LigRsjAAu1OAwY9xKH/3CeSWILr/pT/m6BpuiuFvunjxIARmQXk2ThEA6oPKj7YZgKOdag18o7/Kn+2eLOeR14UVHqt7aBH8wVAFULWRFzyWF2S6+l7+UGWsCyvG+swSymh3OlQXNEGTKZ42n5YgW9q+EymVUDHZmPsUJunMrbBWaai6VEUnnMJu3KbXLJ/F0AaTJe7R0J9U1wiON3T6a9NYE6eKSr0xIE2DGsFIm5vrpXop5JqavD2uFm9Dpysa/AU41ma8dauavV65x6dN7ZLeymidUdjnGjFPZzLqLuUC6BwYXxC2YTF8jADyKYcEZB/eQIHo= + - secure: ZKXEycCWVgVztdhJhX66m4bGFg/cjp8EBqwFfsHnu5/J4Xa6LYXFXW7r+a+ALkRPizDUQwK4e5x3l26zfXDEn+rBqkDlTao4Grxo8aQWkhtDP5mcnwsUT3SKHt45zxl214eqfxK7UUL+14Hi8/Y8yj99i43YEX4no+EL7seTqGlm6TrfdIGtEb0PaF2yrlFjVXXHuXg5hmgstrbKLJDlX0p0U9PKBhnjrubeVC1ms5PzQY4j4dZV52satrzwBhxBqnLlJBniJhG3C/uM7pFx68iVkjSR4v5U8ZHR7s8IjIA5uK+uXQJKAbn82MPx01qwQ5yDJ8xKNkpq7zDVp3VWC3sXU3JBJ9v7c7pe6eonqiV9ejOGav0WlPgTj5K+9SkYYIBZQpyr6OUw3QJPxe8xrOC6TpRsBIsapwvbhFLK0yBZ73eHBPC4PthIoxJKai72p6srX2E6cdtP7/6sZK6m2rFyXySTyJ2kjCBA65Ptn/MGXSq2fxqCZ3sXqLrjGcwQZbdShiomIu7qHfFUhgGhgKMjUbsP3uhH2XfAaEeNfk48XmxYr8GC9hlcUJyPLIIMK6UIOfWGJZ8Mr2dsPWKWYxhVLb5DCcQwyuYJRqvxQ1S73Tp9cPwg1bBFrmHCq/YNuDDwreCNLFMZQWjdve8kMVF0gXlP/9Sa7FExOr9zrZU= addons: apt: sources: @@ -35,7 +35,7 @@ deploy: name: "$TRAVIS_TAG" body: "Automated release from Travis CI with added files from AppVeyor build" api_key: - secure: WJXIYvyVn5VigQ6gsa8n+PjtDS/E+F9pQouzvJ8NAhUWVgDtEzLGm0jDRg9gsh/zmeB14eiyCrkNYH45FYiTMWDz+8ydzJXeBoWkpwduFWPb1sifRrEuPVUIJ2mDK5UBW4eobQHNda9taUxTBL/VdgZC9KLFuzhwzcFkdkLcBuLZYrmvgziEmJNkQ4/eHc6+n/Hug+dTDIenKcSbw8RH2AZNnGqQOCqEpl8LNMUhl6RczGXC8uu49EMPOON8Km+nlh4frkImbXuXMyudPl3iwTMiZE6xPex5IHS3vbaEbKfJTprNLFnyZyOZnhUCDNatNsRTlrQLMoQgEMYStb9huI/xVdJ6hKZgdVNjiu2ZCYUyxmy2WxBuGc0GBXrojJX4x4U7/+cXohk3DNBMLDcRPQAqWAtre/arIAJLJDi+hVFOmsi03KoWt5F7wduPQe8liaQtLDTa490tdIpJqyUgEKFSEciazkhjd9ggiob2lj+kCfWNe4kPzUogJ+MoenxctIk4aQE/FumnoyjkgOd3bEGMik3B41X6UpRDWqOtkvDRfPw9Pqd9EzjfRiaS7VsjO/ehYflOAdBvpy/PmvYIjdFl/Ij2h3tny74ze4ywVk2xLfN+CQtESHvwVAC1nvcyMvmUj5Wk7eBBnwJeYYGDUhPrB74HMzAFhBgPhq8MfTs= + secure: Uy58PmD81D5vPSQCVncHpac04Af/jGmq0Lx8vDbw86QSCvItxAYkUXgDOdlTfLcxomaJjn/XgldIKX26nfLqAgBe+EIOzf6qFb/HoTDR3duTGJZ7Vsn4BSkuoupVfGa/N6qtcM6tbxfbRIEI5tGDVRYA3RRzCRSx+r4W5x70CHMP8h+WWH+pewDcm8G8dAmD3jeB+kY94/FwWLynhlHyxQOvdnbdjGglWEazaGm4vFVR1SCreJQokO3X3dBLRf58/Zp+nWeSfeTmx8VI+dQ3z1Qs/ivyg/O81+EOVX3JDbvIYha1A/b910JeL8gjF6mmE9sLNlVnBYmb27b593TqyApXifdw0NcxoNao0YTcs8VKMXIBFOo5wqlcHHtOZU87+uX+EY/sln84tFsT1LPonGJ8vFeJWOkobOjTt86/NDgBTEK4QqeMPs06olbK8tZ6ysYiNsj+UXXrI27rbFv57UbokRSpaj+bdJbYnlw9WaFH/UTrzaanhIzP7ScXkJpdJfRQYgTb7LbxO9cgRnvwlTkTinUclak2p2oNYSZOI1hzZoCTCYqfwaE+KqGCjZK3oRCHtD/ZAglDVFFqfqKzL1akbRlWFBxwHmWkoSLYlrSLjD+pudxiNXzM6UTRWdqQ9Alf7xdUpTllPzEyaN7GVafNTuFNdcJiONRb2gnM8kc= file_glob: true file: - build/binaries/RuDEX* diff --git a/app/api/apiConfig.js b/app/api/apiConfig.js index bf865a3195..78eacfe8f1 100644 --- a/app/api/apiConfig.js +++ b/app/api/apiConfig.js @@ -52,6 +52,14 @@ export const settingsAPIs = { operator: "Witness: blckchnd", contact: "telegram:blckchnd" }, + { + url: "wss://node.rudex.org", + region: "Western Europe", + country: "Germany", + location: "Falkenstein", + operator: "Witness: blckchnd", + contact: "telegram:blckchnd" + }, { url: "wss://gph.lexai.host", region: "Northern Europe", diff --git a/app/assets/asset-symbols/landlord.png b/app/assets/asset-symbols/landlord.png new file mode 100644 index 0000000000..71e006aec9 Binary files /dev/null and b/app/assets/asset-symbols/landlord.png differ diff --git a/app/assets/asset-symbols/symbols.js b/app/assets/asset-symbols/symbols.js index 4db51d1ea6..164c115e37 100644 --- a/app/assets/asset-symbols/symbols.js +++ b/app/assets/asset-symbols/symbols.js @@ -16,6 +16,7 @@ require("file-loader?name=asset-symbols/[name].png!./silver.png"); // RuDEX assets require("file-loader?name=asset-symbols/[name].png!./donate.png"); require("file-loader?name=asset-symbols/[name].png!./dexbot.png"); +require("file-loader?name=asset-symbols/[name].png!./landlord.png"); require("file-loader?name=asset-symbols/[name].png!./rudex.btc.png"); require("file-loader?name=asset-symbols/[name].png!./rudex.ltc.png"); diff --git a/app/assets/coins-logo/coins.js b/app/assets/coins-logo/coins.js index bbf6135af0..9f0a343806 100644 --- a/app/assets/coins-logo/coins.js +++ b/app/assets/coins-logo/coins.js @@ -1,3 +1,4 @@ +/* require("file-loader?name=coins-logo/[name].png!./NoLogo.png"); require("file-loader?name=coins-logo/[name].png!./xmr.png"); require("file-loader?name=coins-logo/[name].png!./waves.png"); @@ -27,5 +28,7 @@ require("file-loader?name=coins-logo/[name].png!./bat.png"); require("file-loader?name=coins-logo/[name].png!./bam.png"); require("file-loader?name=coins-logo/[name].png!./dc.png"); require("file-loader?name=coins-logo/[name].png!./bccx.png"); +require("file-loader?name=coins-logo/[name].png!./ton.png"); require("file-loader?name=coins-logo/[name].png!./pzm.png"); +*/ diff --git a/app/assets/coins-logo/gram.png b/app/assets/coins-logo/ton.png similarity index 100% rename from app/assets/coins-logo/gram.png rename to app/assets/coins-logo/ton.png diff --git a/app/assets/images/dexbotfund.png b/app/assets/images/dexbotfund.png new file mode 100644 index 0000000000..d560d62d81 Binary files /dev/null and b/app/assets/images/dexbotfund.png differ diff --git a/app/assets/images/images.js b/app/assets/images/images.js index 8e032fad36..94b3738c0b 100644 --- a/app/assets/images/images.js +++ b/app/assets/images/images.js @@ -1,4 +1,5 @@ require("file-loader?name=images/[name].png!./android.png"); +require("file-loader?name=images/[name].png!./dexbotfund.png"); require("file-loader?name=images/[name].png!./coinmarketcap.png"); require("file-loader?name=images/[name].png!./coinpaprika.png"); require("file-loader?name=images/[name].png!./coinranking.png"); diff --git a/app/assets/index.hbs b/app/assets/index.hbs index dcdafc7722..96ff206d5d 100644 --- a/app/assets/index.hbs +++ b/app/assets/index.hbs @@ -9,7 +9,7 @@ {{title}} - +