Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixed another unescaped apostrophe. | Daniel Albert | 2014-07-17 | 1 | -1/+1 |
| | |||||
* | Fixed unescaped apostrophe | Daniel Albert | 2014-07-17 | 1 | -1/+1 |
| | |||||
* | Added description to Setting, Changed title to suggested one | Daniel Albert | 2014-07-17 | 2 | -3/+5 |
| | |||||
* | Merge remote-tracking branch 'upstream/master' | Daniel Albert | 2014-07-16 | 8 | -212/+130 |
|\ | | | | | | | | | | | Conflicts: OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java | ||||
| * | Simple create key | Dominik Schürmann | 2014-07-16 | 1 | -5/+0 |
| | | |||||
| * | New first time screen | Dominik Schürmann | 2014-07-16 | 8 | -205/+114 |
| | | |||||
| * | merge: different msg if nothing was merged | Vincent Breitmoser | 2014-07-15 | 1 | -0/+1 |
| | | |||||
| * | Merge remote-tracking branch 'origin/master' into external-test | Vincent Breitmoser | 2014-07-15 | 1 | -0/+7 |
| |\ | | | | | | | | | | | | | | | | Conflicts: OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | ||||
| * | | createKey: better logging, handle empty user id case | Vincent Breitmoser | 2014-07-12 | 1 | -0/+5 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/master' into external-test | Vincent Breitmoser | 2014-07-11 | 3 | -14/+34 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java | ||||
| * | | | get rid of some inspection warnings | Vincent Breitmoser | 2014-07-11 | 1 | -1/+1 |
| | | | | |||||
| * | | | modifyKey: error out on nonexisting new primary user id | Vincent Breitmoser | 2014-07-11 | 1 | -0/+1 |
| | | | | |||||
| * | | | add come createKey strings | Vincent Breitmoser | 2014-07-11 | 1 | -1/+8 |
| | | | | |||||
* | | | | Merge remote-tracking branch 'upstream/master' into feature-conceal-software | Daniel Albert | 2014-07-13 | 1 | -2/+2 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Fix strings from 'keys' to 'passphrases' | Dominik Schürmann | 2014-07-12 | 1 | -2/+2 |
| | | | | |||||
* | | | | Added Preference for concealing the PgpApplication | Daniel Albert | 2014-07-12 | 2 | -0/+6 |
|/ / / | |||||
* | | | Wello there, That's Java, not C^^ | Daniel Albert | 2014-07-12 | 1 | -1/+1 |
| | | | |||||
* | | | Fixed issues discussed in #713 | Daniel Albert | 2014-07-12 | 1 | -2/+3 |
| | | | |||||
* | | | Put text into strings.xml, for internationalization | Daniel Albert | 2014-07-12 | 1 | -0/+6 |
| |/ |/| | |||||
* | | cleanup | Dominik Schürmann | 2014-07-08 | 1 | -30/+0 |
| | | |||||
* | | Work on subkeys adapter | Dominik Schürmann | 2014-07-08 | 4 | -14/+64 |
|/ | |||||
* | Bett API string | Dominik Schürmann | 2014-07-04 | 1 | -3/+3 |
| | |||||
* | Use strings in edit key | Dominik Schürmann | 2014-07-03 | 2 | -4/+14 |
| | |||||
* | Pull from transifex | Dominik Schürmann | 2014-07-03 | 3 | -7/+30 |
| | |||||
* | Pull from transifex | Dominik Schürmann | 2014-07-03 | 25 | -352/+1289 |
| | |||||
* | Small strings fix | Dominik Schürmann | 2014-07-03 | 1 | -1/+1 |
| | |||||
* | Remove old edit button, rename activities | Dominik Schürmann | 2014-07-03 | 1 | -16/+0 |
| | |||||
* | Cache passphrase for edit | Dominik Schürmann | 2014-07-03 | 2 | -7/+92 |
| | |||||
* | edit key: subkey adapter | Dominik Schürmann | 2014-07-03 | 2 | -1/+97 |
| | |||||
* | Work on edit | Dominik Schürmann | 2014-07-03 | 3 | -12/+3 |
| | |||||
* | A little bit less purple | Dominik Schürmann | 2014-07-02 | 2 | -7/+4 |
| | |||||
* | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2014-07-02 | 5 | -83/+72 |
|\ | |||||
| * | edit key: work on saving | Dominik Schürmann | 2014-07-02 | 1 | -8/+0 |
| | | |||||
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-07-02 | 1 | -1/+1 |
| |\ | |||||
| * | | Edit key: adding user ids | Dominik Schürmann | 2014-07-02 | 4 | -15/+72 |
| | | | |||||
| * | | edit key: part 3 | Dominik Schürmann | 2014-07-01 | 1 | -60/+0 |
| | | | |||||
* | | | Merge branch 'create-keyring' | Vincent Breitmoser | 2014-07-02 | 1 | -0/+4 |
|\ \ \ | |_|/ |/| | | |||||
| * | | support changing primary user id in SaveKeyringParcel | Vincent Breitmoser | 2014-07-02 | 1 | -0/+2 |
| | | | | | | | | | | | | Closes #695 | ||||
| * | | add create key capabilities to SaveKeyringParcel | Vincent Breitmoser | 2014-06-29 | 1 | -0/+2 |
| | | | |||||
* | | | don't use zero plural string for english | Vincent Breitmoser | 2014-07-02 | 1 | -1/+1 |
| |/ |/| | | | | | closes #703 | ||||
* | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-06-30 | 42 | -90/+216 |
|\ \ | |||||
| * | | (should have) fixed Travis builds | Daniel Albert | 2014-06-30 | 2 | -7/+2 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/open-keychain/open-keychain | Daniel Albert | 2014-06-30 | 8 | -10/+345 |
| |\| | |||||
| * | | Converted all other buttons | Daniel Albert | 2014-06-30 | 18 | -30/+28 |
| | | | |||||
| * | | Ported even more buttons to use new design (Key and User editor) | Daniel Albert | 2014-06-29 | 13 | -24/+90 |
| | | | | | | | | | | | | Added drawables for them | ||||
| * | | Converted AsymetricKeyFragment to new button style | Daniel Albert | 2014-06-29 | 1 | -5/+3 |
| | | | |||||
| * | | Added new button style and converted account_settings and the ↵ | Daniel Albert | 2014-06-29 | 7 | -10/+45 |
| | | | | | | | | | | | | select_secret_key_layout to use it | ||||
| * | | Updated file_dialog to use the new buttons | Daniel Albert | 2014-06-29 | 1 | -6/+3 |
| | | | |||||
| * | | Improved button style | Daniel Albert | 2014-06-29 | 3 | -21/+12 |
| | | | | | | | | | | | | | | | centered buttons removed commented-out button | ||||
| * | | Added button_rounded style | Daniel Albert | 2014-06-28 | 2 | -3/+49 |
| | | | | | | | | | | | | converted decrypt_file_fragment to new style |