Commit Graph

602 Commits

Author SHA1 Message Date
Mike Rosseel
b8b84bc35f
Add Bitcoin Cash, Bitcoin Gold and Bitcoin Clashic so that these can
be transacted in a privacy-preserving way
2017-11-25 10:07:25 +01:00
Manfred Karrer
07d85b3f8b
Set version 0.6.1. Add versions for seed and statistics nodes 2017-11-24 14:23:49 -05:00
Manfred Karrer
b7e55ef426
Merge branch 'master' of https://github.com/madcoin-project/exchange into madcoin-project-master 2017-11-24 13:31:30 -05:00
Manfred Karrer
af754706f6
Add Sepa instant payment 2017-11-23 19:13:43 -05:00
Christoph Atteneder
b680bf9b5d
Fix truncation issues and add missing translations 2017-11-23 18:21:43 +01:00
Christoph Atteneder
6b65262fc3
Use a more general wording for nodes that violate consensus rules 2017-11-23 18:11:49 +01:00
Manfred Karrer
6137ec53ae
Merge branch 'Development' 2017-11-23 09:02:58 -05:00
Christoph Atteneder
fd8c923a40
Remove unused translation keys 2017-11-17 15:12:30 +01:00
madcoin-project
235aef2a06
Update CurrencyUtil.java 2017-11-16 19:41:21 +00:00
Manfred Karrer
1897d892f4
Fix build script and print altcoin list for webpage 2017-11-16 13:58:22 -05:00
Manfred Karrer
e6248b8611
Release candidate v0.6.0 2017-11-16 10:40:39 -05:00
Manfred Karrer
0175c43d9d
Fix display strings. Add info when btc localhost is used 2017-11-16 09:34:07 -05:00
Manfred Karrer
d99461deee
Use new data structure for TradeStatistics 2017-11-15 19:22:11 -05:00
sqrrm
50ffed89cc
Fix some grammar 2017-11-14 19:07:19 +01:00
Chris Beams
05896e3369
Update fee estimate URL from 21.co => earn.com
Per the announcement quoted below at
https://news.earn.com/21-co-is-now-earn-com-3e37e50c444f, this change
updates all instances of the bitcoinfees.21.co to bitcoinfees.earn.com.

> Our Bitcoin Fees and Bitnodes services will now be canonically hosted
at bitcoinfees.earn.com and bitnodes.earn.com respectively. You can
still access them via bitcoinfees.21.co and bitnodes.21.co — though
there will be the slight overhead of a 301 redirect, so you should
update to the earn.com versions of the URLs for maximum performance.
2017-11-13 13:02:00 +01:00
Manfred Karrer
2778456b13
Cleanup seed restore screens. Add try/cathc for wallet encryption. Add more warnings when applying seed words. 2017-11-12 21:01:57 -05:00
Manfred Karrer
32180c9fa4
Add <open log file> button to error msg popup 2017-11-12 20:16:31 -05:00
Manfred Karrer
9f22836405
Merge branch 'particl' of https://github.com/rynomster/exchange into rynomster-particl 2017-11-12 18:21:09 -05:00
Manfred Karrer
2583ddf044
Fix text. Improve logging. Add check for BankAccount 2017-11-12 12:45:48 -05:00
rynomster
71700a2a87 Add Particl 2017-11-12 19:35:59 +02:00
Manfred Karrer
1a3bdf0f71
Add receipt requirement to WU trade process 2017-11-12 08:52:58 -05:00
Manfred Karrer
7b4ae3f3e4
Use upper case for Bisq 2017-11-11 20:10:35 -05:00
Ricardo Filipe
21d2dc70d6 update translations 2017-11-12 00:45:46 +00:00
Ricardo Filipe
a20d64a491 sync fork with upstream 2017-11-12 00:42:27 +00:00
Ricardo Filipe
e171106f7c update translated languages 2017-11-12 00:22:20 +00:00
Manfred Karrer
6f0a7e7036
Add missing parts for WU support 2017-11-11 15:23:10 -05:00
Nolaan
53919fb6c8 Western Union payment method
Prepare Western Union Paymenet Method UI and logic.
2017-11-11 16:45:41 +01:00
Manfred Karrer
01d4c6fb8c
Set delay for persistence in each client 2017-11-10 21:17:40 -05:00
Manfred Karrer
5e95e162bf
Add user defined currencies to offers and trades list in market screen 2017-11-10 14:08:29 -05:00
Manfred Karrer
a4ac3115e1
Improve wording 2017-11-10 13:40:53 -05:00
Manfred Karrer
330a531e01
Add dispute to list before setting state in trade (caused bug in UI) 2017-11-10 13:29:02 -05:00
Manfred Karrer
209b57a8ee
Refactor isCapabilitySupported method and add test 2017-11-09 15:25:41 -05:00
Manfred Karrer
c72888c86d
Deable dev mode 2017-11-09 14:40:01 -05:00
Manfred Karrer
6e19c69a47
Add maxTradePeriod to PaymentAccountPayload again as it would break trade contract otherwise 2017-11-09 14:34:37 -05:00
Manfred Karrer
706710a555
devtest wip 2017-11-09 13:08:51 -05:00
Manfred Karrer
7e3b7f22cf
Remove outdated in_dev translation files 2017-11-08 11:21:07 -05:00
Manfred Karrer
677d7dc477
Set v0.6.0 2017-11-08 11:11:51 -05:00
Manfred Karrer
f74280b641
Disable devmode 2017-11-08 11:08:43 -05:00
Manfred Karrer
96081ddb63
Add provided bitcoin nodes and filter message for deactivating public network selection. 2017-11-07 23:43:08 -05:00
Manfred Karrer
d68b2fae70
Add open tor network settings button at startup if not connected after 10 sec 2017-11-06 22:17:26 -05:00
Manfred Karrer
58ed7c9e6a
Make user selection in tor network settings persistable 2017-11-06 21:49:19 -05:00
Manfred Karrer
fa2b14ba0c
Add default bridges from Tor browser and UI 2017-11-04 22:46:06 -05:00
Manfred Karrer
cb568ac05a
Merge branch 'Development' into netlayer
# Conflicts:
#	core/src/main/java/io/bisq/core/user/PreferencesPayload.java
2017-11-04 14:42:56 -05:00
Chris Beams
e1a6f87a98
Reformat Java sources with Editorconfig settings
This change is the result of a global reformatting in IDEA now that
`.editorconfig` settings are in place. Note that Editorconfig's
`continuation_indent_size` property [1] was also added and set to 8
here, as this reflects the dominant style already present in the
codebase. i.e. in created a much smaller diff to set the continuation
indent to 8 that would have been created leaving this property out and
letting it default to 4.

[1]: https://github.com/editorconfig/editorconfig/wiki/EditorConfig-Properties
2017-11-04 20:11:30 +01:00
Manfred Karrer
04bc3d7ef4
Merge branch 'Development' into netlayer 2017-11-04 10:55:56 -05:00
Manfred Karrer
00d868dd9d
Remove excuded keys when requesting the account witness data 2017-11-03 11:22:19 -05:00
Manfred Karrer
2621f1d639
Merge branch 'Development' into mrosseel-netlayer 2017-11-02 10:05:27 -05:00
Mike Rosseel
0ec4b5edac
Merging and adapting old bridges UI code to new bisq structure
Had to merge by hand because of the many changes in the new bisq
structure. Also removed the 'default bridges' concept because it's
discouraged to do that.
Open issues: UI screen is still WIP, and bitcoinj SOCKS proxy error
which makes that we can't connect to bitcoin nodes anymore.

Signed-off-by: Mike Rosseel <mike@eon-consult.be>
2017-11-02 15:50:06 +01:00
Manfred Karrer
f1a3c6e7b2
Fix bugs described in issue #989 2017-11-01 18:38:00 -05:00
Manfred Karrer
ab4d7b066b
Fix bug with not displaying correct price market label and latest bisq price 2017-10-30 18:52:41 -05:00
Manfred Karrer
57069900ee
Fix position in list of new altcoin 2017-10-30 15:10:18 -05:00
Manfred Karrer
c5af0808b3
Merge branch 'Development' of https://github.com/ivkovnikola/exchange into ivkovnikola-Development 2017-10-30 12:32:23 -05:00
Manfred Karrer
ae0aef325d
Fix wording 2017-10-27 19:58:48 -05:00
Manfred Karrer
63cdbaf23b
Fix wrong currency display and text in take offer screen 2017-10-27 19:38:22 -05:00
Manfred Karrer
065a57606a
Show recommended miner fee in popup when ask user for funding offer 2017-10-27 18:25:08 -05:00
ivkovnikola
8a3abcca43 Merge request for INXT 2017-10-27 20:23:57 +02:00
Manfred Karrer
6e4175f480
Add all missing counties 2017-10-26 21:45:46 -05:00
Manfred Karrer
462fc2a472
Remove maxTradePeriod from PaymentAccountPayload 2017-10-26 19:54:06 -05:00
Manfred Karrer
2a0547d508
Show popup if seed or price relay node get banned. Cleanups. 2017-10-26 19:01:36 -05:00
Manfred Karrer
afaabf9e36
Add support of seed and price rleay node filters. Use guice in P2P network domain classes. 2017-10-26 15:46:48 -05:00
Manfred Karrer
90cfc84d35
Add filter for seed and price relay nodes 2017-10-25 19:16:52 -05:00
Manfred Karrer
2c84623154
Add filter for arbitrators 2017-10-25 17:24:54 -05:00
Manfred Karrer
d6e1f954b7
Merge remote-tracking branch 'origin/Development' into Development 2017-10-25 16:04:19 -05:00
Manfred Karrer
f24cbd9592
Merge Terracoin 2017-10-25 16:04:01 -05:00
Manfred Karrer
e8290e3b8a
Fix missing verifications, handle altcoins, cleanup 2017-10-25 14:18:26 -05:00
Manfred Karrer
f2d1e8b6f6
Remove signature from hash 2017-10-22 21:18:53 -05:00
Manfred Karrer
611428f5f0
Use peers currnet date for witness age calculation 2017-10-22 19:22:46 -05:00
Manfred Karrer
e56fc44956
Only use accumulated hash in Witness object 2017-10-21 14:07:48 -05:00
Manfred Karrer
085f6b354b
Merge branch 'Development' into PaymentAccountAgeVerification 2017-10-20 18:54:23 -05:00
Manfred Karrer
2259cf7558
Merge branch 'master' into Development 2017-10-20 18:52:08 -05:00
Manfred Karrer
f9635cd7e1
Fix old github repo address 2017-10-20 18:50:31 -05:00
Manfred Karrer
515311dc98
Move Cryptonite to right position in list 2017-10-20 09:18:21 -05:00
Manfred Karrer
0871459cba
Add Terracoin 2017-10-20 09:14:07 -05:00
Manfred Karrer
b750727a95
Derive nonce from peers data input 2017-10-17 22:20:36 -05:00
Manfred Karrer
a5533b9ffb
Add check to only add AccountAgeWitness if it is not older than 1 day. 2017-10-17 21:10:52 -05:00
Manfred Karrer
1206878579
Add peers account age witness verifications in trade process 2017-10-17 20:41:33 -05:00
vroehrig
c190f0c3b7 Update CurrencyUtil.java
sorted entries alphabetically as per requirement
2017-10-17 21:19:22 +13:00
Manfred Karrer
5f9d59143e
Add salt field to payment method forms 2017-10-16 18:44:42 -05:00
Manfred Karrer
b60579fc37
Add account age to payment method forms 2017-10-16 18:16:24 -05:00
Manfred Karrer
654270ec94
Add maxTradeLimit to BtcValidator 2017-10-16 17:00:16 -05:00
Manfred Karrer
851792d1f1
Add new P2P network data structure for AccountAgeWitness without pubKey 2017-10-16 15:52:54 -05:00
Manfred Karrer
fe38f3a423
Rename Hash.getHash to Hash.getSha256Hash 2017-10-15 11:00:00 -05:00
Manfred Karrer
bd74d03ac1
Use Ripemd with sha256 hash to reduce size of witness hash to 20 bytes 2017-10-15 10:58:49 -05:00
Manfred Karrer
a3ab418079
Filter offer by account age withness age (WIP) 2017-10-14 12:54:03 -05:00
Manfred Karrer
b1a45f5365
Show account age and categroy in PeerIcon 2017-10-13 20:32:23 -05:00
vroehrig
a6acdc87f7 Update CurrencyUtil.java 2017-10-14 13:28:32 +13:00
Manfred Karrer
7c122369be
Show account age in peer info icon 2017-10-13 11:41:26 -05:00
Manfred Karrer
5adda7b64f
Merge branch 'Development' into PaymentAccountAgeVerification 2017-10-13 10:30:53 -05:00
Manfred Karrer
b2579fbfdd
Add new languages: Chinese, Hungarian, Romanian, Russian, French, Turkish 2017-10-12 21:33:00 -05:00
Manfred Karrer
5e8c8310ba
Merge branch 'Development' into PaymentAccountAgeVerification 2017-10-12 19:44:30 -05:00
Manfred Karrer
b0f451a2df
Merge remote-tracking branch 'upstream/Development' into Development 2017-10-12 19:11:26 -05:00
Manfred Karrer
9543b01d81
Merge branch 'master' into Development 2017-10-12 14:11:10 -05:00
Manfred Karrer
ad049caccb
Change name of IOP from Fermet to Internet Of People 2017-10-11 15:19:11 -05:00
Manfred Karrer
5d0c2d65c3
Change restrictiron for pw lenght from 50 to 500 chars 2017-10-11 15:17:01 -05:00
Manfred Karrer
5fb49b45bc
Change text for lost trade fee 2017-10-11 14:59:58 -05:00
Manfred Karrer
0c86ae9354
Add Altcoin Ellaism 2017-10-11 07:28:58 -05:00
Manfred Karrer
01cf823d7a
Prepare merge Dev 2017-10-11 07:21:50 -05:00
Manfred Karrer
e179475bb9
Merge branch 'Development' of https://github.com/ManfredKarrer/exchange 2017-10-11 07:14:01 -05:00
Manfred Karrer
27ecbf7260
Publish accountAgeWitness data to P2P network (WIP) 2017-10-09 21:14:40 -05:00
Manfred Karrer
130c9bd5bc
Merge branch 'Development' into PaymentAccountAgeVerification 2017-10-09 09:39:52 -05:00
Manfred Karrer
ca71f4464f
Put altcoin Ellaism to right position in list 2017-10-08 21:15:38 -05:00
Manfred Karrer
a8c81871c9
Merge branch 'Development' of https://github.com/ellaismer/exchange into ellaismer-Development 2017-10-08 21:12:02 -05:00
Manfred Karrer
a76b4d17f5
Show better text in PeerInfo if 0 trades 2017-10-08 21:03:08 -05:00
Manfred Karrer
4522f50149
Fix wrong fee group at Create offer screen. Improve wording 2017-10-08 20:39:09 -05:00
Manfred Karrer
3963924359
Change Maker fee to Trade fee 2017-10-08 20:03:20 -05:00
Manfred Karrer
e26037c59f
Change Taker fee to Trade fee 2017-10-08 20:00:37 -05:00
Pepper Lebeck-Jobe
ec393aea5f
Change "until" to "by" in three places
This common grammatical error for German-speakers can sound
particularly strange to native English speakers. The rule
is subtle, but these two sentences mean the same thing:
  1. You have until 12am to place your drink order.
  2. You must place your drink order by 12am.
2017-10-08 17:35:40 +02:00
Manfred Karrer
ce25beff5e
Merge master to Development 2017-10-06 21:04:04 -05:00
Manfred Karrer
e5738507c3
Merge branch 'master' into Development 2017-10-06 20:57:32 -05:00
Manfred Karrer
2ac1b34996
Disable dev mode 2017-10-06 20:45:27 -05:00
Manfred Karrer
175c1e4b96
Add AccountAgeWitnessMap to PB (WIP) 2017-10-06 13:58:35 -05:00
riclas
ae4212c567 created properties file for Simplified Chinese from transifex 2017-09-30 19:05:16 +01:00
Manfred Karrer
6de0355a4f
Add AccountAgeWitness to PB 2017-09-25 13:07:10 -05:00
Manfred Karrer
efcc7ff05c
Remove accountSalt from trade messages and TradePeer 2017-09-25 12:47:09 -05:00
Manfred Karrer
952c0d00ad
Add accountSalt to tradingPeer 2017-09-25 12:27:56 -05:00
Manfred Karrer
68badcbcc8
Change name of IOP to Internet Of People 2017-09-25 12:13:38 -05:00
Manfred Karrer
6274b646ed
Move salt from PaymentAccount to PaymentAccountPayload 2017-09-25 11:10:49 -05:00
Manfred Karrer
091e766e21
Add RestrictedByContractJson interface 2017-09-25 09:41:29 -05:00
Manfred Karrer
791c16a2e6
Add module consensus 2017-09-25 09:41:10 -05:00
Manfred Karrer
8c7e1fd04a
Add verification methods, add hash to offer, add salt to trde process (WIP) 2017-09-25 09:13:23 -05:00
Manfred Karrer
007142ed9b
Add AgeWittness domain (WIP) 2017-09-23 10:08:32 -05:00
Manfred Karrer
e73cd7abe2
Fix typos 2017-09-22 08:33:38 -05:00
Manfred Karrer
af27682f2f
Merge Development 2017-09-21 09:56:01 -05:00
Ellaismer
a61f37b6e1 Add Ellaism coin 2017-09-21 04:38:36 +08:00
Manfred Karrer
80111caf3b
Rename bisq.io to bisq.network. 2017-09-20 15:21:13 -05:00
Manfred Karrer
ac0bf80606
Support different keys for code signing in download-tool 2017-09-20 15:05:25 -05:00
Manfred Karrer
1b324631ae
Rename \'Account holder name\' to \'Account owner full name\' 2017-09-19 20:54:36 -05:00
Manfred Karrer
016626c745
Activate DAO for BTC testnet and regtest 2017-09-19 20:53:51 -05:00
Manfred Karrer
e5ac5488f7
Remove not traded altcoins 2017-09-19 18:47:55 -05:00
Manfred Karrer
76e031bbb2
Merge Development 2017-09-18 11:48:25 -05:00
Manfred Karrer
23828c3e79
Remove some altcoins, add comment 2017-09-18 11:46:04 -05:00
Manfred Karrer
36b266a204
Add altcoin DEC 2017-09-18 08:59:53 -05:00
Manfred Karrer
2357e6c399
Add missing altcoins (WAC, PNC, ZEN) 2017-09-18 08:56:34 -05:00
Manfred Karrer
97396cbd2d
Add altcoin DEC 2017-09-18 08:38:06 -05:00
Manfred Karrer
47972382ac
Add comments for support of hash of payment account 2017-09-18 08:34:42 -05:00
Manfred Karrer
9544095f86
Remove never traded coins 2017-09-17 13:12:12 -05:00
Manfred Karrer
7c45fb78cc
Remove never traded coins 2017-09-17 13:10:34 -05:00
Manfred Karrer
b72d716910
Merge Development 2017-09-17 11:28:34 -05:00
Manfred Karrer
50106990ba
Merge branch 'master' into Development
Merge master to Development
2017-09-16 12:28:49 -05:00
Manfred Karrer
a9b1a9bd5b
Remove single opening quote in dispute message 2017-09-16 10:31:52 -05:00
Manfred Karrer
13a95317bc
Fix broken link to Arbitration system 2017-09-16 10:25:10 -05:00
Chris Beams
0f2145d19c
Rename bisq-network/{bisq-exchange => exchange}
This is a follow on to 6ffa52a00. bisq-network/bisq-exchange is too
verbose, and other repositories have been shortened as well, e.g.
bisq-network/price-relay-node has become bisq-network/pricenode.
2017-09-05 14:55:42 +02:00
Manfred Karrer
902e3de80a Rename ShadowCash to Particl (https://github.com/bisq-network/bisq-exchange/issues/911) 2017-08-27 12:42:01 +02:00
stevenkain
2fb74f4936 Update displayStrings.properties 2017-08-25 23:35:15 +03:00
stevenkain
aa87319fca Update displayStrings.properties 2017-08-25 23:34:30 +03:00
stevenkain
50310338b4 Update displayStrings.properties 2017-08-25 23:05:06 +03:00
Chris Beams
6ffa52a006
Rename bitsquare/bitsquare => bisq-network/bisq-exchange 2017-08-23 15:36:17 +02:00
stevenkain
a3b1a5ff6a Update displayStrings.properties
Senders name -> Sender's name
2017-08-10 16:54:45 +03:00
stevenkain
fd683db2d4 Update displayStrings.properties 2017-08-09 19:14:42 +03:00
Manfred Karrer
a7c0f1d16f Merge branch 'Development' into DAO_phase1 2017-08-09 12:48:56 +02:00
Manfred Karrer
e8c46c9709 Merge branch 'master' into Development
# Conflicts:
#	doc/build.md
2017-08-09 12:48:07 +02:00
stevenkain
c92f955060 Update displayStrings.properties 2017-08-04 21:57:03 +03:00
Manfred Karrer
94203b9101 Add BSQ dashboard/statistics 2017-07-29 03:09:39 +02:00
Manfred Karrer
2a67d39d53 Cleanup 2017-07-29 00:04:31 +02:00
Manfred Karrer
5b5c0e66c7 Improve wording 2017-07-28 20:04:38 +02:00
Manfred Karrer
2f322f7a33 Merge branch 'Development' into DAO_phase1 2017-07-27 17:12:24 +02:00
Manfred Karrer
2d6fa2be6f Move removeCryptographyRestrictions method to Utilities and add static initializer to SeedNodeMain, ProviderMain and StatisticsMain 2017-07-27 17:12:14 +02:00
Manfred Karrer
c744cb5a96 Merge branch 'Development' into DAO_phase1 2017-07-26 21:38:21 +02:00
Mike Rosseel
592bea9dad make a tradeProtocol getter for api use, cleanup protobuf in main pom and move protobuf-util to common like the other protobuf dependency. Also make it visible outside of test 2017-07-26 16:37:59 +02:00
Manfred Karrer
ba2fc3c162 Merge branch 'Development' into DAO_phase1 2017-07-26 13:21:07 +02:00
Manfred Karrer
b6c5d872bd Add all african counties 2017-07-26 13:17:08 +02:00
Manfred Karrer
1857cc0b30 Show latest trade price as market price for currencies which have no external price feed provided but have been traded in Bisq 2017-07-26 11:44:28 +02:00
Manfred Karrer
03c33964a7 Add more selectors to filter. 2017-07-26 00:07:44 +02:00
Manfred Karrer
894923fb5e Enable dev mode 2017-07-25 22:14:35 +02:00
Manfred Karrer
40fd9a664b Enable BSQ 2017-07-25 22:14:27 +02:00
Manfred Karrer
72a7104f94 Refactoring: Merge BsqBlockVo into BsqBlock, TxInputVo into TxInput and TxOutputVo into TxOutput 2017-07-24 20:05:50 +02:00
Manfred Karrer
87ba5cabeb Add IOTA and EOS 2017-07-24 19:26:47 +02:00
Manfred Karrer
a7f3d68cb1 Version 0.5.3 with hotfix for fixing wrong app data name (bisq was renamed to Bisq -> we rename the app data dir). 2017-07-17 10:05:08 +02:00
Manfred Karrer
225fdb1e46 Version 0.5.2 2017-07-17 01:27:47 +02:00
Manfred Karrer
b7d8a0acb6 set version 0.5.2 2017-07-16 16:29:10 +02:00
Manfred Karrer
ca6a9ae9a5 disable dev mode 2017-07-16 16:28:50 +02:00
Manfred Karrer
97faeb1ef9 Use static method renameFile 2017-07-16 03:10:37 +02:00
Manfred Karrer
25f9368990 Add info for wallet restore 2017-07-16 02:35:03 +02:00
Manfred Karrer
9cb0134369 Add reminder for seed word and backup before setting the wallet pw 2017-07-16 00:53:11 +02:00
Manfred Karrer
51e8aae991 Add email again but set to empty string as otherwise it would break backward compatibility (hash of contract) 2017-07-16 00:34:46 +02:00
Manfred Karrer
04fa5f079f Remove email from bank accounts and fasterpayment 2017-07-15 23:09:13 +02:00
Manfred Karrer
f8ed97cb2e Merge branch 'Development' into 0.5.2
# Conflicts:
#	core/src/main/java/io/bisq/core/payment/payload/PaymentMethod.java
2017-07-15 14:57:42 +02:00
Manfred Karrer
ca9e53a2ab Remove email from sepa account 2017-07-15 13:12:09 +02:00
Mike Rosseel
b2f6d7435c added dash as base currency 2017-07-14 20:20:19 +02:00
Manfred Karrer
1d5965e296 Merge remote-tracking branch 'origin/0.5.2' into 0.5.2 2017-07-14 11:43:23 +02:00
Manfred Karrer
2a55758d3b Merge branch 'Development' into 0.5.2 2017-07-14 11:42:16 +02:00
Manfred Karrer
4b5b305389 Merge branch 'master' into Development 2017-07-14 11:41:39 +02:00
Manfred Karrer
6bbac2903b Change version nr back to 0.5.1 (0.5.2 is not ready yet) 2017-07-14 11:41:20 +02:00
Mike Rosseel
c1e0e76127 move unit tests, add unit test for sigs, add documentation 2017-07-12 16:32:33 +02:00
Manfred Karrer
afe2a17f71 Merge branch 'downloadUpdates' into 0.5.2 2017-07-12 03:28:56 +02:00
Manfred Karrer
7067acc824 Improve UI for in-app-download window. 2017-07-12 03:28:00 +02:00
Manfred Karrer
dfc67b3df0 Merge branch 'Development' into downloadUpdates 2017-07-11 23:32:36 +02:00
Manfred Karrer
bba9b5179c Rename UNDEFINED to UNDEFINED_TX_TYPE (PB does not allow same enum items in diff. enums ;-() 2017-07-11 23:11:07 +02:00
Manfred Karrer
7860116a27 Add UNDEFINED to TxType as default value 2017-07-11 23:02:49 +02:00
Manfred Karrer
dcf4dcd9a4 Rename ClearXchange to Zelle (ClearXchange) 2017-07-11 22:29:47 +02:00
Manfred Karrer
7fde9a17b4 Merge branch 'master' into Development 2017-07-10 23:41:54 +02:00
cedric.walter
e62f7435a8 last fix for mac 2017-07-10 21:52:00 +02:00
cedric.walter
2d91e4118e fixed for macos, avoid having unix profile active on macos 2017-07-10 21:37:39 +02:00
cedric.walter
06c90b46c4 tigthened permissions 2017-07-10 20:17:39 +02:00
cedric.walter
59edcefdc4 used ant-exec to fix permissions instead of maven assembly 2017-07-10 19:58:50 +02:00
Manfred Karrer
4ebcb79a21 Remove dev flags 2017-07-10 12:44:10 +02:00
Manfred Karrer
f27f892cd9 Merge branch 'master' into DAO_phase1 2017-07-09 23:10:23 +02:00
Manfred Karrer
77f8bdb7b0 Merge branch 'master' into DAO_phase1 2017-07-09 23:07:04 +02:00
cedric.walter
fd8a09f28e fixed permissions of protobuf.exe to r-x------ 2017-07-09 20:45:37 +02:00
Manfred Karrer
b70a5a51e8 Merge pull request #858 from cedricwalter/fix-travis-build
Installing protobuf automagically
2017-07-08 21:51:36 +02:00