Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'development' of https://github.com/open-keychain/open-keychain ↵ | Adithya Abraham Philip | 2015-02-28 | 57 | -452/+1294 |
|\ | | | | | | | into development | ||||
| * | Strings: File size | Dominik Schürmann | 2015-02-28 | 1 | -2/+2 |
| | | |||||
| * | Fix strings based on transifex reports | Dominik Schürmann | 2015-02-28 | 1 | -13/+13 |
| | | |||||
| * | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-02-28 | 1 | -2/+4 |
| |\ | | | | | | | | | | | | | | | | | | | development Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java | ||||
| | * | control flow for moving the fab up with snackbar | Vincent Breitmoser | 2015-02-28 | 1 | -2/+4 |
| | | | |||||
| * | | Update from transifex | Dominik Schürmann | 2015-02-28 | 33 | -236/+1010 |
| |/ | |||||
| * | Upload new keys to keyserver by default | Dominik Schürmann | 2015-02-28 | 1 | -0/+1 |
| | | |||||
| * | padding fixes for key list | Dominik Schürmann | 2015-02-28 | 1 | -2/+1 |
| | | |||||
| * | Reorder advanced key view | Dominik Schürmann | 2015-02-27 | 2 | -52/+0 |
| | | |||||
| * | Remove swipte to refresh src, fix padding in key list | Dominik Schürmann | 2015-02-27 | 1 | -41/+27 |
| | | |||||
| * | Fix keyboard overlay bug on top of edittexts | Dominik Schürmann | 2015-02-27 | 9 | -4/+46 |
| | | |||||
| * | show refresh key progress inline | Vincent Breitmoser | 2015-02-27 | 3 | -0/+25 |
| | | |||||
| * | Keybase header text | Dominik Schürmann | 2015-02-27 | 4 | -105/+127 |
| | | |||||
| * | Better qr code resizing | Dominik Schürmann | 2015-02-27 | 5 | -4/+47 |
| | | |||||
* | | Merge branch 'development' of https://github.com/open-keychain/open-keychain ↵ | Adithya Abraham Philip | 2015-02-28 | 11 | -159/+229 |
|\| | | | | | | | into development | ||||
| * | Prettify qr code cleanup | Dominik Schürmann | 2015-02-27 | 1 | -10/+0 |
| | | |||||
| * | Prettify qr code in advanced key view | Dominik Schürmann | 2015-02-27 | 1 | -5/+27 |
| | | |||||
| * | Uncluttering advanced key view | Dominik Schürmann | 2015-02-27 | 2 | -133/+0 |
| | | |||||
| * | Fix margins of dialog views | Dominik Schürmann | 2015-02-27 | 6 | -21/+30 |
| | | |||||
| * | Merge keybase-proof branch | Dominik Schürmann | 2015-02-27 | 3 | -0/+182 |
| |\ | |||||
| | * | Merge branch 'development' into keybase-proofs | Dominik Schürmann | 2014-12-05 | 3 | -5/+3 |
| | |\ | |||||
| | * | | Check fingerprint match between proof & database | Tim Bray | 2014-11-22 | 1 | -0/+1 |
| | | | | |||||
| | * | | Merge branch 'development' into keybase-proofs | Dominik Schürmann | 2014-11-21 | 4 | -19/+14 |
| | |\ \ | |||||
| | * | | | Prevent multiple cloud-trust-search launches. Handle DNS query failure ↵ | Tim Bray | 2014-11-19 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | gracefully. Fixes #1007 & #1008. | ||||
| | * | | | In the ImportKeysList display, arrange for Keybase UserIDs to sort below the ↵ | Tim Bray | 2014-11-18 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | rest. Also mention Keybase stuff other than Twitter/GitHub/Website | ||||
| | * | | | All keybase proofs now in place | Tim Bray | 2014-11-11 | 1 | -0/+7 |
| | | | | | |||||
| | * | | | XML fragment for proof listing | Tim Bray | 2014-11-07 | 1 | -0/+19 |
| | | | | | |||||
| | * | | | Moved from WebView to Spannables, some proof cleanup too | Tim Bray | 2014-11-07 | 2 | -0/+153 |
| | | | | | |||||
* | | | | | merged dialog | Adithya Abraham Philip | 2015-02-26 | 614 | -1759/+5032 |
|\| | | | | |||||
| * | | | | Remove old Holo design resources | Dominik Schürmann | 2015-02-26 | 308 | -576/+0 |
| | | | | | |||||
| * | | | | Hopefully fixes drop down icon for spinners on Android lower 5 | Dominik Schürmann | 2015-02-26 | 1 | -19/+0 |
| | | | | | |||||
| * | | | | Fingerprint verification, design fixes for qr code card | Dominik Schürmann | 2015-02-26 | 9 | -28/+214 |
| | | | | | |||||
| * | | | | Dont show verification icons in my key view, hide edit button for non-secret ↵ | Dominik Schürmann | 2015-02-25 | 3 | -9/+10 |
| | | | | | | | | | | | | | | | | | | | | keys | ||||
| * | | | | Invoke NFC button | Dominik Schürmann | 2015-02-25 | 15 | -2/+10 |
| | | | | | |||||
| * | | | | Other icon for key exchange | Dominik Schürmann | 2015-02-25 | 28 | -3/+3 |
| | | | | | |||||
| * | | | | Design fixes for header, QR Code shared element transitions | Dominik Schürmann | 2015-02-25 | 5 | -15/+27 |
| | | | | | |||||
| * | | | | CardView and more header design | Dominik Schürmann | 2015-02-25 | 5 | -21/+53 |
| | | | | | |||||
| * | | | | Use material icon for safeslinger | Dominik Schürmann | 2015-02-25 | 12 | -3/+3 |
| | | | | | |||||
| * | | | | Toolbar: qr code in header, cleanup of fragment | Dominik Schürmann | 2015-02-25 | 17 | -375/+75 |
| | | | | | |||||
| * | | | | Bigger status icon in key view | Dominik Schürmann | 2015-02-25 | 110 | -26/+34 |
| | | | | | |||||
| * | | | | First work on new key view toolbar | Dominik Schürmann | 2015-02-25 | 18 | -31/+104 |
| | | | | | |||||
| * | | | | Fix QR Code, design experiments for key view | Dominik Schürmann | 2015-02-24 | 9 | -34/+88 |
| | | | | | |||||
| * | | | | Remove tabs in view key | Dominik Schürmann | 2015-02-24 | 7 | -13/+370 |
| | | | | | |||||
| * | | | | New advanced key view | Dominik Schürmann | 2015-02-23 | 5 | -65/+78 |
| | | | | | |||||
| * | | | | Refactor AppsListFragment | Dominik Schürmann | 2015-02-23 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | Uncluttering App Settings: Move advanced info in dialog | Dominik Schürmann | 2015-02-23 | 2 | -41/+5 |
| | | | | | |||||
| * | | | | Remove old pattern lib, add new pattern lib | Dominik Schürmann | 2015-02-23 | 2 | -43/+36 |
| | | | | | |||||
| * | | | | Update tab lib and fix colors of tabs | Dominik Schürmann | 2015-02-23 | 3 | -4/+11 |
| | | | | | |||||
| * | | | | Fix multi select and more colors | Dominik Schürmann | 2015-02-22 | 11 | -12/+11 |
| | | | | | |||||
| * | | | | Pull from transifex | Dominik Schürmann | 2015-02-22 | 1 | -1/+1 |
| | | | | |