Commit Graph

136 Commits

Author SHA1 Message Date
m2049r cf4d8bdbf0 fix unconfirmed display 2017-09-09 09:34:44 +02:00
m2049r 7b690a5086 fix merge conflict in gradle-witness.jar 2017-09-09 01:11:17 +02:00
m2049r e8e5be35b3 Merge branch 'master' of https://github.com/m2049r/xmrwallet 2017-09-09 01:02:56 +02:00
Benedict 5dbf84d5d6 verify checksum from dependencies 2017-09-09 01:01:47 +02:00
m2049r bf64f77b10 Upgrade to monero v0.11.0.0 (#50) 2017-09-09 01:01:28 +02:00
m2049r 9b82023a9f UI facelift (#49) 2017-09-09 01:01:27 +02:00
KeeJef be54900e1f Making a few small changes to the readme
Added a link to the release page 
corrected a few small spelling and grammatical errors
2017-09-09 01:01:27 +02:00
KeeJef 033032639a Revert "Update README.md"
This reverts commit 466fd3bf26.
2017-09-09 01:01:27 +02:00
KeeJef ab8567692f Update README.md 2017-09-09 01:01:27 +02:00
m2049r 65894664a1 Upgrade to monero v0.11.0.0 (#50) 2017-09-09 00:37:12 +02:00
m2049r e8f53a5a2f UI facelift (#49) 2017-09-08 23:59:50 +02:00
Benedict 22e0a225b0 verify checksum from dependencies 2017-09-08 22:14:09 +02:00
m2049r e769f1a472 Merge pull request #46 from KeeJef/master
Small changes to the readme
2017-09-07 15:44:13 +02:00
KeeJef b447df9ef9 Making a few small changes to the readme
Added a link to the release page 
corrected a few small spelling and grammatical errors
2017-09-07 14:27:49 +10:00
KeeJef 42f4e4a0e9 Revert "Update README.md"
This reverts commit 466fd3bf26.
2017-09-07 14:17:12 +10:00
KeeJef 466fd3bf26 Update README.md 2017-09-07 14:15:07 +10:00
KeeJef c9bbe1db3f Merge pull request #1 from m2049r/master
Merging Up to date
2017-09-07 14:08:27 +10:00
m2049r dec67e0675 Revert "Upgrade to monero v0.11.0.0 (#44)" (#45)
This reverts commit 9cbeaa7942.
2017-09-06 21:14:38 +02:00
m2049r 9cbeaa7942 Upgrade to monero v0.11.0.0 (#44)
and minor changes
2017-09-06 21:03:31 +02:00
m2049r 093e4bda1d Doc & Version update (#43)
* added hint that amount is in XMR

* update FAQ and version
2017-09-04 23:29:48 +02:00
m2049r 4aa7000cb3 added hint that amount is in XMR (#42)
added hint that amount is in XMR when receiving
2017-09-04 23:27:04 +02:00
m2049r 62844192df Merge pull request #41 from m2049r/bugfix_logo
fixed logo svg
2017-09-04 23:21:29 +02:00
m2049r 855b35a6b7 added l in svg path 2017-09-04 22:52:10 +02:00
m2049r 88110b702f Merge pull request #40 from m2049r/bugfix_issue_37
request and respond to permissions marshmallow style
2017-09-04 22:32:30 +02:00
m2049r 0013caa05f request and respond to permissions marshmallow style 2017-09-04 22:30:37 +02:00
m2049r 5b3e92e91a Merge pull request #39 from m2049r/bugfix_issue_36
Use AsyncTask with 5MB stack in lots of places
2017-09-04 20:51:21 +02:00
m2049r f8ea3cc77f use AsyncTask with 5MB stack in lots of places 2017-09-04 20:43:05 +02:00
m2049r 59ef2a1f8e Merge pull request #33 from KeeJef/master
Clarifying some Strings
2017-09-04 18:26:30 +02:00
m2049r fae07ed716 Merge pull request #38 from m2049r/feature_rename_wallet
Rename/Backup/Archive Wallet FIles
2017-09-04 07:34:48 +02:00
m2049r e662d5a9c0 wallet rename + tweaks 2017-09-04 07:26:04 +02:00
m2049r 4b2d52fbe6 wallet archive/backup progress dialogs 2017-09-03 21:29:15 +02:00
m2049r ec7798cb34 wallet archive/backup 2017-09-03 14:09:27 +02:00
m2049r 20e7d6d065 rename option in wallet list + tweaks 2017-09-03 11:55:42 +02:00
m2049r 89ada5b294 Merge pull request #35 from m2049r/feature_info_alert
Alert before showing wallet details
2017-09-03 09:44:37 +02:00
m2049r fe80fef36e alert before showing wallet details 2017-09-03 09:43:52 +02:00
m2049r e8331dda7a Merge pull request #34 from m2049r/feature_qr_receive
QR Code for receiving
2017-09-02 12:56:17 +02:00
m2049r 68abaec6cb tweaks + get address from wallet (and not from file) 2017-09-02 12:51:57 +02:00
m2049r fe84bae9ed rework options menus 2017-09-02 10:05:50 +02:00
KeeJef 1289a0ada4 Clarifying some Strings
Just for new people i think the amount when sending should indicate that the values are XMR not USD or something
2017-09-02 13:08:09 +10:00
m2049r 93025c5e1b Receive QR code 2017-09-02 00:00:54 +02:00
m2049r e0439a1359 Merge pull request #32 from m2049r/bugfix_scanbutton
fix scan button enable/disable
2017-08-31 18:48:27 +02:00
m2049r 93ec3865da fix scan button enable/disable 2017-08-31 18:43:51 +02:00
m2049r 49e338e80d Merge pull request #31 from m2049r/doc
Update FAQ + version
2017-08-31 18:22:02 +02:00
m2049r 075ddff226 update FAQ + version 2017-08-31 18:19:59 +02:00
m2049r 7eaf17d48e Merge pull request #30 from m2049r/feature_qr_amount
QR scan of amount
2017-08-31 09:58:21 +02:00
m2049r 6822aa83d8 QR scan of amount as well
bugfix: use getSupportFragmentManager everywhere
2017-08-31 09:57:14 +02:00
m2049r 20dbaac4fa Merge pull request #29 from m2049r/bugfix_fragment_v4
use v4 fragment support library to cater for android 5.1
2017-08-31 01:00:52 +02:00
m2049r 726887af2e use v4 fragment support library to cater for android 5.1 2017-08-31 01:00:27 +02:00
m2049r 03da2880ac Merge pull request #28 from m2049r/bugfix_service_timing
make user wait for service to finish
2017-08-30 23:36:01 +02:00
m2049r 78c053f4e8 make user wait for service to finish 2017-08-30 23:35:16 +02:00