Skip to content

Commit

Permalink
Release 20180926
Browse files Browse the repository at this point in the history 
Merge branch 'staging'

# Conflicts:
#	package.json
  • Loading branch information
Stefan Schiessl committed Sep 26, 2018
2 parents 820b055 + 5fa45df commit 4cd1810
Show file tree
Hide file tree
Showing 45 changed files with 5,159 additions and 165 deletions.
11 changes: 5 additions & 6 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,22 +88,21 @@ Clone this repository, run `docker-compose up` and visit localhost:8080


## Contributing
Please work off the staging branch and make pull requests to that branch. The master branch will only be updated for new releases.
Please work off the develop branch and make pull requests to that branch. The master branch will only be updated for new releases.

The Bitshares UI team is supported by this [worker proposal](http://www.bitshares.foundation/workers/2018-02-bitshares-ui). It provides the funds needed to pay the coordinator and the bounties and the Bitshares Foundation.
The Bitshares UI team is supported by this [worker](https://www.bitshares.foundation/workers/2018-08-bitshares-ui). It provides the funds needed to pay the coordinator and the bounties and the Bitshares Foundation.

If you would like to get involved, we have a [Telegram chatroom](https://t.me/BitSharesDEX) where you can ask questions and get help. You may also join [BitShares on Discord](https://discord.gg/GsjQfAJ)

- Coordinator: Bill Butler, @billbutler
- Project Manager: Magnus Anderson, @startail
- Issue and Funds Coordinator: Bill Butler, @billbutler
- Lead Developer: Sigve Kvalsvik, @sigvek
- Developer: Calvin Froedge, @calvin
- Code Review: Fabian Schuh, @xeroc

## Development process

- New issues will, after enough discussion and clarification, be assigned an estimate time to complete, as well as assigned to the next unstarted milestone, by a project coordinator.
- Milestones are numbered YYMMDD and refer to the **anticipated release date of the next Release Candidate**.
- Release Candidates sits 1 milestone period (2 weeks) for evaluation by the public before release
- Release Candidates sits 1-2 weeks for evaluation by the public before release
- Bugs are always worked before enhancements
- Developers should work each issue according to a numbered branch corresponding to the issue `git checkout -b 123`
- We pay **bounties** for issues that have been estimated. An estimated issue is prefixed with a number in brackets like this: `[2] An nasty bug`. In this example, the bug is valued at two hours ($125 per hour). If you fix this issue according to these guidelines and your PR is accepted, this will earn you $250 bitUSD. You must have a Bitshares wallet and a Bitshares account to receive payment.
Expand Down
212 changes: 196 additions & 16 deletions app/api/apiConfig.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,16 @@ export const widechainAPIs = {
DEPOSIT_HISTORY: "/latelyRecharge"
};

export const citadelAPIs = {
BASE: "https://citadel.li/trade",
COINS_LIST: "/coins",
ACTIVE_WALLETS: "/active-wallets",
TRADING_PAIRS: "/trading-pairs",
DEPOSIT_LIMIT: "/deposit-limits",
ESTIMATE_OUTPUT: "/estimate-output-amount",
ESTIMATE_INPUT: "/estimate-input-amount"
};

export const gdex2APIs = {
BASE: "https://api.gdex.io/adjust",
COINS_LIST: "/coins",
Expand Down Expand Up @@ -137,12 +147,6 @@ export const settingsAPIs = {
operator: "Witness: openledger-dc",
contact: "telegram:mtopenledger"
},
{
url: "wss://bitshares.nu/ws",
location: "Stockholm",
region: "Northern Europe",
country: "Sweden"
},
{
url: "wss://bit.btsabc.org/ws",
region: "Eastern Asia",
Expand All @@ -161,9 +165,138 @@ export const settingsAPIs = {
},
{
url: "wss://japan.bitshares.apasia.tech/ws",
location: "Tokyo",
country: "Japan",
region: "Southeastern Asia",
operator: "APAsia",
operator: "Flash Infrastructure Worker",
contact: "telegram:murda_ra"
},
{
url: "wss://status200.bitshares.apasia.tech/ws",
location: "New Jersey",
country: "U.S.A.",
region: "Central America",
operator: "Flash Infrastructure Worker",
contact: "telegram:murda_ra"
},
{
url: "wss://new-york.bitshares.apasia.tech/ws",
location: "New York",
country: "U.S.A.",
region: "Central America",
operator: "Flash Infrastructure Worker",
contact: "telegram:murda_ra"
},
{
url: "wss://dallas.bitshares.apasia.tech/ws",
location: "Dallas",
country: "U.S.A.",
region: "Central America",
operator: "Flash Infrastructure Worker",
contact: "telegram:murda_ra"
},
{
url: "wss://chicago.bitshares.apasia.tech/ws",
location: "Chicago",
country: "U.S.A.",
region: "Central America",
operator: "Flash Infrastructure Worker",
contact: "telegram:murda_ra"
},
{
url: "wss://atlanta.bitshares.apasia.tech/ws",
location: "Atlanta",
country: "U.S.A.",
region: "Central America",
operator: "Flash Infrastructure Worker",
contact: "telegram:murda_ra"
},
{
url: "wss://us-la.bitshares.apasia.tech/ws",
location: "Los Angeles",
country: "U.S.A.",
region: "Central America",
operator: "Flash Infrastructure Worker",
contact: "telegram:murda_ra"
},
{
url: "wss://seattle.bitshares.apasia.tech/ws",
location: "Seattle",
country: "U.S.A.",
region: "Central America",
operator: "Flash Infrastructure Worker",
contact: "telegram:murda_ra"
},
{
url: "wss://miami.bitshares.apasia.tech/ws",
location: "Miami",
country: "U.S.A.",
region: "Central America",
operator: "Flash Infrastructure Worker",
contact: "telegram:murda_ra"
},
{
url: "wss://valley.bitshares.apasia.tech/ws",
location: "Silicone Valley",
country: "U.S.A.",
region: "Central America",
operator: "Flash Infrastructure Worker",
contact: "telegram:murda_ra"
},
{
url: "wss://canada6.daostreet.com",
location: "Toronto",
country: "Canada",
region: "Northern America",
operator: "Flash Infrastructure Worker",
contact: "telegram:murda_ra"
},
{
url: "wss://bitshares.nu/ws",
location: "Stockholm",
region: "Northern Europe",
country: "Sweden",
operator: "Flash Infrastructure Worker",
contact: "telegram:StaflunD"
},
{
url: "wss://api.open-asset.tech/ws",
location: "Frankfurt",
region: "Western Europe",
country: "Germany",
operator: "Flash Infrastructure Worker",
contact: "telegram:StaflunD"
},
{
url: "wss://france.bitshares.apasia.tech/ws",
location: "Paris",
country: "France",
region: "Western Europe",
operator: "Flash Infrastructure Worker",
contact: "telegram:murda_ra"
},
{
url: "wss://england.bitshares.apasia.tech/ws",
location: "London",
country: "England",
region: "Northern Europe",
operator: "Flash Infrastructure Worker",
contact: "telegram:murda_ra"
},
{
url: "wss://netherlands.bitshares.apasia.tech/ws",
location: "Amsterdam",
country: "Netherlands",
region: "Northern Europe",
operator: "Flash Infrastructure Worker",
contact: "telegram:murda_ra"
},
{
url: "wss://australia.bitshares.apasia.tech/ws",
location: "Sidney",
country: "Australia",
region: "Australia",
operator: "Flash Infrastructure Worker",
contact: "telegram:murda_ra"
},
{
Expand All @@ -184,8 +317,11 @@ export const settingsAPIs = {
},
{
url: "wss://dex.rnglab.org",
location: "Netherlands",
operator: "Witness: rnglab"
region: "Northern Europe",
country: "Netherlands",
location: "Amsterdam",
operator: "Witness: rnglab",
contact: "keybase:rnglab"
},
{
url: "wss://la.dexnode.net/ws",
Expand All @@ -211,7 +347,6 @@ export const settingsAPIs = {
operator: "Witness: xeldal",
contact: "telegram:xeldal"
},
{url: "wss://btsza.co.za:8091/ws", location: "Cape Town, South Africa"},
{
url: "wss://api.bts.blckchnd.com",
region: "Western Europe",
Expand Down Expand Up @@ -301,9 +436,11 @@ export const settingsAPIs = {
},
{
url: "wss://api.btsxchng.com",
location:
"Global (Asia Pacific (Singapore) / US East (N. Virginia) / EU (London))",
operator: "Witness: elmato"
region: "Multiple",
country: "Worldwide",
location: "Singapore / N. Virginia / London",
operator: "Witness: elmato",
contact: "telegram:elmato"
},
{
url: "wss://api.bts.network/",
Expand Down Expand Up @@ -353,8 +490,11 @@ export const settingsAPIs = {
},
{
url: "wss://bts.proxyhosts.info/wss",
location: "Germany",
operator: "Witness: verbaltech2"
region: "Western Europe",
country: "Germany",
location: "",
operator: "Witness: verbaltech2",
contact: "keybase:jgaltman"
},
{
url: "wss://bts.open.icowallet.net/ws",
Expand All @@ -364,6 +504,22 @@ export const settingsAPIs = {
operator: "Witness: magicwallet.witness",
contact: "telegram:plus_wave"
},
{
url: "wss://de.bts.dcn.cx/ws",
region: "Western Europe",
country: "Germany",
location: "Nuremberg",
operator: "Witness: fla01",
contact: "telegram:Otherego;telegram:BarefootMouse"
},
{
url: "wss://fi.bts.dcn.cx/ws",
region: "Northern Europe",
country: "Finland",
location: "Helsinki",
operator: "Witness: fla01",
contact: "telegram:Otherego;telegram:BarefootMouse"
},
{
url: "wss://crazybit.online",
region: "Asia",
Expand Down Expand Up @@ -444,6 +600,14 @@ export const settingsAPIs = {
operator: "Witness: zapata42-witness",
contact: "telegram:Zapata_42"
},
{
url: "wss://citadel.li/node",
region: "Western Europe",
country: "Iceland",
location: "Reykjavik",
operator: "CITADEL",
contact: "email:citadel.li;support"
},
// Testnet
{
url: "wss://node.testnet.bitshares.eu",
Expand All @@ -466,7 +630,15 @@ export const settingsAPIs = {
region: "TESTNET - Northern America",
country: "U.S.A.",
location: "Dallas",
operator: "APAsia",
operator: "Flash Infrastructure Worker",
contact: "telegram:murda_ra"
},
{
url: "wss://testnet-eu.bitshares.apasia.tech/ws",
region: "TESTNET - Northern Europe",
country: "Netherlands",
location: "Amsterdam",
operator: "Flash Infrastructure Worker",
contact: "telegram:murda_ra"
},
{
Expand All @@ -476,6 +648,14 @@ export const settingsAPIs = {
location: "Paris",
operator: "Witness: zapata42-witness",
contact: "telegram:Zapata_42"
},
{
url: "wss://testnet.bts.dcn.cx/ws",
region: "TESTNET - Europe",
country: "Germany / Finland",
location: "Nurenberg / Helsinki",
operator: "Witness: fla-test",
contact: "telegram:Otherego;telegram:BarefootMouse"
}
],
DEFAULT_FAUCET: getFaucet().url,
Expand Down
7 changes: 7 additions & 0 deletions app/assets/locales/locale-de.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -799,6 +799,13 @@
"calc": "Calculating",
"choose_deposit": "Please select the coin you would like to deposit",
"choose_withdraw": "Please select the coin you would like to withdraw",
"citadel": {
"coming_soon": "Coming soon",
"min_amount": "Minimum amount: %(minAmount)s %(symbol)s",
"min_amount_error": "Please enter number >= minimum",
"support_block": "For support, please contact citadel.li at:",
"under_construction": "Under Construction"
},
"contact_TRADE": "Contact Blocktrades",
"convert": "Internal conversion",
"convert_coin": "Convert to %(coin)s (%(symbol)s)",
Expand Down
Loading

0 comments on commit 4cd1810

Please sign in to comment.