Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | style changes | Ashley Hughes | 2014-03-30 | 1 | -27/+26 |
* | use save icon, not tick | Ashley Hughes | 2014-03-29 | 1 | -1/+1 |
* | revert mistake | Ashley Hughes | 2014-03-29 | 1 | -1/+1 |
* | merge master | Ashley Hughes | 2014-03-29 | 353 | -5731/+26503 |
|\ | |||||
| * | Version 2.4 | Dominik Schürmann | 2014-03-26 | 1 | -2/+2 |
| * | Sync changelog and about with transifex | Dominik Schürmann | 2014-03-26 | 38 | -19/+545 |
| * | Changelog for 2.4 | Dominik Schürmann | 2014-03-26 | 2 | -0/+21 |
| * | Changelog for 2.4 | Dominik Schürmann | 2014-03-26 | 3 | -109/+21 |
| * | Update from transifex | Dominik Schürmann | 2014-03-26 | 31 | -23/+422 |
| * | Show divider only when used | Dominik Schürmann | 2014-03-26 | 2 | -2/+8 |
| * | Text for creation of new api accounts | Dominik Schürmann | 2014-03-26 | 2 | -0/+9 |
| * | Rename layouts for remote activity | Dominik Schürmann | 2014-03-26 | 5 | -4/+4 |
| * | Improve demo for API accounts | Dominik Schürmann | 2014-03-26 | 2 | -7/+26 |
| * | Fix provider for API_ACCOUNTS | Dominik Schürmann | 2014-03-26 | 3 | -10/+10 |
| * | Accounts activity prettified | Dominik Schürmann | 2014-03-26 | 1 | -8/+28 |
| * | Accounts list prettified | Dominik Schürmann | 2014-03-26 | 8 | -7/+42 |
| * | Merge pull request #483 from uberspot/master | Dominik Schürmann | 2014-03-26 | 2 | -19/+18 |
| |\ | |||||
| | * | fix capability icons and remove red text for revoked keys | uberspot | 2014-03-26 | 2 | -19/+18 |
| * | | Make PendingIntents with FLAG_CANCEL_CURRENT and FLAG_ONE_SHOT | Dominik Schürmann | 2014-03-26 | 5 | -54/+53 |
| |/ | |||||
| * | Coding style | Dominik Schürmann | 2014-03-26 | 1 | -8/+2 |
| * | remove old icon entry | Dominik Schürmann | 2014-03-26 | 1 | -4/+0 |
| * | Revert "Update README.md, icon set not used anymore" | Dominik Schürmann | 2014-03-26 | 1 | -30/+34 |
| * | Forgot resource | Dominik Schürmann | 2014-03-26 | 2 | -12/+14 |
| * | Merge pull request #482 from uberspot/master | Dominik Schürmann | 2014-03-26 | 3 | -25/+49 |
| |\ | |||||
| | * | 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 |
| * | | Part 2 of basic user interface for api accounts | Dominik Schürmann | 2014-03-26 | 4 | -109/+64 |
| |/ | |||||
| * | 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 |
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | | |