Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | add strike through text for revoked or expired keys and disable views for rev... | uberspot | 2014-03-26 | 2 | -10/+27 |
* | put expiry on a separate line | uberspot | 2014-03-26 | 1 | -15/+22 |
* | Accounts API, user interface | Dominik Schürmann | 2014-03-26 | 7 | -116/+258 |
* | Simplify can encrypt check | Dominik Schürmann | 2014-03-26 | 1 | -19/+24 |
* | Merge pull request #471 from sreeram-boyapati/encryption | Dominik Schürmann | 2014-03-26 | 1 | -1/+11 |
|\ | |||||
| * | Added can_encrypt check | Sreeram Boyapati | 2014-03-23 | 1 | -1/+11 |
* | | Merge pull request #479 from AlexanderS/subkey-expiry | Dominik Schürmann | 2014-03-26 | 2 | -1/+31 |
|\ \ | |||||
| * | | Display expiry of subkeys in single key view. | Alexander Sulfrian | 2014-03-25 | 2 | -1/+31 |
* | | | Fix constraints and insert | Dominik Schürmann | 2014-03-26 | 4 | -19/+26 |
* | | | Temporary fix for inserting by content provider | Dominik Schürmann | 2014-03-25 | 1 | -4/+4 |
* | | | Merge pull request #474 from honnel/empty-list-flash | Dominik Schürmann | 2014-03-25 | 1 | -2/+3 |
|\ \ \ | |||||
| * | | | No "empty-list" layout flashing up on start of OpenKeychain | Daniel Hammann | 2014-03-23 | 1 | -2/+3 |
| * | | | Merge branch 'master' of https://github.com/openpgp-keychain/openpgp-keychain | Daniel Hammann | 2014-03-23 | 9 | -205/+350 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'ui-createkey' | Daniel Hammann | 2014-03-23 | 1 | -10/+7 |
| |\ \ \ \ | |||||
* | \ \ \ \ | Merge pull request #475 from thi/master | Dominik Schürmann | 2014-03-25 | 19 | -0/+114 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add recent contributors to credits | Thialfihar | 2014-03-24 | 19 | -0/+114 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Return account creation intent if account does not exists in db | Dominik Schürmann | 2014-03-25 | 5 | -46/+60 |
* | | | | | | Fix update and insert for new api content provider | Dominik Schürmann | 2014-03-25 | 1 | -18/+14 |
* | | | | | | More experimental work on api accounts | Dominik Schürmann | 2014-03-25 | 9 | -86/+120 |
* | | | | | | Merge pull request #477 from thi/adjust-getting-started-text | Dominik Schürmann | 2014-03-25 | 17 | -17/+17 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Change the getting started text | Thialfihar | 2014-03-24 | 17 | -17/+17 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain | Dominik Schürmann | 2014-03-25 | 32 | -145/+78 |
|\| | | | | | |||||
| * | | | | | Merge pull request #476 from thi/rename-old-apg-things | Dominik Schürmann | 2014-03-23 | 11 | -23/+23 |
| |\ \ \ \ \ | |||||
| | * | | | | | Rename old mentionings of APG-named things | Thialfihar | 2014-03-23 | 11 | -23/+23 |
| |/ / / / / | |||||
| * | | | | | Merge pull request #473 from thi/master | Dominik Schürmann | 2014-03-23 | 22 | -122/+55 |
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| | * | | | | Update README.md, icon set not used anymore | Thialfihar | 2014-03-23 | 1 | -34/+30 |
| | * | | | | Remove icon set credits | Thialfihar | 2014-03-23 | 19 | -38/+0 |
| | * | | | | Fix file decryption interface | Thialfihar | 2014-03-23 | 1 | -10/+3 |
| | * | | | | Adjust encrypt layout, align signature with button | Thialfihar | 2014-03-23 | 1 | -2/+3 |
| | * | | | | Adjust credits | Thialfihar | 2014-03-23 | 19 | -38/+19 |
| |/ / / / | |||||
* | | | | | More experimental work on API accounts | Dominik Schürmann | 2014-03-25 | 23 | -434/+884 |
* | | | | | put original license of launcher icon into repo | Dominik Schürmann | 2014-03-23 | 3 | -0/+69 |
* | | | | | Extend provider for new api tables | Dominik Schürmann | 2014-03-23 | 4 | -41/+222 |
* | | | | | Move classes for OpenPGP API into remote package | Dominik Schürmann | 2014-03-23 | 12 | -19/+24 |
* | | | | | New db table for api accounts | Dominik Schürmann | 2014-03-23 | 2 | -6/+25 |
|/ / / / | |||||
* | | | | Merge pull request #469 from honnel/save-key-workaround | Dominik Schürmann | 2014-03-23 | 1 | -1/+9 |
|\| | | | |||||
| * | | | Merge branch 'save-key-workaround' of https://github.com/honnel/openpgp-keych... | Daniel Hammann | 2014-03-22 | 0 | -0/+0 |
| |\ \ \ | |||||
| | * | | | The current implementation of saving new generated key doesn't save the key d... | Daniel Hammann | 2014-03-22 | 1 | -1/+8 |
| * | | | | The current implementation of saving new generated key doesn't save the key d... | Daniel Hammann | 2014-03-22 | 1 | -1/+9 |
| |/ / / | |||||
* | | | | Use new FoldableLinearLayout in API settings | Dominik Schürmann | 2014-03-23 | 2 | -59/+15 |
* | | | | Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain | Dominik Schürmann | 2014-03-22 | 7 | -150/+336 |
|\ \ \ \ | |||||
| * \ \ \ | Merge pull request #467 from uberspot/master | Dominik Schürmann | 2014-03-22 | 6 | -140/+329 |
| |\ \ \ \ | |||||
| | * | | | | Make foldable settings in EncryptActivity a separate widget | uberspot | 2014-03-21 | 6 | -140/+329 |
| | |/ / / | |||||
| * | | | | Merge pull request #468 from honnel/ui-createkey | Dominik Schürmann | 2014-03-22 | 1 | -10/+7 |
| |\ \ \ \ | | |/ / / | |/| / / | | |/ / | |||||
| | * / | Because of an unknown reason toast messages were commented out. | Daniel Hammann | 2014-03-21 | 1 | -10/+7 |
| |/ / | |||||
* / / | raname to mKeychainDatabase | Dominik Schürmann | 2014-03-21 | 1 | -6/+6 |
|/ / | |||||
* | | Fix nfc help button | Dominik Schürmann | 2014-03-21 | 1 | -1/+1 |
* | | remove ach language, not supported by android | Dominik Schürmann | 2014-03-21 | 6 | -222/+0 |
* | | Pull from transifex | Dominik Schürmann | 2014-03-21 | 24 | -0/+1311 |
* | | Pull from transifex | Dominik Schürmann | 2014-03-21 | 21 | -92/+294 |