Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Pull from transifex | Dominik Schürmann | 2014-09-24 | 1 | -25/+49 |
| | |||||
* | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2014-09-15 | 1 | -6/+80 |
|\ | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java OpenKeychain/src/main/res/values-de/strings.xml | ||||
| * | Pull from transifex | Dominik Schürmann | 2014-09-15 | 1 | -6/+80 |
| | | |||||
* | | move LogLevel info into LogType enum | Vincent Breitmoser | 2014-09-15 | 1 | -4/+4 |
|/ | |||||
* | Pull from transifex | Dominik Schürmann | 2014-09-08 | 1 | -40/+81 |
| | |||||
* | Pull from transifex | Dominik Schürmann | 2014-09-02 | 1 | -37/+39 |
| | |||||
* | add cancel support to edit key action | Vincent Breitmoser | 2014-08-31 | 1 | -1/+1 |
| | |||||
* | canonicalize: add check for algorithm type | Vincent Breitmoser | 2014-08-30 | 1 | -2/+2 |
| | | | | closes #797 | ||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-08-27 | 1 | -2/+2 |
|\ | |||||
| * | small language fixes for previous commit | Vincent Breitmoser | 2014-08-27 | 1 | -2/+2 |
| | | |||||
* | | Strip out duplicate user ids | Dominik Schürmann | 2014-08-27 | 1 | -1/+1 |
|/ | |||||
* | Pull from transifex | Dominik Schürmann | 2014-08-22 | 1 | -2/+11 |
| | |||||
* | Pull from transifex | Dominik Schürmann | 2014-08-21 | 1 | -6/+0 |
| | |||||
* | Pull from transifex | Dominik Schürmann | 2014-08-20 | 1 | -4/+24 |
| | |||||
* | Pull from transifex | Dominik Schürmann | 2014-08-20 | 1 | -9/+46 |
| | |||||
* | typed expected failures and a couple minor things | Vincent Breitmoser | 2014-08-16 | 1 | -2/+1 |
| | |||||
* | support for master key modifications, among other stuff | Vincent Breitmoser | 2014-08-16 | 1 | -1/+1 |
| | |||||
* | change keybase hint following pull request #755 | Dominik Schürmann | 2014-08-14 | 1 | -2/+2 |
| | |||||
* | Dont write version header by default | Dominik Schürmann | 2014-08-14 | 1 | -2/+2 |
| | |||||
* | Pull from transifex | Dominik Schürmann | 2014-08-07 | 1 | -5/+11 |
| | |||||
* | Pull from transifex | Dominik Schürmann | 2014-08-04 | 1 | -106/+113 |
| | |||||
* | Keyserver exception translateable | Dominik Schürmann | 2014-07-31 | 1 | -2/+2 |
| | |||||
* | Better exception handling for import of keys | Dominik Schürmann | 2014-07-31 | 1 | -1/+1 |
| | |||||
* | introduce EditKeyResult with transient UncachedKeyRing (half-baked!) | Vincent Breitmoser | 2014-07-27 | 1 | -1/+1 |
| | |||||
* | Pull from transifex | Dominik Schürmann | 2014-07-03 | 1 | -3/+24 |
| | |||||
* | Pull from transifex | Dominik Schürmann | 2014-07-03 | 1 | -32/+153 |
| | |||||
* | import-log: switch to flags instead of statuses for result int | Vincent Breitmoser | 2014-06-10 | 1 | -5/+5 |
| | |||||
* | Pull from transifex | Dominik Schürmann | 2014-05-31 | 1 | -3/+3 |
| | |||||
* | Translations from transifex | Dominik Schürmann | 2014-05-08 | 1 | -0/+2 |
| | |||||
* | Update from transifex | Dominik Schürmann | 2014-05-08 | 1 | -1/+18 |
| | |||||
* | Pull translations from transifex | Dominik Schürmann | 2014-05-07 | 1 | -1/+0 |
| | |||||
* | Pull translations from transifex | Dominik Schürmann | 2014-05-07 | 1 | -9/+24 |
| | |||||
* | Clarify language | Dominik Schürmann | 2014-05-06 | 1 | -2/+2 |
| | |||||
* | Update from transifex | Dominik Schürmann | 2014-05-05 | 1 | -15/+0 |
| | |||||
* | Update from transifex | Dominik Schürmann | 2014-05-02 | 1 | -5/+57 |
| | |||||
* | Update from transifex | Dominik Schürmann | 2014-04-19 | 1 | -7/+0 |
| | |||||
* | Fix more strings | Dominik Schürmann | 2014-04-19 | 1 | -3/+3 |
| | |||||
* | Update from transifex | Dominik Schürmann | 2014-04-19 | 1 | -56/+0 |
| | |||||
* | Translations from transifex, fix some strings references | Dominik Schürmann | 2014-04-16 | 1 | -6/+6 |
| | |||||
* | Translations from transifex | Dominik Schürmann | 2014-04-14 | 1 | -7/+26 |
| | |||||
* | key edit: fix crash when create date was after expiry date, change from ↵ | Dominik Schürmann | 2014-04-14 | 1 | -3/+3 |
| | | | | gregorian calendar to calendar with creation from instance, experimental result status for decrypt activity | ||||
* | Rename folder structure from OpenPGP Keychain to OpenKeychain | Dominik Schürmann | 2014-04-06 | 1 | -0/+451 |