aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain
Commit message (Expand)AuthorAgeFilesLines
* Forgot resourceDominik Schürmann2014-03-262-12/+14
* Merge pull request #482 from uberspot/masterDominik Schürmann2014-03-263-25/+49
|\
| * add strike through text for revoked or expired keys and disable views for rev...uberspot2014-03-262-10/+27
| * put expiry on a separate lineuberspot2014-03-261-15/+22
* | Part 2 of basic user interface for api accountsDominik Schürmann2014-03-264-109/+64
|/
* Accounts API, user interfaceDominik Schürmann2014-03-267-116/+258
* Simplify can encrypt checkDominik Schürmann2014-03-261-19/+24
* Merge pull request #471 from sreeram-boyapati/encryptionDominik Schürmann2014-03-261-1/+11
|\
| * Added can_encrypt checkSreeram Boyapati2014-03-231-1/+11
* | Merge pull request #479 from AlexanderS/subkey-expiryDominik Schürmann2014-03-262-1/+31
|\ \
| * | Display expiry of subkeys in single key view.Alexander Sulfrian2014-03-252-1/+31
* | | Fix constraints and insertDominik Schürmann2014-03-264-19/+26
* | | Temporary fix for inserting by content providerDominik Schürmann2014-03-251-4/+4
* | | Merge pull request #474 from honnel/empty-list-flashDominik Schürmann2014-03-251-2/+3
|\ \ \
| * | | No "empty-list" layout flashing up on start of OpenKeychainDaniel Hammann2014-03-231-2/+3
* | | | Merge pull request #475 from thi/masterDominik Schürmann2014-03-2519-0/+114
|\ \ \ \
| * | | | Add recent contributors to creditsThialfihar2014-03-2419-0/+114
| | |/ / | |/| |
* | | | Return account creation intent if account does not exists in dbDominik Schürmann2014-03-255-46/+60
* | | | Fix update and insert for new api content providerDominik Schürmann2014-03-251-18/+14
* | | | More experimental work on api accountsDominik Schürmann2014-03-259-86/+120
* | | | Merge pull request #477 from thi/adjust-getting-started-textDominik Schürmann2014-03-2517-17/+17
|\ \ \ \
| * | | | Change the getting started textThialfihar2014-03-2417-17/+17
| |/ / /
* | | | Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychainDominik Schürmann2014-03-2531-111/+48
|\| | |
| * | | Rename old mentionings of APG-named thingsThialfihar2014-03-2311-23/+23
| * | | Remove icon set creditsThialfihar2014-03-2319-38/+0
| * | | Fix file decryption interfaceThialfihar2014-03-231-10/+3
| * | | Adjust encrypt layout, align signature with buttonThialfihar2014-03-231-2/+3
| * | | Adjust creditsThialfihar2014-03-2319-38/+19
| |/ /
* | | More experimental work on API accountsDominik Schürmann2014-03-2522-434/+882
* | | Extend provider for new api tablesDominik Schürmann2014-03-234-41/+222
* | | Move classes for OpenPGP API into remote packageDominik Schürmann2014-03-2312-19/+24
* | | New db table for api accountsDominik Schürmann2014-03-232-6/+25
|/ /
* | Merge pull request #469 from honnel/save-key-workaroundDominik Schürmann2014-03-231-1/+9
|\ \
| * | The current implementation of saving new generated key doesn't save the key d...Daniel Hammann2014-03-221-1/+9
* | | Use new FoldableLinearLayout in API settingsDominik Schürmann2014-03-232-59/+15
* | | Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychainDominik Schürmann2014-03-227-150/+336
|\ \ \
| * \ \ Merge pull request #467 from uberspot/masterDominik Schürmann2014-03-226-140/+329
| |\ \ \
| | * | | Make foldable settings in EncryptActivity a separate widgetuberspot2014-03-216-140/+329
| | |/ /
| * / / Because of an unknown reason toast messages were commented out.Daniel Hammann2014-03-211-10/+7
| |/ /
* / / raname to mKeychainDatabaseDominik Schürmann2014-03-211-6/+6
|/ /
* | Fix nfc help buttonDominik Schürmann2014-03-211-1/+1
* | remove ach language, not supported by androidDominik Schürmann2014-03-216-222/+0
* | Pull from transifexDominik Schürmann2014-03-2124-0/+1311
* | Pull from transifexDominik Schürmann2014-03-2121-92/+294
* | reformat mergeDominik Schürmann2014-03-212-59/+64
* | Merge pull request #458 from hav3n/branch-delete-fixDominik Schürmann2014-03-218-140/+185
|\ \
| * | Fix GPL HeadersNikhil Peter Raj2014-03-213-3/+3
| * | Fix for #410Nikhil Peter Raj2014-03-218-142/+187
* | | Merge pull request #461 from honnel/ui-tasksDominik Schürmann2014-03-212-3/+7
|\ \ \
| * | | UI-Icon-Modifying #429 added hint to text edit, different icons for share and...Daniel Hammann2014-03-202-3/+7